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

Updated ASP .NET Core Runtime blob storage configuration.

Browse source
This commit is contained in:
John Beisner 2017-04-27 16:09:51 -07:00 committed by Livar Cunha
parent 27b77da7a1
commit b43acf4752
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/BundledRuntimes.props
View file

@ -13,12 +13,6 @@
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerPortableSuffix)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
<DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
<!-- Examples: Build.RuntimeStore.linux-preview1-24648.zip AspNetCorePackageStoreLibx64.wixlib -->
<ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' ">Build.RuntimeStore.$(OSName)-$(ASPNETCoreRuntimeFileNameVersionToken).zip</ASPNETCoreRuntimeInstallerFileName>
<ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' And '$(OSName)' == 'win' ">AspNetCorePackageStoreLib$(Architecture).wixlib</ASPNETCoreRuntimeInstallerFileName>
<ASPNETCoreRuntimeInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(ASPNETCoreRuntimeInstallerFileName)</ASPNETCoreRuntimeInstallerFile>
<!-- Use the portable linux-x64 Rid when downloading the shared framework compressed file.
NOTE: There isn't a 'linux-x64' version of the installers or the additional shared framweork. -->
<SharedFrameworkRid>$(ProductMonikerRid)</SharedFrameworkRid>
@ -34,7 +28,17 @@
<CoreSetupInstallerBlobRootUrl>$(CoreSetupBlobRootUrlWithChannel)/Installers</CoreSetupInstallerBlobRootUrl>
<CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion)</CoreSetupDownloadDirectory>
<CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</CombinedSharedHostAndFrameworkArchive>
</PropertyGroup>
<PropertyGroup>
<ASPNETCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store</ASPNETCoreRuntimeInstallerBlobRootUrl>
<ASPNETCoreRuntimeDownloadDirectory>$(IntermediateDirectory)/ASPNETCoreRuntimeDownload</ASPNETCoreRuntimeDownloadDirectory>
<!-- Examples: Build.RS.linux-preview1.zip AspNetCorePackageStoreLibx64.wixlib -->
<ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' ">Build.RS.$(OSName)-$(ASPNETCoreRuntimeFileNameVersionToken).zip</ASPNETCoreRuntimeInstallerFileName>
<ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' And '$(OSName)' == 'win' ">AspNetCorePackageStoreLib$(Architecture).wixlib</ASPNETCoreRuntimeInstallerFileName>
<ASPNETCoreRuntimeInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(ASPNETCoreRuntimeDownloadDirectory)/$(ASPNETCoreRuntimeInstallerFileName)</ASPNETCoreRuntimeInstallerFile>
</PropertyGroup>
<ItemGroup>
@ -66,7 +70,7 @@
<ExtractDestintation></ExtractDestintation>
</_DownloadAndExtractItem>
<_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerFile"
<_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerFile"
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(ASPNETCoreRuntimeInstallerFile)') And '$(InstallerExtension)' != ''">
<Url>$(ASPNETCoreRuntimeInstallerBlobRootUrl)/$(ASPNETCoreRuntimeVersion)/$(ASPNETCoreRuntimeInstallerFileName)</Url>
<DownloadFileName>$(ASPNETCoreRuntimeInstallerFile)</DownloadFileName>

4
build/DependencyVersions.props
View file

@ -17,8 +17,8 @@
<PlatformAbstractionsVersion>2.0.0-preview1-002101</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview1-002101</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
<ASPNETCoreRuntimeVersion>2.0.11626.0-TEST</ASPNETCoreRuntimeVersion>
<ASPNETCoreRuntimeFileNameVersionToken>preview1-24648</ASPNETCoreRuntimeFileNameVersionToken>
<ASPNETCoreRuntimeVersion>2.0.0-preview1-30</ASPNETCoreRuntimeVersion>
<ASPNETCoreRuntimeFileNameVersionToken>preview1</ASPNETCoreRuntimeFileNameVersionToken>
</PropertyGroup>