Commit graph

23406 commits

Author SHA1 Message Date
Marc Paine
a623165837
Remove emscripten coherency depedency 2022-03-11 10:29:27 -08:00
Marc Paine
16f3836fe6
Update Version.Details.xml 2022-03-11 10:26:41 -08:00
Marc Paine
da96094fde Only produce one version of the swr file. 2022-03-11 10:17:05 -08:00
Jason Zhai
bc9486b8c3 Remove duplicate dependencies 2022-03-10 22:11:50 -08:00
Marc Paine
2cf433858f
Update the nuspec as well to remove the duplicates (#13393) 2022-03-10 20:07:24 -08:00
Jason Zhai
36fa54c321 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-10 18:58:21 -08:00
dotnet-bot
0a881e8874 Merge in 'release/6.0.2xx' changes 2022-03-11 01:05:01 +00:00
Marc Paine
290291a0da Only do signcheck if there are files to sign check 2022-03-10 16:57:47 -08:00
vseanreesermsft
6f507e2be8
Merge pull request #13346 from vseanreesermsft/internal-merge-6.0.2xx-2022-03-08-1137
Merging internal commits for release/6.0.2xx
2022-03-10 16:55:38 -08:00
Marc Paine
1004682469
Merge pull request #13370 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-03-10 16:53:42 -08:00
Marc Paine
09a60fcb5f Update the nuspec as well to remove the duplicates 2022-03-10 16:47:16 -08:00
Sean Reeser
20d537f0de Merge remote-tracking branch 'origin/release/6.0.2xx' into internal-merge-6.0.2xx-2022-03-08-1137 2022-03-10 15:28:36 -08:00
dotnet-bot
4cebe96eb8 Merge in 'release/6.0.1xx' changes 2022-03-10 22:13:40 +00:00
Marc Paine
2c17f40ecf
Remove maui workloads from 6.0.100
The old workloads break MU so we either have to update them or remove them.
2022-03-10 14:03:12 -08:00
Marc Paine
5e34864f0c
Merge pull request #13389 from dotnet/darc-release/6.0.3xx-5bddc6b7-5903-42f1-87ff-f711d5ca2184
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-10 14:00:29 -08:00
Marc Paine
e25c681f60
Merge pull request #13386 from dotnet/darc-release/6.0.1xx-83ad0b2e-e526-47dd-b6af-b6b0276aade9
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-03-10 14:00:23 -08:00
Marc Paine
c10ad05ffb
Merge pull request #13385 from dotnet/marcpopMSFT-fixduplicatepackages
Fix duplicate packages
2022-03-10 13:59:49 -08:00
dotnet-maestro[bot]
b3788b0b4a Update dependencies from https://github.com/dotnet/sdk build 20220310.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22160.3 -> To Version 6.0.300-preview.22160.6

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22158.11 -> To Version 6.0.300-preview.22160.1 (parent: Microsoft.NET.Sdk
2022-03-10 21:06:40 +00:00
Jacques Eloff
faa618ce2d
Ensure finalizer.exe is always cached (#13388) 2022-03-10 12:23:35 -08:00
Marc Paine
211f57e0fb
Merge pull request #13387 from dotnet/darc-release/6.0.3xx-0360c6c3-c471-4e8e-aec9-ab5033bca539
[release/6.0.3xx] Update dependencies from dotnet/arcade
2022-03-10 11:30:43 -08:00
dotnet-bot
a9a8031b98 Merge in 'release/6.0.1xx' changes 2022-03-10 19:00:17 +00:00
Michael Simons
b4af3c6dd1
Merge pull request #13374 from MichaelSimons/SB-6.0.103-artifacts
Update source-build with 6.0.103 artifacts
2022-03-10 12:48:29 -06:00
dotnet-maestro[bot]
bf283dc686 Update dependencies from https://github.com/dotnet/arcade build 20220309.8
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8
2022-03-10 18:38:02 +00:00
dotnet-maestro[bot]
1d02c2b774 Update dependencies from https://github.com/dotnet/arcade build 20220309.8
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8
2022-03-10 18:30:46 +00:00
dotnet-bot
28efbbba39 Merge in 'release/6.0.1xx' changes 2022-03-10 17:15:46 +00:00
Marc Paine
18f1baa6e6
Fix duplicate packages 2022-03-10 09:08:26 -08:00
dotnet-maestro[bot]
a8d4b43e34
Update dependencies from https://github.com/dotnet/sdk build 20220310.3 (#13379)
[release/6.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.2.0-2.22158.15 to 4.2.0-2.22159.10 (parent: Microsoft.NET.Sdk)
2022-03-10 17:05:31 +00:00
Marc Paine
37c4a4728a
Merge pull request #13382 from dotnet/darc-release/6.0.1xx-cacce36e-7b3f-4cd7-aa77-0f7960b763f6
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-10 09:03:15 -08:00
Marc Paine
9e984b0ac8
Merge pull request #13381 from dotnet/darc-release/6.0.3xx-201c1eb8-4273-4b16-8d79-8d3088e7d5e8
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-10 09:03:11 -08:00
Michael Simons
9c6a93aa8e
Merge pull request #13369 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-03-10 09:57:25 -06:00
dotnet-maestro[bot]
dc797288d4 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1
2022-03-10 15:34:40 +00:00
dotnet-maestro[bot]
3cbe72d752 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1
2022-03-10 15:34:39 +00:00
dotnet-bot
9325c72cec Merge in 'release/6.0.1xx' changes 2022-03-10 14:43:53 +00:00
Michael Simons
d98038c498
Fix invalid pipeline trigger. 2022-03-10 08:32:51 -06:00
Jason Zhai
85a7a87220 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-09 22:10:08 -08:00
dotnet-bot
ecd9bc0ea2 Merge in 'release/6.0.1xx' changes 2022-03-10 03:47:09 +00:00
Michael Simons
1be173704f
Disable public source-build tarball ci (#13377) 2022-03-09 21:35:31 -06:00
dotnet-bot
d619bd35bb Merge in 'release/6.0.1xx' changes 2022-03-10 02:10:01 +00:00
v-wuzhai
7a9cbfeb2a
Merge pull request #13358 from dotnet/darc-release/6.0.3xx-68594d04-5933-4f63-aa9a-c0831c99487e
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-09 17:59:42 -08:00
v-wuzhai
bf31ee6a06
Merge pull request #13359 from dotnet/darc-release/6.0.1xx-7c8d119e-827e-478d-bd7d-ebfb112cee6f
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-09 17:58:36 -08:00
v-wuzhai
8b1d276843
Merge pull request #13373 from dotnet/darc-release/6.0.3xx-c0f6b24d-6c89-4ee7-90e6-bf32798819c6
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-09 17:57:19 -08:00
Michael Simons
b58bb0b579 Resolve merge issues in source-build 2022-03-09 19:43:01 -06:00
Michael Simons
ec5ed63d8c
Merge branch 'release/6.0.2xx' into merge/release/6.0.1xx-to-release/6.0.2xx 2022-03-09 19:31:32 -06:00
MichaelSimons
ca2b7c8cbe Update source-build with 6.0.103 artifacts 2022-03-10 00:19:52 +00:00
dotnet-maestro[bot]
54a0c0322d Update dependencies from https://github.com/dotnet/sdk build 20220309.13
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22159.1 -> To Version 6.0.300-preview.22159.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22158.8 -> To Version 12.0.3-beta.22159.2 (parent: Microsoft.NET.Sdk
2022-03-09 23:41:33 +00:00
Marc Paine
282b722f63
Merge pull request #13356 from dotnet/darc-release/6.0.3xx-16372dbb-683c-4ec6-b71d-3bb24bbf0fd4
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-09 14:28:34 -08:00
dotnet-bot
3df267e893 Merge in 'release/6.0.1xx' changes 2022-03-09 20:32:47 +00:00
Doug Bunting
67bae3a688
[6.0.3xx] Bump aspnetcore template versions (#13367) 2022-03-09 12:21:10 -08:00
Doug Bunting
a8858e9369
[6.0.2xx] Bump aspnetcore template versions (#13366) 2022-03-09 12:21:02 -08:00
Doug Bunting
519f6dc513
[6.0.1xx] Bump aspnetcore template versions (#13365) 2022-03-09 12:20:55 -08:00