Commit graph

22795 commits

Author SHA1 Message Date
DotNet Bot
a20feadf6d Merged PR 22530: [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.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 6.0.200-1.22178.2 to 6.0.200-1.22219.3 (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**: 20220421.10
- **Date Produced**: April 21, 2022 4:12:13 PM UTC
- **Commit**: 22d868d384c490b46b4eaf17c0512ec8f55f58df
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.203-servicing.22220.14 to 6.0.203-servicing.22221.10][3]
  - **Microsoft.NET.Sdk**: [from 6.0.203-servicing.22220.14 to 6.0.203-servicing.22221.10][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.5 to 6.0.5][4]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][4]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4]
  - **dotnet-dev-certs**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4]
  - **dotnet-user-secrets**: [from 6.0.5-servicing.22214.12 to 6.0.5-servicing.22218.2][4]
  - **Microsoft.NET.ILLink.Tasks**: [from 6.0.200-1.22178.2 to 6.0.200-1.22219.3][5]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC640fb21&targetVersion=GC22d868d&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCdd34abd&targetVersion=GCe5f183b&_a=files
[5]: 01c4f59...28db36b

[DependencyUpdate]: <> (...
2022-04-21 16:51:27 +00:00
DotNet Bot
4c3299644b Merged PR 22506: [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.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.5 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)

[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**: 20220420.14
- **Date Produced**: April 20, 2022 5:18:55 PM UTC
- **Commit**: 640fb21ffabaef2ab5bef766ff9dba41112518c6
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.203-servicing.22218.20 to 6.0.203-servicing.22220.14][1]
  - **Microsoft.NET.Sdk**: [from 6.0.203-servicing.22218.20 to 6.0.203-servicing.22220.14][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.5 to 6.0.5][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.5-servicing.22213.4 to 6.0.5-servicing.22215.11][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.5 to 6.0.5][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.4-servicing.22165.3 to 6.0.5-servicing.22215.9][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCa8aa7d9&targetVersion=GC640fb21&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0636f1e&targetVersion=GCad94063&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCfcb07d6&targetVersion=GC14bf2e5&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b75...
2022-04-20 20:49:02 +00:00
DotNet Bot
a08b61f596 Merged PR 22486: [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**: 20220418.20
- **Date Produced**: April 19, 2022 6:26:43 AM UTC
- **Commit**: a8aa7d9280b787a7512e9cb841073b10fb99d2b7
- **Branch**: refs/heads/internal/release/6.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.203-servicing.22217.1 to 6.0.203-servicing.22218.20][1]
  - **Microsoft.NET.Sdk**: [from 6.0.203-servicing.22217.1 to 6.0.203-servicing.22218.20][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0a95ab6&targetVersion=GCa8aa7d9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b065b754-67d8-417c-0ef9-08d9d602f120)
2022-04-20 16:45:32 +00:00
dotnet-bot
7dea0430a6 Merge in 'release/6.0.2xx' changes 2022-04-20 06:14:17 +00: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
dotnet-bot
37bcac0bad Merge in 'release/6.0.2xx' changes 2022-04-20 02:53:46 +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
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
Bo Anderson
e44e5907d6
Fix compatibility with BSD df (#13653) 2022-04-19 08:44:59 -05:00
DotNet Bot
ba3b75ffe8 Merged PR 22387: [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.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.22213.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.4-servicing.22165.2 to 6.0.5-servicing.22213.4 (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.22214.12 (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.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.4-servicing.22172.4 to 6.0.5-servicing.22214.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.202 to 6.0.203 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.202-servicing.22165.5 to 6.0.203-servicing.22214.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.202 to 6.0.203 (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.NET.ILLink.Tasks**: from 6.0.200-1.22124.2 to 6.0.200-1.22178.2 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b065b754-67d8...
2022-04-19 00:17:54 +00:00
dotnet-bot
87d97a05ec Merge in 'release/6.0.2xx' changes 2022-04-18 14:14:37 +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
Michael Simons
3da46c012c
Add retry to omnisharp download (#13639) 2022-04-14 21:20:25 +00:00
Michael Simons
ec6f14da69
Update MsftToSbSdk baseline in response to SBRP text-only package fix (#13628) 2022-04-14 12:48:49 -05:00
Jason Zhai
6ac60f74eb Restore the version.details.xml file 2022-04-13 23:55:34 -07:00
dotnet-bot
544239db6c Merge in 'release/6.0.2xx' changes 2022-04-14 02:59:53 +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
dotnet-bot
407de424d9 Merge in 'release/6.0.2xx' changes 2022-04-13 18:13:11 +00: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
dotnet-bot
fe3cf303db Merge in 'release/6.0.2xx' changes 2022-04-13 17:14:52 +00: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
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]
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
dotnet-bot
75fe0c82d8 Merge in 'release/6.0.2xx' changes 2022-04-13 15:09:41 +00: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
dotnet-bot
309c78a89b Merge in 'release/6.0.2xx' changes 2022-04-13 14:58:04 +00: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
dotnet-bot
01f8e186be Merge in 'release/6.0.2xx' changes 2022-04-13 02:55:09 +00: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
dotnet-bot
e818fde057 Merge in 'release/6.0.2xx' changes 2022-04-12 20:42:02 +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
dotnet-bot
72c16b9f71 Merge in 'release/6.0.2xx' changes 2022-04-12 19:15:54 +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
72e5a349ae Merge commit '915d644e45' into internal-merge-6.0.1xx-2022-04-12-1157 2022-04-12 11:57:14 -07:00
Sean Reeser
8e7442b2d8 Merge commit 'f8a55617d2' into internal-merge-6.0.2xx-2022-04-12-1157 2022-04-12 11:57:07 -07:00
dotnet-bot
7428724b78 Merge in 'release/6.0.2xx' changes 2022-04-11 09:34:28 +00:00