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 (#4851)

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

- dotnet-user-secrets - 3.0.0-rc2.19465.2
- dotnet-watch - 3.0.0-rc2.19465.2
- Microsoft.AspNetCore.App.Ref - 3.0.0
- Microsoft.AspNetCore.App.Runtime.win-x64 - 3.0.0
- dotnet-dev-certs - 3.0.0-rc2.19465.2
- Microsoft.AspNetCore.DeveloperCertificates.XPlat - 3.0.0-rc2.19465.2

* Correctly identify aspnetcore blob subdir
This commit is contained in:
dotnet-maestro[bot] 2019-09-15 17:27:29 -07:00 • committed by Matt Mitchell
parent 969693d5f7
commit b6037e6820
4 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NuGet.config
View file

@ -11,6 +11,7 @@
<add key="darc-pub-dotnet-templating-b2663fb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-b2663fb0/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-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" />
<!--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="nuget.org" value="https://api.nuget.org/v3/index.json" />

24
eng/Version.Details.xml
View file

@ -39,29 +39,29 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc2.19464.5">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>adc28fdb422cd9306b65c9f67ced13aaecce8f76</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-rc2.19464.5">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>adc28fdb422cd9306b65c9f67ced13aaecce8f76</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-rc2.19464.5">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-rc2.19465.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>adc28fdb422cd9306b65c9f67ced13aaecce8f76</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-rc2.19464.5">
<Dependency Name="dotnet-dev-certs" Version="3.0.0-rc2.19465.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>adc28fdb422cd9306b65c9f67ced13aaecce8f76</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-rc2.19464.5">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-rc2.19465.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>adc28fdb422cd9306b65c9f67ced13aaecce8f76</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-rc2.19464.5">
<Dependency Name="dotnet-watch" Version="3.0.0-rc2.19465.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>adc28fdb422cd9306b65c9f67ced13aaecce8f76</Sha>
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0" 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.0-rc2.19464.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-rc2.19464.5</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-rc2.19464.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-rc2.19464.5</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-rc2.19464.5</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-rc2.19464.5</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-rc2.19465.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<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 -->

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

@ -7,6 +7,13 @@
<Templates21LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.1\</Templates21LayoutPath>
<DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
</PropertyGroup>
<PropertyGroup>
<!-- The aspnetcore blobs will get uploaded to a directory that is not
stabilized. There is not a great package that can be used to identify this version at
the moment. For a workaround, use Microsoft.AspNetCore.DeveloperCertificates.XPlat's version. -->
<AspNetCoreBlobDirectory>$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)</AspNetCoreBlobDirectory>
</PropertyGroup>
<Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo;SetBuildDefaults">
<PropertyGroup>
@ -188,7 +195,7 @@
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
<BundledLayoutComponent Include="DownloadedAspNetCoreSharedFxArchiveFile">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)</BaseUrl>
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
<DownloadFileName>$(AspNetCoreSharedFxArchiveFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
<RelativeLayoutPath></RelativeLayoutPath>
@ -198,7 +205,7 @@
https://github.com/aspnet/AspNetCore/issues/8806 -->
<BundledLayoutComponent Include="DownloadedAspNetTargetingPackArchiveFile"
Condition="'$(InstallerExtension)' == '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)</BaseUrl>
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
<DownloadFileName>$(AspNetTargetingPackArchiveFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
<RelativeLayoutPath></RelativeLayoutPath>
@ -206,21 +213,21 @@
<BundledInstallerComponent Include="DownloadedAspNetTargetingPackInstallerFile"
Condition="'$(InstallerExtension)' != '.pkg' And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetTargetingPackVersion)</BaseUrl>
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
<DownloadFileName>$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
</BundledInstallerComponent>
<BundledInstallerComponent Include="DownloadedAspNetCoreSharedFxInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' AND '$(DownloadedAspNetCoreSharedFxInstallerFileName)' != '' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)</BaseUrl>
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
<DownloadFileName>$(DownloadedAspNetCoreSharedFxInstallerFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
</BundledInstallerComponent>
<BundledInstallerComponent Include="AspNetCoreSharedFxBaseRuntimeVersionFile"
Condition="!$(Architecture.StartsWith('arm'))">
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)</BaseUrl>
<BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobDirectory)</BaseUrl>
<DownloadFileName>$(AspNetCoreSharedFxBaseRuntimeVersionFileName)</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
</BundledInstallerComponent>