diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index c0d959c9f..3c91819a7 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -31,14 +31,15 @@ - $(CoreSetupBlobRootUrl)aspnetcore/store + $(CoreSetupBlobRootUrl)aspnetcore/store - - Build.RS.$(OSName)-$(ASPNETCoreRuntimeFileNameVersionToken).zip - AspNetCorePackageStoreLib$(Architecture).wixlib + + Build.RS.$(OSName)-$(AspNetCoreRuntimeFileNameVersionToken).zip + Build.RS.$(OSName)$(Architecture)-$(AspNetCoreRuntimeFileNameVersionToken).zip + AspNetCorePackageStoreLib$(Architecture).wixlib - $(PackagesDirectory)/$(ASPNETCoreRuntimeInstallerArchiveFileName) - $(PackagesDirectory)/$(ASPNETCoreRuntimeInstallerWixLibFileName) + $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName) + $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerWixLibFileName) @@ -60,27 +61,27 @@ Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> $(CoreSetupInstallerBlobRootUrl)/$(SharedHostVersion)/$(DownloadedSharedHostInstallerFileName) $(DownloadedSharedHostInstallerFile) - + <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> $(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName) $(DownloadedHostFxrInstallerFile) - + - <_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerWixLibFile" - Condition=" '$(ASPNETCoreRuntimeInstallerWixLibFile)' != '' And !Exists('$(ASPNETCoreRuntimeInstallerWixLibFile)')"> - $(ASPNETCoreRuntimeInstallerBlobRootUrl)/$(ASPNETCoreRuntimeVersion)/$(ASPNETCoreRuntimeInstallerWixLibFileName) - $(ASPNETCoreRuntimeInstallerWixLibFile) + <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerWixLibFile" + Condition=" '$(AspNetCoreRuntimeInstallerWixLibFile)' != '' And !Exists('$(AspNetCoreRuntimeInstallerWixLibFile)')"> + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeVersion)/$(AspNetCoreRuntimeInstallerWixLibFileName) + $(AspNetCoreRuntimeInstallerWixLibFile) - <_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerArchiveFile" - Condition="!Exists('$(ASPNETCoreRuntimeInstallerArchiveFile)')"> - $(ASPNETCoreRuntimeInstallerBlobRootUrl)/$(ASPNETCoreRuntimeVersion)/$(ASPNETCoreRuntimeInstallerArchiveFileName) - $(ASPNETCoreRuntimeInstallerArchiveFile) + <_DownloadAndExtractItem Include="AspNetCoreRuntimeInstallerArchiveFile" + Condition="!Exists('$(AspNetCoreRuntimeInstallerArchiveFile)')"> + $(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreRuntimeVersion)/$(AspNetCoreRuntimeInstallerArchiveFileName) + $(AspNetCoreRuntimeInstallerArchiveFile) $(AspNetRuntimePackageStorePublishDirectory) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index a3783839d..55dc0fbba 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -17,10 +17,10 @@ 2.0.0-preview1-002101 2.0.0-preview1-002101 0.1.0-alpha-142 - 2.0.0-preview1-30 - preview1 + 2.0.0-preview1-34 + preview1 - + diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props index d11542cf2..3376d5475 100644 --- a/build/OutputDirectories.props +++ b/build/OutputDirectories.props @@ -10,7 +10,7 @@ $(BaseOutputDirectory)/intermediate $(BaseOutputDirectory)/packages $(IntermediateDirectory)/sharedFrameworkPublish - $(IntermediateDirectory)/ASPNETCoreRuntimeStore + $(IntermediateDirectory)/AspNetCoreRuntimeStore $(IntermediateDirectory)/backwardsCompatibleSharedFrameworksPublish $(RepoRoot)/artifacts/testpackages/ $(OutputDirectory)/dotnet$(ExeExtension)