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

Pin dependency on Core-Setup ref packs to 3.1.0 (#5814)

Browse source 
* Pin dependency on Core-Setup ref packs to 3.1.0

* Fixup core-setup feeds

* Move pinned deps later in file

* Update GenerateLayout to account for pinned packs
This commit is contained in:
William Godbe 2019-12-06 14:56:33 -08:00 committed by GitHub
parent 0c0a037663
commit a3c1db033e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NuGet.config
View file

@ -10,6 +10,7 @@
<add key="darc-pub-dotnet-wcf-eb417fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-eb417fde/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-53a17fc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-53a17fce-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-core-setup-7d57652" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-7d57652f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-core-setup-65f04fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-65f04fb6/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-0f7f38c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-0f7f38c4/nuget/v3/index.json" />
<add key="darc-pub-aspnet-AspNetCore-7db6969" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-7db69699/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

18
eng/Version.Details.xml
View file

@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.1.1-servicing.19576.9">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.1-servicing.19576.9">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.1-servicing.19576.9">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.1-servicing.19576.9">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>f3f2dd583fffa254015fc21ff0e45784b333256d</Sha>
@ -35,6 +27,16 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="3.1.0" Pinned="true">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0" Pinned="true">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>65f04fb6db7a5e198d05dbebd5c4ad21eb018f89</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0" CoherentParentDependency="Microsoft.NetCore.App.Internal">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0f7f38c4fd323b26da10cce95f857f77f0f09b48</Sha>

4
eng/Versions.props
View file

@ -64,10 +64,10 @@
<MicrosoftNETCoreAppInternalPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.1-servicing.19576.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.1-servicing.19576.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.1-servicing.19576.9</MicrosoftWindowsDesktopAppRefPackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>

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

@ -15,9 +15,9 @@
<CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
<!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
<NETCoreAppTargetingPackBlobVersion>$(CoreSetupBlobVersion)</NETCoreAppTargetingPackBlobVersion>
<AspNetCoreTargetingPackBlobVersion>$(AspNetCoreBlobVersion)</AspNetCoreTargetingPackBlobVersion>
<WindowsDesktopTargetingPackBlobVersion>$(CoreSetupBlobVersion)</WindowsDesktopTargetingPackBlobVersion>
<NETCoreAppTargetingPackBlobVersion>3.1.0</NETCoreAppTargetingPackBlobVersion>
<AspNetCoreTargetingPackBlobVersion>3.1.0</AspNetCoreTargetingPackBlobVersion>
<WindowsDesktopTargetingPackBlobVersion>3.1.0</WindowsDesktopTargetingPackBlobVersion>
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
</PropertyGroup>