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

26672 commits

This branch
This branch
All branches
Author SHA1 Message Date
Noah Gilson
7d6dad7442
Merge pull request #14674 from dotnet/darc-release/7.0.1xx-0d9c0155-9ee9-4d90-8b88-664ed07e96b6 
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals
 2022-10-06 10:20:25 -07:00
dotnet-maestro[bot]
65c0f172eb Update dependencies from https://github.com/dotnet/source-build-externals build 20221005.1 
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.22503.1 -> To Version 7.0.0-alpha.1.22505.1
 2022-10-06 12:49:17 +00:00
dotnet-bot
c89c9b1f85 Merge in 'release/6.0.4xx' changes 2022-10-05 22:36:43 +00:00
Marc Paine
06b150f716
Merge pull request #14667 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx 
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
 2022-10-05 15:25:20 -07:00
Marc Paine
88bc331e88
Fix emsdk hash 
I noticed in the codeflow from 3xx to 4xx that the hash got messed up in the process and set to the 6.0.9 one. We don't believe the version needs to be updated but the hashes should match so reverting this.
 2022-10-05 14:45:05 -07:00
Marc Paine
ff52e56145
Revert emsdk hash 2022-10-05 14:43:28 -07:00
dotnet-bot
a6eb8ca7af Merge in 'release/7.0.1xx' changes 2022-10-05 21:26:39 +00:00
Marc Paine
40eb27336a
Merge pull request #14651 from dotnet/darc-release/7.0.1xx-00709502-81a6-41f2-8e72-4c3b35ff7cd4 
[release/7.0.1xx] Update dependencies from dotnet/source-build-externals
 2022-10-05 14:16:16 -07:00
dotnet-bot
dca55bdbb0 Merge in 'release/7.0.1xx' changes 2022-10-05 20:39:13 +00:00
dotnet-maestro[bot]
3624d8be32
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14632) 
[release/7.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-3.22478.13 to 4.4.0-3.22480.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.4.0-preview-22479-03 to 17.4.0-preview-22480-04 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.4.0-preview.3.100 to 6.4.0-preview.3.107 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)

 - Remove backported msbuild patch

 - Add runtime PR 76471 as patch

 - Clean up overlapping patches in runtime
 2022-10-05 20:27:29 +00:00
Marc Paine
b779db552d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-10-05 11:50:00 -07:00
dotnet-bot
4be58903c8 Merge in 'release/6.0.3xx' changes 2022-10-05 17:32:28 +00:00
Marc Paine
d1a0d6bb62
Merge pull request #14659 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx 
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
 2022-10-05 10:16:46 -07:00
dotnet-bot
6d0cb55297 Merge in 'release/7.0.1xx' changes 2022-10-05 16:51:04 +00:00
Noah Gilson
a09cc5a220
Merge pull request #14663 from dotnet/darc-release/7.0.1xx-e9b9e963-b8fe-4ea9-a169-48b948e3c398 
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2022-10-05 09:38:04 -07:00
dotnet-maestro[bot]
c2a27951d5 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20221004.2 
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22479.1 -> To Version 7.0.0-alpha.1.22504.2
 2022-10-04 22:58:31 +00:00
Marc Paine
fd7ea35f90 Merge branch 'merge/release/6.0.1xx-to-release/6.0.3xx' of https://github.com/dotnet-maestro-bot/core-sdk into merge/release/6.0.1xx-to-release/6.0.3xx 2022-10-04 15:48:00 -07:00
dotnet-bot
912d959224 Merge in 'release/6.0.3xx' changes 2022-10-04 18:30:23 +00:00
dotnet-bot
5debb8747e Merge in 'release/6.0.4xx' changes 2022-10-04 18:29:47 +00:00
Marc Paine
c0718ca0ae
Merge pull request #14603 from dotnet/Jason/UpdateImagesFor601xx 
Update windows images for release/6.0.1xx
 2022-10-04 11:22:19 -07:00
Marc Paine
a7dfb6260f
Merge pull request #14654 from vseanreesermsft/branding-6.0.111-2022-10-04-0937 
Update branding to 6.0.111
 2022-10-04 11:20:05 -07:00
Marc Paine
9944284877
Merge pull request #14655 from vseanreesermsft/branding-6.0.306-2022-10-04-0937 
Update branding to 6.0.306
 2022-10-04 11:19:55 -07:00
Marc Paine
9d749467a5
Merge pull request #14656 from vseanreesermsft/branding-6.0.403-2022-10-04-0937 
Update branding to 6.0.403
 2022-10-04 11:19:44 -07:00
Sean Reeser
19a9961977 Update branding to 6.0.403 2022-10-04 09:37:55 -07:00
Sean Reeser
ba1239dfc7 Update branding to 6.0.306 2022-10-04 09:37:50 -07:00
Sean Reeser
32d8c6f54d Update branding to 6.0.111 2022-10-04 09:37:46 -07:00
dotnet-bot
8b689517a1 Merge in 'release/7.0.1xx' changes 2022-10-04 16:27:02 +00:00
dotnet-maestro[bot]
d982a88200
Update dependencies from https://github.com/dotnet/test-templates build 20221003.2 (#14650) 
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22479.1 -> To Version 1.0.2-beta4.22503.2

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
 2022-10-04 11:13:46 -05:00
dotnet-maestro[bot]
e8a016d6f8 Update dependencies from https://github.com/dotnet/source-build-externals build 20221003.1 
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.22463.5 -> To Version 7.0.0-alpha.1.22503.1
 2022-10-04 12:58:46 +00:00
Tom Deseyn
faa8ecb8a6 BundledVersions: update portable rid logic. 
Defaults the portable rid to match the rid.
This works for portable builds.

For non-portable builds, the portable rid can be
controlled using PortableOSName.

For source-build, we set PortableOSName based
on the bootstrap SDK's portable rid.
 2022-10-04 09:38:23 +02:00
dotnet-bot
9e5f5eef2e Merge in 'release/7.0.1xx' changes 2022-09-30 20:30:02 +00:00
Michael Simons
1ef043bd97
Enable online and offline source-build tarball build in all PRs (#14620) 2022-09-30 15:20:56 -05:00
Michael Simons
7f881d991e
Merge pull request #14622 from MichaelSimons/cleanup-sdk-patch 
Remove unnecessary sdk patch
 2022-09-30 15:20:25 -05:00
dotnet-bot
522898c1ce Merge in 'release/7.0.1xx' changes 2022-09-30 20:05:14 +00:00
Michael Simons
7b7a5b929f
Merge pull request #14581 from NikolaMilosavljevic/roslyn.new 
Remove roslyn Microsoft.CodeAnalysis.Common patch
 2022-09-30 14:55:07 -05:00
dotnet-bot
4ae3d9b628 Merge in 'release/7.0.1xx' changes 2022-09-30 18:09:58 +00:00
Marc Paine
61f59eff2c
Merge pull request #14467 from dotnet/marcpopMSFT-reenabletests 
Try reenabling all the tests listed in the installer repo
 2022-09-30 10:58:36 -07:00
dotnet-bot
37730d5380 Merge in 'release/7.0.1xx' changes 2022-09-30 17:50:47 +00:00
Marc Paine
9124f826e9
Merge pull request #14597 from dotnet/marcpopMSFT-implicitversionforGA 
Update the 3.1 and 6.0 implicit versions for GA
 2022-09-30 10:41:27 -07:00
dotnet-bot
54b723e322 Merge in 'release/7.0.1xx' changes 2022-09-30 16:53:34 +00:00
Marc Paine
5df54fc04c
Merge pull request #14634 from dotnet/darc-release/7.0.1xx-c1a4c818-0619-4a15-9b36-cbef49b700f2 
[release/7.0.1xx] Update dependencies from dotnet/test-templates
 2022-09-30 09:41:04 -07:00
Nikola Milosavljevic
04c49844d3 Do not set property already set by Roslyn 2022-09-30 16:23:36 +00:00
dotnet-maestro[bot]
7396bbb76f Update dependencies from https://github.com/dotnet/test-templates build 20220929.1 
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22478.2 -> To Version 1.0.2-beta4.22479.1
 2022-09-30 12:50:31 +00:00
dotnet-bot
2d2d90bfcf Merge in 'release/7.0.1xx' changes 2022-09-30 04:46:48 +00:00
v-wuzhai
9ea499a37f
Merge pull request #14629 from dotnet/darc-release/7.0.1xx-9867bebc-c311-480f-b18d-e27df7cd76b8 
[release/7.0.1xx] Update dependencies from dotnet/sdk
 2022-09-29 21:35:27 -07:00
dotnet-maestro[bot]
393ea8b689 Update dependencies from https://github.com/dotnet/sdk build 20220929.16 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22479.10 -> To Version 7.0.100-rtm.22479.16

Dependency coherency updates

Microsoft.Build
 From Version 17.4.0-preview-22479-02 -> To Version 17.4.0-preview-22479-03 (parent: Microsoft.NET.Sdk
 2022-09-30 03:06:56 +00:00
dotnet-bot
24c35aabf4 Merge in 'release/7.0.1xx' changes 2022-09-30 01:54:40 +00:00
v-wuzhai
eb23d8cf9a
Merge pull request #14625 from dotnet/darc-release/7.0.1xx-21d52278-7b3a-46e4-b3aa-a759d949f8a3 
[release/7.0.1xx] Update dependencies from dotnet/source-build-reference-packages
 2022-09-29 18:45:08 -07:00
v-wuzhai
c2865252e6
Merge pull request #14616 from dotnet/darc-release/7.0.1xx-aaa9a7ec-ca46-4f1a-b8e4-bfe19157990c 
[release/7.0.1xx] Update dependencies from dotnet/sdk
 2022-09-29 18:43:28 -07:00
dotnet-maestro[bot]
8e40be0d49 Update dependencies from https://github.com/dotnet/sdk build 20220929.10 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22478.5 -> To Version 7.0.100-rtm.22479.10

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Net.Compilers.Toolset,Microsoft.Build,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22476.10 -> To Version 7.0.0-rtm.22478.5 (parent: Microsoft.NET.Sdk
 2022-09-29 20:52:06 +00:00