Commit graph

22937 commits

Author SHA1 Message Date
dotnet-maestro[bot]
a882615ccd
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 (#13409)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:26:07 -07:00
dotnet-maestro[bot]
a2621d473d
Update dependencies from https://github.com/dotnet/arcade build 20220311.1 (#13405)
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.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:24:26 -07:00
Marc Paine
c365b60bad
Merge pull request #13390 from dotnet/marcpopMSFT-removemaui601
Remove maui workloads from 6.0.100
2022-03-14 14:22:49 -07:00
dotnet-maestro[bot]
b054be41f9 Update dependencies from https://github.com/dotnet/sdk build 20220314.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.6
2022-03-14 20:14:02 +00:00
v-wuzhai
4969ceaeee
Merge pull request #13413 from dotnet/darc-release/6.0.3xx-58f749c3-a750-4f1f-bec8-24a95951a3ff
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-14 01:07:32 -07:00
dotnet-maestro[bot]
d10705cf90 Update dependencies from https://github.com/dotnet/sdk build 20220313.5
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.14 -> To Version 6.0.300-preview.22163.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22161.2 -> To Version 12.0.3-beta.22161.4 (parent: Microsoft.NET.Sdk
2022-03-14 06:57:01 +00:00
v-wuzhai
fbddf9d272
Merge pull request #13402 from dotnet/darc-release/6.0.1xx-d47734a0-c243-46cb-bfbc-f421dd29a3d5
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-03-13 22:40:48 -07:00
v-wuzhai
61e6adbc39
Merge pull request #13403 from dotnet/darc-release/6.0.3xx-3b54c85c-cc7f-491b-8592-7a98c5acb747
[release/6.0.3xx] Update dependencies from dotnet/arcade
2022-03-13 22:40:02 -07:00
v-wuzhai
22be0e23d2
Merge pull request #13406 from dotnet/darc-release/6.0.3xx-7d762506-e7c8-49ef-b540-d2c131d77a7d
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-13 22:39:24 -07:00
v-wuzhai
79975b9016
Merge pull request #13407 from dotnet/darc-release/6.0.1xx-449458a7-ce3a-4fbe-b142-21f6f78cf1b0
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-13 22:38:35 -07:00
v-wuzhai
41336c3545
Merge pull request #13408 from dotnet/darc-release/6.0.3xx-c85a0547-bf78-4a6b-a942-5ef1255675a0
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-13 22:37:51 -07:00
Marc Paine
2d5f6fc8bd
Add additional hostfxr versions (#13404)
* Update the nuspec as well to remove the duplicates

* Add additional architecture
2022-03-11 18:57:30 -08:00
dotnet-maestro[bot]
dd6a10fb45 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1
2022-03-12 02:56:19 +00:00
dotnet-maestro[bot]
cc5d04d869 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22160.1 -> To Version 6.0.0-servicing.22161.1
2022-03-12 02:56:09 +00:00
dotnet-maestro[bot]
436178eccf Update dependencies from https://github.com/dotnet/sdk build 20220311.14
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.10 -> To Version 6.0.300-preview.22161.14
2022-03-12 02:43:56 +00:00
dotnet-maestro[bot]
74901ba760 Update dependencies from https://github.com/dotnet/sdk build 20220311.13
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.10 -> To Version 6.0.300-preview.22161.13
2022-03-12 01:27:23 +00:00
Michael Simons
a6c57692ab
Update source-build MsftToSbSdk.diff baseline (#13400) 2022-03-12 01:18:34 +00:00
Marc Paine
37f553ace2 Add additional architecture 2022-03-11 16:49:39 -08:00
dotnet-maestro[bot]
dbc11b81b3 Update dependencies from https://github.com/dotnet/arcade build 20220311.1
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1
2022-03-12 00:46:20 +00:00
Marc Paine
fcd74519d7 Merge branch 'marcpopMSFT-fixduplicatepackages' of https://github.com/dotnet/installer into marcpopMSFT-fixduplicatepackages 2022-03-11 16:45:24 -08:00
Marc Paine
9cf0975b1e
Merge pull request #13401 from dotnet/darc-release/6.0.3xx-1c5c1b01-59e3-41fd-9607-d8cfd9cbba60
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-11 16:44:14 -08:00
dotnet-maestro[bot]
6b3f3a8f02 Update dependencies from https://github.com/dotnet/arcade build 20220311.1
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22159.8 -> To Version 6.0.0-beta.22161.1
2022-03-12 00:40:30 +00:00
dotnet-maestro[bot]
d1f4e8f5d9 Update dependencies from https://github.com/dotnet/sdk build 20220311.10
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.6 -> To Version 6.0.300-preview.22161.10

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 6.0.300-preview.22160.1 -> To Version 6.0.300-preview.22161.3 (parent: Microsoft.NET.Sdk
2022-03-11 23:44:13 +00:00
dotnet-maestro[bot]
658ce5d408 Update dependencies from https://github.com/dotnet/sdk build 20220311.8
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.6 -> To Version 6.0.300-preview.22161.8

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22160.1 -> To Version 6.0.300-preview.22161.3 (parent: Microsoft.NET.Sdk
2022-03-11 22:38:04 +00:00
Michael Simons
1b84fc233f
Remove template text-only packages which are alread included in source-build (#13380) 2022-03-11 15:49:32 -06:00
dotnet-maestro[bot]
eda631478e
Update dependencies from https://github.com/dotnet/sdk build 20220311.6 (#13398)
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22160.6 -> To Version 6.0.300-preview.22161.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build,Microsoft.SourceBuild.Intermediate.source-build
 From Version 6.0.3 -> To Version 6.0.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-11 21:23:50 +00:00
Marc Paine
c9bae215ef
Merge pull request #13397 from dotnet/marcpopMSFT-fixduplicatepackages
Only produce one version of the swr file.
2022-03-11 11:56:16 -08:00
Michael Simons
a65da76e23
Merge pull request #13395 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-11 13:37:32 -06:00
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
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
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
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
Marc Paine
18f1baa6e6
Fix duplicate packages 2022-03-10 09:08:26 -08:00