diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index afa3f6b20..42a41d189 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -7,21 +7,28 @@ -internal - dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) + dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedRuntimeDepsInstallerFileName) + + + $(CoreSetupRid) + x64 + + dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) - dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(CoreSetupRid)$(InstallerExtension) + dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) - dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(CoreSetupRid)$(InstallerExtension) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) - + $(CoreSetupRid) linux-x64 dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - + + $(CoreSetupBlobRootUrl)Runtime/ @@ -52,6 +59,13 @@ $(SharedFrameworkPublishDirectory) + <_DownloadAndExtractItem Include="DownloadedRuntimeDepsInstallerFile" + Condition="'$(IsDebianBaseDistro)' == 'true' And '$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedRuntimeDepsInstallerFile)') And '$(InstallerExtension)' != ''"> + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(DownloadedRuntimeDepsInstallerFile) + + + <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index d4770f2ed..ca5b4bbd9 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 2.1.0-preview1-26103-03 + 2.1.0-preview1-26105-01 $(MicrosoftNETCoreAppPackageVersion) 15.6.0-preview-000022-1216653 $(MicrosoftBuildPackageVersion) @@ -26,8 +26,8 @@ $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) $(MicrosoftTemplateEngineCliPackageVersion) - 2.1.0-preview1-26103-03 - 2.1.0-preview1-26103-03 + 2.1.0-preview1-26105-01 + 2.1.0-preview1-26105-01 0.1.1-alpha-174 1.2.1-alpha-002133 $(MicrosoftDotNetProjectJsonMigrationPackageVersion) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 4b684d161..7f865ba07 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -22,6 +22,7 @@ Outputs="$(SdkInstallerFile)" > + @@ -90,8 +91,8 @@ - + + @@ -124,8 +126,8 @@ - + diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets index e8bcb67b4..c66fb282b 100644 --- a/build/package/Installer.DEB.targets +++ b/build/package/Installer.DEB.targets @@ -25,6 +25,8 @@ + $(MicrosoftNETCoreAppPackageVersion) + dotnet-runtime-deps-$(RuntimeDepsPackageVersion) $(SdkVersion) dotnet-sdk-$(SdkDebianPackageVersion) $(MicrosoftNETCoreAppPackageVersion)