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

23752 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jason Zhai
36fa54c321 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-10 18:58:21 -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
44804cc6d7
Merge pull request #13383 from dotnet/darc-main-ef15b245-8e3d-456c-8700-947e11f0e5ad 
[main] Update dependencies from dotnet/source-build-reference-packages
 2022-03-10 14:00:34 -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
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
Doug Bunting
f29b6a1f4f
[main] Bump aspnetcore template versions (#13368) 
* [main] Bump aspnetcore template versions
- we release a new targeting pack every time
- bump 3.1 through 6.0 `$(VersionFeatureXX)` values

* Update GenerateBundledVersions.targets

Co-authored-by: William Godbe <wigodbe@microsoft.com>
 2022-03-10 11:06:30 -08: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
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
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
dotnet-maestro[bot]
e5aa9a1372 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.2 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22154.4 -> To Version 7.0.0-alpha.1.22160.2
 2022-03-10 16:34:49 +00: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]
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
Jason Zhai
85a7a87220 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-09 22:10:08 -08: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
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
dotnet-maestro[bot]
d589d22fb7
Update dependencies from https://github.com/dotnet/sdk build 20220309.14 (#13375) 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.10 -> To Version 7.0.100-preview.3.22159.14

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2022-03-10 01:22:30 +00:00
dotnet-maestro[bot]
08f21810f5
Update dependencies from https://github.com/dotnet/sdk build 20220309.10 (#13372) 
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.5 -> To Version 7.0.100-preview.3.22159.10

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2022-03-09 16:05:09 -08:00