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

Replace legacy packages with VS insertion packages for non-shipping version numbers. (#9059)

Browse source
This commit is contained in:
Jeremy Koritzinsky 2020-11-11 13:48:35 -08:00 committed by GitHub
parent 87f8351fcc
commit 029081017e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
eng/Version.Details.xml
View file

@ -5,7 +5,7 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c0d88e97c24130c78429dbee4444e4941b1c26f6</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App" Version="6.0.0-alpha.1.20559.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20559.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c0d88e97c24130c78429dbee4444e4941b1c26f6</Sha>
</Dependency>
@ -13,6 +13,10 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>c0d88e97c24130c78429dbee4444e4941b1c26f6</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-alpha.1.20557.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6cfef20c1524b8d4c1495a652dfe9e898c5a486b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-alpha.1.20557.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6cfef20c1524b8d4c1495a652dfe9e898c5a486b</Sha>

4
eng/Versions.props
View file

@ -70,7 +70,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<MicrosoftNETCoreAppInternalPackageVersion>6.0.0-alpha.1.20557.2</MicrosoftNETCoreAppInternalPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-alpha.1.20557.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20557.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.0-alpha.1.20557.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-alpha.1.20557.2</MicrosoftNETCoreAppRefPackageVersion>
@ -79,7 +79,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<MicrosoftWindowsDesktopAppPackageVersion>6.0.0-alpha.1.20559.4</MicrosoftWindowsDesktopAppPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-alpha.1.20559.4</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-alpha.1.20559.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-alpha.1.20559.4</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>

2
global.json
View file

@ -3,7 +3,7 @@
"dotnet": "5.0.100-rc.2.20479.15",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppInternalPackageVersion)"
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
]
}
},

4
src/redist/targets/GenerateLayout.targets
View file

@ -8,8 +8,8 @@
<PropertyGroup>
<!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
<AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion)</AspNetCoreBlobVersion>
<CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
<WindowsDesktopBlobVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</WindowsDesktopBlobVersion>
<CoreSetupBlobVersion>$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)</CoreSetupBlobVersion>
<WindowsDesktopBlobVersion>$(VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion)</WindowsDesktopBlobVersion>
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
<NETCoreAppTargetingPackBlobVersion>$(CoreSetupBlobVersion)</NETCoreAppTargetingPackBlobVersion>