Commit graph

22694 commits

Author SHA1 Message Date
dotnet-maestro[bot]
4464c99669 Update dependencies from https://github.com/dotnet/arcade build 20220412.5
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22206.7 -> To Version 6.0.0-beta.22212.5
2022-04-13 15:10:21 +00:00
Manodasan Wignarajah
ef856a09d1
Windows SDK projection update (#13613) 2022-04-13 07:58:28 -07:00
Matt Mitchell
6ed57a137b
Merge pull request #13601 from vseanreesermsft/internal-merge-6.0.2xx-2022-04-12-1157
Merging internal commits for release/6.0.2xx
2022-04-13 07:47:32 -07:00
v-wuzhai
8fd1aa5965
Merge pull request #13603 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-12 19:43:04 -07:00
Jason Zhai
aec691922a Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-12 18:53:50 -07:00
NET Source-Build Bot
8d32713c4e
update global.json and Versions.props for .NET SDK 6.0.104 (#13607) 2022-04-13 00:36:01 +00:00
William Godbe
753cdcf45f
[6.0.2xx] Update asp.net template versions (#13544) 2022-04-12 20:30:37 +00:00
William Godbe
aca24a9b5a
[6.0.1xx] Update asp.net template versions (#13543) 2022-04-12 20:27:03 +00:00
Marc Paine
0870a9684a
Merge pull request #13534 from vseanreesermsft/branding-6.0.203-2022-04-05-1259
Update branding to 6.0.203
2022-04-12 12:04:42 -07:00
Marc Paine
608561c76d
Merge pull request #13533 from vseanreesermsft/branding-6.0.105-2022-04-05-1258
Update branding to 6.0.105
2022-04-12 12:04:31 -07:00
Sean Reeser
8e7442b2d8 Merge commit 'f8a55617d250f5db711e7425428671da5f1967a3' into internal-merge-6.0.2xx-2022-04-12-1157 2022-04-12 11:57:07 -07:00
v-wuzhai
5d5fbd3637
Merge pull request #13582 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-11 02:22:15 -07:00
Jason Zhai
78655d99e9 Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-10 21:18:37 -07:00
v-wuzhai
d1a55f7846
Merge pull request #13577 from dotnet/darc-release/6.0.1xx-3ce6dc03-cb8b-45ed-80e7-70094f83ea24
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-10 18:36:49 -07:00
v-wuzhai
21c3d887ce
Merge pull request #13576 from dotnet/darc-release/6.0.2xx-262d7395-2db8-45d0-bf52-4636b0064250
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-10 18:36:22 -07:00
v-wuzhai
b4c72ef480
Merge pull request #13569 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-10 18:29:57 -07:00
dotnet-maestro[bot]
e70e2b3f49 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.1
2022-04-08 15:11:36 +00:00
dotnet-maestro[bot]
8d174cfc31 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.1
2022-04-08 15:11:36 +00:00
Jason Zhai
316d39733a Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-07 19:50:15 -07:00
v-wuzhai
3a3b3de8fe
Merge pull request #13564 from dotnet/darc-release/6.0.2xx-b566dce8-afe0-4c4c-971f-e5c64e675372
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-07 18:59:43 -07:00
v-wuzhai
9726fc58d3
Merge pull request #13566 from dotnet/darc-release/6.0.1xx-aa59b178-eb05-40a8-8d83-41ca14136141
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-04-07 18:59:05 -07:00
v-wuzhai
a979b210de
Merge pull request #13567 from dotnet/darc-release/6.0.2xx-03571cb4-623f-407a-945b-a140c1375553
[release/6.0.2xx] Update dependencies from dotnet/arcade
2022-04-07 18:58:33 -07:00
dotnet-maestro[bot]
6d02703a31
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#13565)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.1

* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.2

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-07 11:46:46 -05:00
Michael Simons
ad01a74f43
Add arm64 leg to CI (#13500) 2022-04-07 11:34:26 -05:00
dotnet-maestro[bot]
b209a1c146 Update dependencies from https://github.com/dotnet/arcade build 20220406.7
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22178.5 -> To Version 6.0.0-beta.22206.7
2022-04-07 15:51:20 +00:00
dotnet-maestro[bot]
37650d170d Update dependencies from https://github.com/dotnet/arcade build 20220406.7
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22178.5 -> To Version 6.0.0-beta.22206.7
2022-04-07 15:41:35 +00:00
Matt Mitchell
4905f14f30
Merge pull request #13549 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-07 08:37:34 -07:00
dotnet-maestro[bot]
82adc31033 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.2
2022-04-07 15:16:20 +00:00
dotnet-maestro[bot]
53cc42576b Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220407.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22179.1 -> To Version 6.0.0-servicing.22207.1
2022-04-07 14:34:24 +00:00
Michael Simons
49444f300c
Build aspnetcore project templates in source-build (#13459) 2022-04-07 08:12:37 -05:00
Jason Zhai
b2d2cb081c Restore the global.json file 2022-04-05 22:54:28 -07:00
Jason Zhai
5e334c550a Restore the changes for the files in the eng/folder 2022-04-05 22:53:12 -07:00
v-wuzhai
91561e2efa
Merge pull request #13536 from dotnet/darc-release/6.0.1xx-b8c388ec-032b-4c30-8b76-41d2b4d531bb
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-04-05 19:07:00 -07:00
v-wuzhai
46d1044dcf
Merge pull request #13541 from dotnet/darc-release/6.0.2xx-c0c92c7e-f0b4-4599-a20f-14b3a35cd9fa
[release/6.0.2xx] Update dependencies from dotnet/arcade
2022-04-05 19:04:57 -07:00
dotnet-maestro[bot]
284bcacb8a Update dependencies from https://github.com/dotnet/arcade build 20220328.5
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22178.5
2022-04-05 20:31:26 +00:00
dotnet-maestro[bot]
b502cab94e Update dependencies from https://github.com/dotnet/arcade build 20220328.5
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22161.1 -> To Version 6.0.0-beta.22178.5
2022-04-05 20:21:46 +00:00
Sean Reeser
9ab192a3a9 Update branding to 6.0.203 2022-04-05 12:59:02 -07:00
Sean Reeser
4a89f33d29 Update branding to 6.0.105 2022-04-05 12:58:57 -07:00
v-wuzhai
9d2f43f3de
Merge pull request #13513 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-01 00:18:17 -07:00
Jason Zhai
bbbdd190c3 Revert the version.details.xml file 2022-03-31 22:53:54 -07:00
Chris Rummel
f6e3766b7a
Add source-build leak detection (#13434) 2022-03-31 19:12:59 -05:00
dotnet-maestro[bot]
3080cd3c13
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220329.1 (#13486)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-29 19:56:56 +00:00
dotnet-maestro[bot]
50f7e4f570
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220329.1 (#13488)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22161.1 -> To Version 6.0.0-servicing.22179.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-29 08:21:22 -07:00
Michael Simons
9a5c6656c6
Merge pull request #13457 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-03-24 08:21:42 -05:00
Michael Simons
211912bd41
Refactor SdkContentTests to warn on diffs when run in CI (#13432) 2022-03-23 12:25:05 -05:00
Michael Simons
a9d43d1d3d
Update NuGet path issue in Run Tests CI step (#13453) 2022-03-23 12:24:28 -05:00
DotNet Bot
f8a55617d2 Merged PR 21938: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220322.7
- **Date Produced**: March 22, 2022 7:37:17 PM UTC
- **Commit**: 48cdb7a16e8277e63c5bb52f97bb02198d1a9759
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22171.27 to 6.0.202-servicing.22172.7][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22171.7 to 6.0.4-servicing.22172.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbee413d&targetVersion=GC48cdb7a&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCcdabbaa&targetVersion=GCf9ae0f5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)
2022-03-22 20:11:28 +00:00
DotNet Bot
322355cbc9 Merged PR 21900: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b065b754-67d8-417c-0ef9-08d9d602f120)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b065b754-67d8-417c-0ef9-08d9d602f120
- **Build**: 20220321.27
- **Date Produced**: March 22, 2022 12:41:39 AM UTC
- **Commit**: bee413db0346cd7d46697e5ef00267cf4234c355
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2]
  - **Microsoft.NET.Sdk**: [from 6.0.202-servicing.22168.4 to 6.0.202-servicing.22171.27][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.4 to 6.0.4][3]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.4 to 6.0.4][3]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]
  - **dotnet-dev-certs**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]
  - **dotnet-user-secrets**: [from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7][3]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa980151&targetVersion=GCbee413d&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC578ba6d&targetVersion=GCcdabbaa&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22167.10 to 6.0.4-servicing.22171.7 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
2022-03-22 01:09:30 +00:00
Michael Simons
46c2e6ddf7
Refactor build.sh to optimize PackageVersions.props retrieval (#13443) 2022-03-21 08:13:23 -05:00
DotNet Bot
4ff8f79c3d Merged PR 21732: [internal/release/6.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.3-servicing.22124.3 to 6.0.4-servicing.22165.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.3-servicing.22124.1 to 6.0.4-servicing.22167.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.201-servicing.22123.7 to 6.0.202-servicing.22165.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.201 to 6.0.202 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.3 to 6.0...
2022-03-21 01:08:23 +00:00