mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[master] Update dependencies from dotnet/sdk (#9064)

Browse source 
[master] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.EntityFrameworkCore: from 6.0.0-alpha.1.20509.5 to 6.0.0-alpha.1.20560.6 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)
  - dotnet-watch: from 6.0.0-alpha.1.20526.6 to 6.0.0-alpha.1.20561.2 (parent: Microsoft.NET.Sdk)

 - Update installer target framework to 6.0

 - Install 5.0.0 and 3.1.0 runtime

 - Merge remote-tracking branch 'upstream/master' into darc-master-4cce5096-36fd-4b94-ba12-5d198a821a27

 - Update SDK to one that targets 6.0

 - disable test as tool build for now

 - Fix aspnet runtime RID
This commit is contained in:
dotnet-maestro[bot] 2020-11-17 06:56:05 +00:00 committed by GitHub
parent 32d179d680
commit bb1e128c34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
eng/Version.Details.xml
View file

@ -47,37 +47,37 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-alpha.1.20526.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-alpha.1.20561.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>062237e054487e2e53c186660e459eda69b75e59</Sha>
<Sha>9f72904328357d3747cd605b6e44b9d82065b9bb</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-alpha.1.20526.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-alpha.1.20561.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>062237e054487e2e53c186660e459eda69b75e59</Sha>
<Sha>9f72904328357d3747cd605b6e44b9d82065b9bb</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20526.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-alpha.1.20561.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>062237e054487e2e53c186660e459eda69b75e59</Sha>
<Sha>9f72904328357d3747cd605b6e44b9d82065b9bb</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20526.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20561.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>062237e054487e2e53c186660e459eda69b75e59</Sha>
<Sha>9f72904328357d3747cd605b6e44b9d82065b9bb</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-alpha.1.20509.5" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-alpha.1.20560.6" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>2352499b52cdfc95ddcfd81c4967e12512e00eee</Sha>
<Sha>5c27c3c6ecad5d898ca37a733f8c2587c074e1a1</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.0-alpha.1.20526.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.0-alpha.1.20561.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>062237e054487e2e53c186660e459eda69b75e59</Sha>
<Sha>9f72904328357d3747cd605b6e44b9d82065b9bb</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.0-alpha.1.20526.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.0-alpha.1.20561.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>062237e054487e2e53c186660e459eda69b75e59</Sha>
<Sha>9f72904328357d3747cd605b6e44b9d82065b9bb</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="6.0.0-alpha.1.20526.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-watch" Version="6.0.0-alpha.1.20561.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>062237e054487e2e53c186660e459eda69b75e59</Sha>
<Sha>9f72904328357d3747cd605b6e44b9d82065b9bb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.20420.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -91,13 +91,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>b89c3b306bbcdcf650f027736927254dfa053d9e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-alpha.1.20561.16">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-alpha.1.20566.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>927964ad361439cfc42255799722d6b97360ac7c</Sha>
<Sha>8c0f92a2af63e5d42b78deaeb1784c7a7d23f8b5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-alpha.1.20561.16">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-alpha.1.20566.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>927964ad361439cfc42255799722d6b97360ac7c</Sha>
<Sha>8c0f92a2af63e5d42b78deaeb1784c7a7d23f8b5</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-alpha.1.20560.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

18
eng/Versions.props
View file

@ -45,21 +45,21 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20526.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-alpha.1.20526.6</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-alpha.1.20526.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-alpha.1.20526.6</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-alpha.1.20526.6</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-alpha.1.20526.6</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>6.0.0-alpha.1.20526.6</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20561.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-alpha.1.20561.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-alpha.1.20561.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-alpha.1.20561.2</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-alpha.1.20561.2</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-alpha.1.20561.2</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>6.0.0-alpha.1.20561.2</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-alpha.1.20561.16</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-alpha.1.20561.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-alpha.1.20566.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-alpha.1.20566.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

2
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-alpha.1.20561.19",
"dotnet": "6.0.100-alpha.1.20563.2",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"

2
src/redist/targets/GenerateBundledVersions.targets
View file

@ -288,7 +288,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackName="Microsoft.AspNetCore.App.Ref"
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')"
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
/>
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"

1
test/SdkTests/SdkTests.csproj
View file

@ -193,6 +193,7 @@
<MSBuild Projects="@(TestProjectToRun)"
Targets="RunTestsAsTool"
BuildInParallel="true"
Condition = "false"
/>
</Target>