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

[release/3.0.1xx] Update dependencies from aspnet/AspNetCore (#5526)

Browse source 
* Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.2

- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1

* Fix blob URLs for stabilized ASP.NET 3.0.x

Unpin 3.0.x ASP.NET targeting pack

Revert dotnet-* tools packages to 3.0.0 versions

* Update dependencies from https://github.com/aspnet/AspNetCore build 20191104.7

- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.1

* Fix version of the targeting pack

* Fix targeting pack version
This commit is contained in:
dotnet-maestro[bot] 2019-11-04 21:42:29 -08:00 committed by Matt Mitchell
parent 88b33a0f8c
commit 8b9de75a22
4 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NuGet.config
View file

@ -10,7 +10,8 @@
<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-32085cb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-32085cbc/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
<add key="darc-pub-aspnet-AspNetCore-aee5e40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-aee5e408/nuget/v3/index.json" />
<add key="darc-pub-aspnet-AspNetCore-22dedcb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-22dedcb2/nuget/v3/index.json" />
<add key="darc-pub-aspnet-AspNetCore-0b713e5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-0b713e57/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

36
eng/Version.Details.xml
View file

@ -41,29 +41,31 @@
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0" Pinned="true">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>0b713e577716e915082021942065aff1d20a0604</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.1">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>22dedcb2f0de59022e0383e1f05c9caffc708522</Sha>
</Dependency>
<!-- Only package from ASP.NET that did not stabilize and is still published, use it to get unsuffixed blob location -->
<!-- Replace with Microsoft.AspNetCore.App.Internal when available: https://github.com/aspnet/AspNetCore/issues/16827 -->
<Dependency Name="VS.Redist.Common.AspNetCore.TargetingPack.x64.3.0" Version="3.0.1-servicing.19554.7">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>22dedcb2f0de59022e0383e1f05c9caffc708522</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-rc2.19465.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.1-servicing.19551.9">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-rc2.19465.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>0f54cd75536340715c02e9913aa5a8d435e76518</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.1-servicing.19551.9">
<Dependency Name="dotnet-watch" Version="3.0.0-rc2.19465.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>0f54cd75536340715c02e9913aa5a8d435e76518</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.1-servicing.19551.9">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>0f54cd75536340715c02e9913aa5a8d435e76518</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.1-servicing.19551.9">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>0f54cd75536340715c02e9913aa5a8d435e76518</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.1-servicing.19551.9">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>0f54cd75536340715c02e9913aa5a8d435e76518</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.1-servicing.19476.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/templating</Uri>

12
eng/Versions.props
View file

@ -24,12 +24,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.1-servicing.19551.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.1-servicing.19551.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.1-servicing.19551.9</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.1-servicing.19551.9</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.1-servicing.19551.9</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.1</MicrosoftAspNetCoreAppRefPackageVersion>
<VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion>3.0.1-servicing.19554.7</VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-rc2.19465.2</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-rc2.19465.2</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-rc2.19465.2</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->

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

@ -10,12 +10,12 @@
<PropertyGroup>
<!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)</AspNetCoreBlobVersion>
<AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion)</AspNetCoreBlobVersion>
<CoreSetupBlobVersion>$(MicrosoftNETCoreAppInternalPackageVersion)</CoreSetupBlobVersion>
<!-- Change these individually to or $(CoreSetupBlobVersion) or $(AspNetCoreBlobVersion) if corresponding .Ref packages are unpinned. -->
<NETCoreAppTargetingPackBlobVersion>3.0.0</NETCoreAppTargetingPackBlobVersion>
<AspNetCoreTargetingPackBlobVersion>3.0.0</AspNetCoreTargetingPackBlobVersion>
<AspNetCoreTargetingPackBlobVersion>$(AspNetCoreBlobVersion)</AspNetCoreTargetingPackBlobVersion>
<WindowsDesktopTargetingPackBlobVersion>3.0.0</WindowsDesktopTargetingPackBlobVersion>
<NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
</PropertyGroup>
@ -226,8 +226,7 @@
<BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<BaseUrl Condition="'$(AspNetTargetingPackIsPinned)' == 'true'">$(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)</BaseUrl>
<BaseUrl Condition="'$(AspNetTargetingPackIsPinned)' != 'true'">$(AspNetCoreSharedFxRootUrl)$(MicrosoftAspNetCoreAppRefPackageVersion)</BaseUrl>
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreTargetingPackBlobVersion)</BaseUrl>
<DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
</BundledInstallerComponent>