Commit graph

23098 commits

Author SHA1 Message Date
Sean Reeser
e90af97f22 Merge commit '8473146e7d8d3de5d9558239c46e62d12314d52b' into internal-merge-6.0.3xx-2022-05-10-1208 2022-05-10 12:08:23 -07:00
v-wuzhai
8cd3ca1d52
Merge pull request #13806 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-05-10 02:20:12 -07:00
Jason Zhai
ffa3570a2e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-09 23:51:19 -07:00
v-wuzhai
953ad15c5b
Merge pull request #13803 from dotnet/darc-release/6.0.1xx-ed322211-1141-4cce-885f-7dbbbb824442
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-05-09 19:25:28 -07:00
dotnet-maestro[bot]
9269ff9cc4 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220509.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22254.2 -> To Version 6.0.0-servicing.22259.1
2022-05-09 23:31:33 +00:00
v-wuzhai
3fed194c0b
Merge pull request #13757 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-05-04 22:20:58 -07:00
Jason Zhai
305c2d164e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-05-04 21:15:38 -07:00
v-wuzhai
6ec9f0b173
Merge pull request #13766 from dotnet/darc-release/6.0.1xx-c10ce17c-15a5-4fa0-b7b7-6705984127df
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-05-04 20:07:36 -07:00
v-wuzhai
97150cdd12
Merge pull request #13772 from dotnet/darc-release/6.0.1xx-f7628f3e-a32c-475b-9929-8bd3e22d154f
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-05-04 20:04:35 -07:00
dotnet-maestro[bot]
5631e9af9e Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22254.1 -> To Version 6.0.0-servicing.22254.2
2022-05-04 23:25:36 +00:00
dotnet-maestro[bot]
831257f764
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220504.1 (#13758)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-05-04 21:26:54 +00:00
dotnet-maestro[bot]
a1dc2f68e4 Update dependencies from https://github.com/dotnet/arcade build 20220504.3
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22212.5 -> To Version 6.0.0-beta.22254.3
2022-05-04 21:19:18 +00:00
Michael Simons
2e47208356
Fix two broken <repo.sha> path references (#13745) 2022-05-03 18:56:39 -05:00
Daniel Plaisted
085ba133f7
Merge pull request #13360 from dsplaisted/linux-arm64-and-mariner2
Add Arm64 RHEL builds
2022-05-03 16:45:19 -07:00
Marc Paine
49c376098d
Merge pull request #13748 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-05-03 14:59:23 -07:00
Daniel Plaisted
921c0441d0
Merge pull request #13640 from dsplaisted/linux-arm64-and-mariner2-6.0.3xx
Add Mariner 2.0 and Arm64 RHEL builds (6.0.3xx)
2022-05-03 14:39:14 -07:00
Daniel Plaisted
604e870a20 Add Mariner 2.0 and Arm64 RHEL builds 2022-05-03 18:36:09 -03:00
Marc Paine
b058710c34
Merge pull request #13711 from dotnet/marcpopMSFT-cg601xx
Add a direct reference to a newer version of this package
2022-05-03 12:30:30 -07:00
Marc Paine
ca048aa6c6
Merge pull request #13710 from dotnet/marcpopMSFT-cg603xx
Add a direct reference to a newer version of this package
2022-05-03 12:30:26 -07:00
vseanreesermsft
f29c6763ca
Merge pull request #13750 from vseanreesermsft/branding-6.0.301-2022-05-03-1028
Update branding to 6.0.301
2022-05-03 12:29:36 -07:00
vseanreesermsft
4bb6f3839d
Merge pull request #13749 from vseanreesermsft/branding-6.0.106-2022-05-03-1028
Update branding to 6.0.106
2022-05-03 12:29:22 -07:00
Sean Reeser
f0b493ed43 Update branding to 6.0.301 2022-05-03 10:28:24 -07:00
Sean Reeser
5a1062a005 Update branding to 6.0.106 2022-05-03 10:28:19 -07:00
dotnet-maestro-bot
53fd800db0
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx' (#13734)
* Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1

* Remove sha from source tarball repo dir names (#13726)

* Update smoke-test prereq artifact to include architecture (#13725)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-05-03 10:25:02 -07:00
Michael Simons
01764815de
Update smoke-test prereq artifact to include architecture (#13725) 2022-04-29 14:37:32 -05:00
Michael Simons
2d73d3d8bf
Remove sha from source tarball repo dir names (#13726) 2022-04-29 12:50:28 -05:00
Marc Paine
8c85e40f17 Add a direct reference to a newer version of this package 2022-04-27 14:58:26 -07:00
Marc Paine
e6afe7a97e Add a direct reference to a newer version of this package 2022-04-27 14:57:58 -07:00
Daniel Plaisted
e78caf9137 Add Mariner 2.0 and Arm64 RHEL builds 2022-04-27 11:31:41 -03:00
DotNet Bot
8473146e7d Merged PR 22532: [internal/release/6.0.3xx] 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.NETCore.Platforms**: from 6.0.2 to 6.0.3 (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.Net.Compilers.Toolset**: from 4.2.0-4.22212.4 to 4.2.0-4.22220.2 (parent: Microsoft.NET.Sdk)
  - **NuGet.Build.Tasks**: from 6.2.0-rc.140 to 6.2.0-rc.146 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220421.4
- **Date Produced**: April 21, 2022 9:07:16 AM UTC
- **Commit**: ac00abef032d4d576a844d7f1287119a9d20166e
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-rtm.22220.16 to 6.0.300-rtm.22221.4][4]
  - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.3][5]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][6]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22212.4 to 4.2.0-4.22220.2][7]
  - **NuGet.Build.Tasks**: [from 6.2.0-rc.140 to 6.2.0-rc.146][8]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC679e847&targetVersion=GCac00abe&_a=files
[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc24d9a9&targetVersion=GCbe98e88&_a=files
[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f426c9&targetVersion=GC0c636f9&_a=files
[7]: f2d278f...1e40aa1
[8]: 6f54dbd...b8a6126

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-04-21 15:36:17 +00:00
dotnet-bot
d3916de4f7 Merge in 'release/6.0.3xx' changes 2022-04-21 03:07:58 +00:00
v-wuzhai
20e198c744
Merge pull request #13673 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-20 19:57:12 -07:00
DotNet Bot
91c6682f9e Merged PR 22483: [internal/release/6.0.3xx] 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.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.4-servicing.22164.4 to 6.0.5-servicing.22213.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.300-preview.22208.4 to 6.0.300-rtm.22215.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.300-preview.22208.4 to 6.0.300 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.4 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.FSharp.Compiler**: fr...
2022-04-20 23:43:56 +00:00
Jason Zhai
bf78d7434c Restore the nuget.config file 2022-04-20 01:29:10 -07:00
Jason Zhai
f0800059e3 Restore the version.details.xml file 2022-04-20 01:27:33 -07:00
v-wuzhai
f6402be557
Merge pull request #13664 from dotnet/darc-release/6.0.2xx-3d9c040a-5fe3-4a39-94a5-4bf9d69e3461
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-19 23:01:41 -07:00
v-wuzhai
cb2d89d174
Merge pull request #13665 from dotnet/darc-release/6.0.1xx-0ded7ddc-719f-416d-bf3c-23f1d9067ac7
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-19 23:00:53 -07:00
dotnet-bot
a2eae06856 Merge in 'release/6.0.3xx' changes 2022-04-20 02:47:50 +00:00
v-wuzhai
bd888b3457
Merge pull request #13661 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-19 19:36:57 -07:00
v-wuzhai
69fe928672
Merge pull request #13655 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-19 19:36:48 -07:00
Michael Simons
65dd7c1427
Remove net TFMs from xml doc baseline (#13662) 2022-04-19 22:00:36 +00:00
dotnet-maestro[bot]
a415eac16d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1
2022-04-19 15:55:14 +00:00
dotnet-maestro[bot]
d1c5091589 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220419.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22213.1 -> To Version 6.0.0-servicing.22219.1
2022-04-19 15:55:14 +00:00
Bo Anderson
e44e5907d6
Fix compatibility with BSD df (#13653) 2022-04-19 08:44:59 -05:00
DotNet Bot
29578262e1 Merged PR 22281: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://github.com/dotnet/sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220413.3
- **Date Produced**: April 13, 2022 10:52:12 AM UTC
- **Commit**: 3456e28c08f10074a5cfd1e2522acefa8f515210
- **Branch**: refs/heads/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 6.0.300-preview.22212.3 to 6.0.300-preview.22213.3][6]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.300-preview.22212.3 to 6.0.300-preview.22213.3][6]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.2.0-4.22211.2 to 4.2.0-4.22212.4][7]

[6]: 8963eb7...3456e28
[7]: 8b5c5b8...f2d278f

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)

[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.Net.Compilers.Toolset**: from 4.2.0-4.22211.2 to 4.2.0-4.22212.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
2022-04-18 23:17:34 +00:00
Daniel Plaisted
d46c9533f7
Merge pull request #13632 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-18 06:57:07 -07:00
Michael Simons
21c7bb3abb
Fix threading issue in ExecuteHelper (#13643) 2022-04-15 15:24:48 -05:00
Michael Simons
5609d7db88
Exclude sdk content tests in PR validation and public CI (#13644) 2022-04-14 20:19:51 -05:00
Michael Simons
1f059f340c
[source-build] Expose CleanWhileBuilding msbuild option in build.sh (#13642) 2022-04-15 00:14:43 +00:00
Marc Paine
04e40fa940
Merge pull request #13629 from dotnet/marcpopMSFT-60300manifests
Update all workloads to the April release of 6.0.300 manifests
2022-04-14 14:20:25 -07:00