Merge pull request #8336 from johnbeisner/RuntimeBreakingChange
Reacting to core-setup changes for 'DEB' distro agnostic installers
This commit is contained in:
commit
ac06ffcf2d
4 changed files with 29 additions and 11 deletions
|
@ -7,21 +7,28 @@
|
||||||
<InstallerStartSuffix Condition="'$(HostOSName)' == 'osx'">-internal</InstallerStartSuffix>
|
<InstallerStartSuffix Condition="'$(HostOSName)' == 'osx'">-internal</InstallerStartSuffix>
|
||||||
|
|
||||||
<!-- Downloaded Installers + Archives -->
|
<!-- Downloaded Installers + Archives -->
|
||||||
<DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
|
<DownloadedRuntimeDepsInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension)</DownloadedRuntimeDepsInstallerFileName>
|
||||||
|
<DownloadedRuntimeDepsInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedRuntimeDepsInstallerFileName)</DownloadedRuntimeDepsInstallerFile>
|
||||||
|
|
||||||
|
<!-- Use the "x64" Rid when downloading Linux shared framework 'DEB' installer files. -->
|
||||||
|
<SharedFrameworkInstallerFileRid>$(CoreSetupRid)</SharedFrameworkInstallerFileRid>
|
||||||
|
<SharedFrameworkInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' ">x64</SharedFrameworkInstallerFileRid>
|
||||||
|
|
||||||
|
<DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
|
||||||
<DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
|
<DownloadedSharedHostInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
|
||||||
|
|
||||||
<DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(CoreSetupRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
|
<DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
|
||||||
<DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName)</DownloadedHostFxrInstallerFile>
|
<DownloadedHostFxrInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName)</DownloadedHostFxrInstallerFile>
|
||||||
|
|
||||||
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(CoreSetupRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
|
<DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
|
||||||
<DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
|
<DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
|
||||||
|
|
||||||
<!-- Use the portable linux-x64 Rid when downloading the shared framework compressed file.
|
<!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
|
||||||
NOTE: There isn't a 'linux-x64' version of the installers or the additional shared framweork. -->
|
|
||||||
<SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
|
<SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
|
||||||
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
|
<SharedFrameworkRid Condition=" '$(UsePortableLinuxSharedFramework)' == 'true' ">linux-x64</SharedFrameworkRid>
|
||||||
<CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
<CombinedFrameworkHostCompressedFileName>dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</CombinedFrameworkHostCompressedFileName>
|
||||||
</PropertyGroup>
|
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
|
<CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
|
||||||
|
@ -52,6 +59,13 @@
|
||||||
<ExtractDestination>$(SharedFrameworkPublishDirectory)</ExtractDestination>
|
<ExtractDestination>$(SharedFrameworkPublishDirectory)</ExtractDestination>
|
||||||
</_DownloadAndExtractItem>
|
</_DownloadAndExtractItem>
|
||||||
|
|
||||||
|
<_DownloadAndExtractItem Include="DownloadedRuntimeDepsInstallerFile"
|
||||||
|
Condition="'$(IsDebianBaseDistro)' == 'true' And '$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedRuntimeDepsInstallerFile)') And '$(InstallerExtension)' != ''">
|
||||||
|
<Url>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
|
||||||
|
<DownloadFileName>$(DownloadedRuntimeDepsInstallerFile)</DownloadFileName>
|
||||||
|
<ExtractDestination></ExtractDestination>
|
||||||
|
</_DownloadAndExtractItem>
|
||||||
|
|
||||||
<_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile"
|
<_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile"
|
||||||
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
|
Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''">
|
||||||
<Url>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
|
<Url>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26103-03</MicrosoftNETCoreAppPackageVersion>
|
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-26105-01</MicrosoftNETCoreAppPackageVersion>
|
||||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||||
<MicrosoftBuildPackageVersion>15.6.0-preview-000022-1216653</MicrosoftBuildPackageVersion>
|
<MicrosoftBuildPackageVersion>15.6.0-preview-000022-1216653</MicrosoftBuildPackageVersion>
|
||||||
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
|
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
|
||||||
|
@ -26,8 +26,8 @@
|
||||||
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
|
<MicrosoftTemplateEngineCliLocalizationPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineCliLocalizationPackageVersion>
|
||||||
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
|
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
|
||||||
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
|
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineCliPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
|
||||||
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview1-26103-03</MicrosoftDotNetPlatformAbstractionsPackageVersion>
|
<MicrosoftDotNetPlatformAbstractionsPackageVersion>2.1.0-preview1-26105-01</MicrosoftDotNetPlatformAbstractionsPackageVersion>
|
||||||
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview1-26103-03</MicrosoftExtensionsDependencyModelPackageVersion>
|
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0-preview1-26105-01</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||||
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1-alpha-174</MicrosoftDotNetCliCommandLinePackageVersion>
|
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1-alpha-174</MicrosoftDotNetCliCommandLinePackageVersion>
|
||||||
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.2.1-alpha-002133</MicrosoftDotNetProjectJsonMigrationPackageVersion>
|
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.2.1-alpha-002133</MicrosoftDotNetProjectJsonMigrationPackageVersion>
|
||||||
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
|
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
Outputs="$(SdkInstallerFile)" >
|
Outputs="$(SdkInstallerFile)" >
|
||||||
|
|
||||||
<!-- Install Shared Framework Packages -->
|
<!-- Install Shared Framework Packages -->
|
||||||
|
<Exec Command="sudo dpkg -i $(DownloadedRuntimeDepsInstallerFile)" />
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
|
||||||
|
@ -90,8 +91,8 @@
|
||||||
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
|
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
|
||||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
||||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
||||||
|
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="TestSdkDeb"
|
<Target Name="TestSdkDeb"
|
||||||
|
@ -104,6 +105,7 @@
|
||||||
Outputs="$(DebianTestResultsXmlFile)" >
|
Outputs="$(DebianTestResultsXmlFile)" >
|
||||||
|
|
||||||
<!-- Install Dependencies and SDK Packages -->
|
<!-- Install Dependencies and SDK Packages -->
|
||||||
|
<Exec Command="sudo dpkg -i $(DownloadedRuntimeDepsInstallerFile)" />
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
|
||||||
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
|
<Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
|
||||||
|
@ -124,8 +126,8 @@
|
||||||
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
|
<Exec Command="sudo dpkg -r $(AspNetCoreRuntimePackageName)" />
|
||||||
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(SharedFxDebianPackageName)" />
|
||||||
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostFxrDebianPackageName)" />
|
||||||
|
|
||||||
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
<Exec Command="sudo dpkg -r $(HostDebianPackageName)" />
|
||||||
|
<Exec Command="sudo dpkg -r $(RuntimeDepsPackageName)" />
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="PrepareDotnetDebDirectories">
|
<Target Name="PrepareDotnetDebDirectories">
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
|
|
||||||
<!-- Package Identities -->
|
<!-- Package Identities -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<RuntimeDepsPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeDepsPackageVersion>
|
||||||
|
<RuntimeDepsPackageName>dotnet-runtime-deps-$(RuntimeDepsPackageVersion)</RuntimeDepsPackageName>
|
||||||
<SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
|
<SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
|
||||||
<SdkDebianPackageName>dotnet-sdk-$(SdkDebianPackageVersion)</SdkDebianPackageName>
|
<SdkDebianPackageName>dotnet-sdk-$(SdkDebianPackageVersion)</SdkDebianPackageName>
|
||||||
<SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxDebianPackageVersion>
|
<SharedFxDebianPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFxDebianPackageVersion>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue