Jason Zhai
793a16fab4
Merge branch 'release/6.0.3xx' into release/6.0.4xx
2022-04-14 01:09:11 -07: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
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
Marc Paine
32eddb2738
Merge pull request #13594 from dotnet/darc-release/6.0.3xx-3b451efb-a515-4325-8d94-febe2965868c
...
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-12 14:56:17 -07:00
William Godbe
f001fc0f1f
[6.0.3xx] Update asp.net template versions ( #13545 )
2022-04-12 20:37:09 +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
72e5a349ae
Merge commit '915d644e451858f4f7c6e1416ea202695ddd54fb' into internal-merge-6.0.1xx-2022-04-12-1157
2022-04-12 11:57:14 -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
dotnet-maestro[bot]
07b0deb73e
Update dependencies from https://github.com/dotnet/sdk build 20220412.3
...
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.300-preview.22212.1 -> To Version 6.0.300-preview.22212.3
Dependency coherency updates
Microsoft.Net.Compilers.Toolset
From Version 4.2.0-4.22208.7 -> To Version 4.2.0-4.22211.2 (parent: Microsoft.NET.Sdk
2022-04-12 10:21:01 +00:00
v-wuzhai
ff4f7f50e5
Merge pull request #13593 from dotnet/darc-release/6.0.3xx-963e9e8a-6b30-402e-96ad-89fb8bb7f440
...
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-12 03:02:17 -07:00
dotnet-maestro[bot]
4f10b352b0
Update dependencies from https://github.com/dotnet/sdk build 20220412.1
...
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.300-preview.22211.12 -> To Version 6.0.300-preview.22212.1
2022-04-12 09:14:44 +00:00
v-wuzhai
2490c7faad
Merge pull request #13590 from dotnet/darc-release/6.0.3xx-9c459c82-3b40-4875-9d6f-a3c362a43833
...
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-11 19:12:53 -07:00
v-wuzhai
9fc7e547cb
Merge pull request #13581 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-11 19:01:05 -07:00
dotnet-maestro[bot]
d42ff0c17c
Update dependencies from https://github.com/dotnet/sdk build 20220411.12
...
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.300-preview.22210.6 -> To Version 6.0.300-preview.22211.12
2022-04-12 00:12:37 +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
v-wuzhai
d07ad95997
Merge pull request #13585 from dotnet/darc-release/6.0.3xx-ca59434f-5e2d-4706-87ef-eccb61be39a4
...
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-11 02:22:01 -07:00
dotnet-maestro[bot]
e021414cb1
Update dependencies from https://github.com/dotnet/sdk build 20220410.6
...
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
From Version 6.0.300-preview.22210.3 -> To Version 6.0.300-preview.22210.6
2022-04-11 05:52:41 +00:00
v-wuzhai
73cfd960ac
Merge pull request #13584 from dotnet/darc-release/6.0.3xx-2f6fd60c-8bfe-43e8-8ca2-1bea749158cd
...
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-10 21:38:02 -07:00
Jason Zhai
56d30baaa2
Restore the version.details.xml file
2022-04-10 21:29:05 -07:00
Jason Zhai
3d646a39f9
Merge branch 'release/6.0.2xx' into release/6.0.3xx
2022-04-10 21:23:03 -07:00
Jason Zhai
78655d99e9
Merge branch 'release/6.0.1xx' into release/6.0.2xx
2022-04-10 21:18:37 -07:00