From 987d4c0b058297aff8504833d8571a1793388001 Mon Sep 17 00:00:00 2001 From: William Li Date: Fri, 2 Jun 2017 15:58:06 +0000 Subject: [PATCH 1/2] Make deb package has linux-x64 content By build using RID -- linux-x64 and package publish use HostRID ubuntu etc --- build/BackwardsCompatibilityRuntimes.props | 22 ++++++++-------- build/Branding.props | 9 ++++++- build/BuildInfo.targets | 29 ++++++++++++++++------ build/BundledRuntimes.props | 4 +-- build/FileExtensions.props | 22 ++++++++-------- build/package/Installer.DEB.proj | 6 ++--- build/package/Installer.DEB.targets | 3 +-- build/publish/PublishDebian.targets | 4 +-- 8 files changed, 59 insertions(+), 40 deletions(-) diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props index 72eddd70d..528d27c75 100644 --- a/build/BackwardsCompatibilityRuntimes.props +++ b/build/BackwardsCompatibilityRuntimes.props @@ -5,16 +5,16 @@ 1.1.0 1.1.0 - dotnet-host-$(ProductMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(InstallerExtension) - $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName) + dotnet-host-$(HostMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(OSName) + $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName) - dotnet-hostfxr-$(ProductMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(InstallerExtension) - $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName) + dotnet-hostfxr-$(HostMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(OSName) + $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName) - dotnet-sharedframework-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(InstallerExtension) - $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName) + dotnet-sharedframework-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(OSName) + $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName) - dotnet-$(ProductMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(ArchiveExtension) + dotnet-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(ArchiveExtension) $(CoreSetupBlobRootUrl)$(BackwardsCompatibility110CoreSetupChannel) $(BackwardsCompatibility110CoreSetupBlobRootUrlWithChannel)/Binaries/$(BackwardsCompatibility110SharedFrameworkVersion) @@ -34,24 +34,24 @@ <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile" - Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> + Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile)') And '$(OSName)' != 'linux'"> $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedFrameworkVersion)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName) $(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFile) <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedSharedHostInstallerFile" - Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)') And '$(InstallerExtension)' != ''"> + Condition="!Exists('$(BackwardsCompatibility110DownloadedSharedHostInstallerFile)') And '$(OSName)' != 'linux'"> $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110SharedHostVersion)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName) $(BackwardsCompatibility110DownloadedSharedHostInstallerFile) <_DownloadAndExtractItem Include="BackwardsCompatibility110DownloadedHostFxrInstallerFile" - Condition="!Exists('$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''"> + Condition="!Exists('$(BackwardsCompatibility110DownloadedHostFxrInstallerFile)') And '$(OSName)' != 'linux'"> $(BackwardsCompatibility110CoreSetupInstallerBlobRootUrl)/$(BackwardsCompatibility110HostFxrVersion)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName) $(BackwardsCompatibility110DownloadedHostFxrInstallerFile) - \ No newline at end of file + diff --git a/build/Branding.props b/build/Branding.props index 96068e439..07cf66d29 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -13,14 +13,21 @@ '$(Rid)' == 'fedora.24-x64' OR '$(Rid)' == 'opensuse.42.1-x64' ">$(Rid) $(OSName)-$(Architecture) + $(HostRid) + $(HostOSName)-$(Architecture) dotnet-sdk-internal dotnet-sdk-debug dotnet-sdk $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) + + $(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid) - + $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid) diff --git a/build/BuildInfo.targets b/build/BuildInfo.targets index 751f10737..fa7089b57 100644 --- a/build/BuildInfo.targets +++ b/build/BuildInfo.targets @@ -1,4 +1,23 @@ + + + + linux-x64 + x64 + linux + linux + + + + + $(HostRid) + x64 + $(HostOSName) + $(HostOSPlatform) + + + + @@ -7,14 +26,8 @@ - - - $(HostRid) - x64 - $(HostOSName) - $(HostOSPlatform) - - + + <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Rid>$(Rid)</Rid> diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 4484c7dc8..cd058b4de 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -1,7 +1,7 @@ - $(Rid) - $(ProductMonikerRid) + $(HostRid) + $(HostMonikerRid) -internal diff --git a/build/FileExtensions.props b/build/FileExtensions.props index cc9f7e79c..a6c6fca35 100644 --- a/build/FileExtensions.props +++ b/build/FileExtensions.props @@ -1,23 +1,23 @@ - .zip - .tar.gz + .zip + .tar.gz - .msi - .pkg - .deb + .msi + .pkg + .deb - .exe - $(InstallerExtension) - $(InstallerExtension) + .exe + $(InstallerExtension) + $(InstallerExtension) lib - + .so - .dll - .dylib + .dll + .dylib .exe diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 9310623cc..32721227c 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -10,11 +10,11 @@ TestDebuild; BuildSdkDeb; TestSdkDeb;" - Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' " + Condition=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' " Outputs="@(GeneratedInstallers)"/> + From a35d2947dae62513a018c67fa302a7a677f30425 Mon Sep 17 00:00:00 2001 From: William Li Date: Thu, 8 Jun 2017 00:12:42 -0700 Subject: [PATCH 2/2] Fix for win and mac --- build/BackwardsCompatibilityRuntimes.props | 6 ++-- build/BuildInfo.targets | 35 +++++++++------------- build/BundledRuntimes.props | 8 ++--- 3 files changed, 21 insertions(+), 28 deletions(-) diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props index 528d27c75..e63013084 100644 --- a/build/BackwardsCompatibilityRuntimes.props +++ b/build/BackwardsCompatibilityRuntimes.props @@ -5,13 +5,13 @@ 1.1.0 1.1.0 - dotnet-host-$(HostMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(OSName) + dotnet-host-$(HostMonikerRid).$(BackwardsCompatibility110SharedHostVersion)$(InstallerExtension) $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedHostInstallerFileName) - dotnet-hostfxr-$(HostMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(OSName) + dotnet-hostfxr-$(HostMonikerRid).$(BackwardsCompatibility110HostFxrVersion)$(InstallerExtension) $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedHostFxrInstallerFileName) - dotnet-sharedframework-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(OSName) + dotnet-sharedframework-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(InstallerExtension) $(PackagesDirectory)/$(BackwardsCompatibility110DownloadedSharedFrameworkInstallerFileName) dotnet-$(HostMonikerRid).$(BackwardsCompatibility110SharedFrameworkVersion)$(ArchiveExtension) diff --git a/build/BuildInfo.targets b/build/BuildInfo.targets index fa7089b57..df28e1980 100644 --- a/build/BuildInfo.targets +++ b/build/BuildInfo.targets @@ -1,23 +1,4 @@ - - - - linux-x64 - x64 - linux - linux - - - - - $(HostRid) - x64 - $(HostOSName) - $(HostOSPlatform) - - - - @@ -26,8 +7,20 @@ - - + + + True + $(HostRid) + x64 + $(HostOSName) + $(HostOSPlatform) + + linux-x64 + x64 + linux + linux + + <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Rid>$(Rid)</Rid> diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index cd058b4de..2d79fa46f 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -4,7 +4,7 @@ $(HostMonikerRid) - -internal + -internal dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) @@ -34,8 +34,8 @@ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion) - $(OSName)$(Architecture) - $(OSName) + $(HostOSName)$(Architecture) + $(HostOSName) linux -$(AspNetCoreCoherenceTimestamp) @@ -43,7 +43,7 @@ Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension) $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName) - AspNetCorePackageStoreLib$(Architecture)$(AspNetCoreRuntimeStoreSuffix).wixlib + AspNetCorePackageStoreLib$(Architecture)$(AspNetCoreRuntimeStoreSuffix).wixlib $(PackagesDirectory)/$(AspNetCoreRuntimeInstallerWixLibFileName)