mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
23678 commits 41 branches 190 tags 95 MiB
Commit graph

23678 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Paine
e4032f3cc3
Merge pull request #13420 from dotnet/darc-release/6.0.3xx-917cef8e-b735-4fb9-bb4d-0c2582b8d860 
[release/6.0.3xx] Update dependencies from dotnet/sdk
 2022-03-15 13:46:24 -07:00
Marc Paine
e5ccd2f220
Merge pull request #13426 from manodasanW/patch-5 
[main] Windows SDK projection update
 2022-03-15 11:21:44 -07:00
Marc Paine
4938a371ec
Merge pull request #13425 from manodasanW/patch-4 
[release/6.0.2xx] Windows SDK projection update
 2022-03-15 10:59:26 -07:00
Manodasan Wignarajah
587bac23dd
[main] Windows SDK projection update 2022-03-15 09:26:13 -07:00
Manodasan Wignarajah
7dbbf21923
[release/6.0.2xx] Windows SDK projection update 2022-03-15 09:25:17 -07:00
v-wuzhai
f9d834e483
Merge pull request #13412 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main 
[automated] Merge branch 'release/6.0.3xx' => 'main'
 2022-03-15 02:57:00 -07:00
dotnet-maestro[bot]
9fd1cb9959 Update dependencies from https://github.com/dotnet/sdk build 20220315.4 
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.4

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 12.0.3-beta.22161.4 -> To Version 12.0.3-beta.22164.2 (parent: Microsoft.NET.Sdk
 2022-03-15 09:54:10 +00:00
dotnet-maestro[bot]
75bdbcd4e1 Update dependencies from https://github.com/dotnet/sdk build 20220315.1 
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.1
 2022-03-15 08:47:11 +00:00
v-wuzhai
bfe04f5150
Merge pull request #13416 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-15 01:02:11 -07:00
v-wuzhai
f46f04d56a
Merge pull request #13415 from dotnet/darc-release/6.0.3xx-f56a538c-e7a5-4b4e-a48b-ddd77ddb167d 
[release/6.0.3xx] Update dependencies from dotnet/sdk
 2022-03-15 01:01:16 -07:00
v-wuzhai
637a4d7bf1
Merge pull request #13414 from dotnet/darc-main-89780d3c-459e-41c2-95f7-6babc48a8622 
[main] Update dependencies from dotnet/source-build-reference-packages
 2022-03-15 00:58:28 -07:00
Jason Zhai
afd76b47f4 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-15 00:01:35 -07:00
dotnet-maestro[bot]
681bebd311 Update dependencies from https://github.com/dotnet/sdk build 20220314.17 
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.17
 2022-03-14 23:55:32 +00:00
Marc Paine
6a8cc38b66
Merge pull request #13417 from dotnet/marcpopMSFT-fixduplicatepackages 
Revert prior templatelocator and msbuildextension changes as they weren't required
 2022-03-14 16:50:06 -07:00
Marc Paine
ab3ddec440 Revert prior changes as only the first and last change were actually needed. 2022-03-14 14:27:34 -07:00
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
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
dotnet-maestro[bot]
9fefd90920 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220314.1 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22160.2 -> To Version 7.0.0-alpha.1.22164.1
 2022-03-14 19:42:18 +00:00
MichaelSimons
8ec456efa7 Remove unnecessary runtime source-build patch 2022-03-14 14:46:02 +00:00
Michael Simons
146dc6feac Correct difference in source-build pipeline pool references 2022-03-14 09:18:08 -05:00
Jason Zhai
61d316d9df Merge branch 'release/6.0.3xx' into main 2022-03-14 02:50:13 -07: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
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
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
v-wuzhai
570bb2f1c4
Merge pull request #13317 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main 
[automated] Merge branch 'release/6.0.3xx' => 'main'
 2022-03-13 20:54:17 -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]
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
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
Marc Paine
bfebed846a
Merge branch 'main' into merge/release/6.0.3xx-to-main 2022-03-11 15:57:47 -08: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
69ea868ac1
Fix source-build graph in Version.Details.xml (#13384) 2022-03-11 15:53:22 -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
MichaelSimons
90153d2939 Remove aspnetcore patch that was backported 2022-03-11 15:02:26 +00:00
Jason Zhai
9fa0019355 Merge branch 'release/6.0.3xx' into main 2022-03-10 23:36:54 -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