Commit graph

22780 commits

Author SHA1 Message Date
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
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
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
dotnet-bot
44c01d1e46 Merge in 'release/6.0.2xx' changes 2022-04-11 01:41:20 +00: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
dotnet-bot
64b9715b0c Merge in 'release/6.0.2xx' changes 2022-04-08 02:08:59 +00: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