Commit graph

23118 commits

Author SHA1 Message Date
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
Michael Simons
3da46c012c
Add retry to omnisharp download (#13639) 2022-04-14 21:20:25 +00:00
Marc Paine
8ed3ae9f13
Fix the source build leg for the 300 workloads 2022-04-14 13:17:10 -07:00
Michael Simons
ec6f14da69
Update MsftToSbSdk baseline in response to SBRP text-only package fix (#13628) 2022-04-14 12:48:49 -05:00
Michael Simons
934c237640
Update source-built artifacts version (#13638) 2022-04-14 09:45:34 -05:00
Jason Zhai
6ac60f74eb Restore the version.details.xml file 2022-04-13 23:55:34 -07:00
dotnet-maestro-bot
d419470991
Add patch for linker prebuilt (#13630) (#13633)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-04-14 03:27:25 +00:00
Michael Simons
9104a1f6e4
Add patch for linker prebuilt (#13630) 2022-04-13 21:49:19 -05:00
Logan Bussell
9563e594c5
[release/6.0.1xx] Retry source-build artifacts download on failure (#13591)
* retry source-built artifacts download with curl
2022-04-13 17:43:13 -07:00
Marc Paine
fc36133df9
Update Version.Details.xml 2022-04-13 16:49:20 -07:00
Marc Paine
3ddadcc14f
Update all workloads to the April release of 6.0.300 manifests 2022-04-13 13:33:27 -07:00
Matt Mitchell
44edb2fda5
Merge pull request #13627 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-13 12:11:11 -07:00
Matt Mitchell
286a3905f1
Merge pull request #13617 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-13 11:01:52 -07:00
Matt Mitchell
a4cf1b3b67
Merge pull request #13618 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-13 11:00:58 -07:00
Matt Mitchell
411e89e2f7
Merge pull request #13625 from dotnet/darc-release/6.0.2xx-19069f66-dc6b-4be0-b4e2-3611a944ad9e
[release/6.0.2xx] Update dependencies from dotnet/arcade
2022-04-13 10:10:11 -07:00
dotnet-maestro[bot]
28696f02e1
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13624)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22208.1 -> To Version 6.0.0-servicing.22213.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-13 10:04:10 -07:00
dotnet-maestro[bot]
12c30eeb32
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13623)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22208.1 -> To Version 6.0.0-servicing.22213.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-13 09:44:29 -07:00
dotnet-maestro[bot]
6c8f85b46e
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13622)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22213.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-13 09:44:12 -07:00
Matt Mitchell
14330ee057
Merge branch 'release/6.0.3xx' into merge/release/6.0.2xx-to-release/6.0.3xx 2022-04-13 09:37:28 -07:00
Matt Mitchell
aade06c08b
Merge branch 'release/6.0.2xx' into merge/release/6.0.1xx-to-release/6.0.2xx 2022-04-13 09:33:17 -07:00
dotnet-maestro[bot]
f47eaa666b
Update dependencies from https://github.com/dotnet/arcade build 20220412.5 (#13626)
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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-13 09:30:44 -07:00
dotnet-maestro[bot]
5ac5af9b48
Update dependencies from https://github.com/dotnet/arcade build 20220412.5 (#13619)
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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-04-13 08:54:04 -07:00
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
Marc Paine
f17fb6728c
Final branding for 6.0.300 (#13608) 2022-04-13 08:02:27 -07:00
Manodasan Wignarajah
ef856a09d1
Windows SDK projection update (#13613) 2022-04-13 07:58:28 -07:00
Manodasan Wignarajah
660c499ef6
Windows SDK projection update (#13612) 2022-04-13 07:58:07 -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
Matt Mitchell
40f5222a0d
Merge pull request #13602 from vseanreesermsft/internal-merge-6.0.1xx-2022-04-12-1157
Merging internal commits for release/6.0.1xx
2022-04-13 07:47:09 -07:00
v-wuzhai
319635a0eb
Merge pull request #13609 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-13 02:05:41 -07:00
Jason Zhai
abb75d6449 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-13 01:09:20 -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