From c6ccdb29fdebaab32d07377fb6a1da40b15ce047 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Fri, 5 Jan 2018 20:51:50 +0000 Subject: [PATCH 1/6] Reacting to core-setup changes for 'DEB' distro agnostic installers; example: 'dotnet-runtime-2.1.0-preview1-26104-06-x64.deb' Plus: Update CoreSetup to preview1-26105-01 --- build/BundledRuntimes.props | 8 +++++--- build/DependencyVersions.props | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index afa3f6b20..884c1d491 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -13,11 +13,13 @@ dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(CoreSetupRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) - dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(CoreSetupRid)$(InstallerExtension) + + $(CoreSetupRid) + x64 + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) - + $(CoreSetupRid) linux-x64 dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) 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) From 68c2b1d0608a9e10a78a1978a67147499a54501a Mon Sep 17 00:00:00 2001 From: jbeisner Date: Fri, 5 Jan 2018 21:35:48 +0000 Subject: [PATCH 2/6] Update 'DEB' filenames for downloads of the 'host' and 'hostfxr'. --- build/BundledRuntimes.props | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 884c1d491..4c7b3a125 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -7,23 +7,25 @@ -internal - dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) - $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) - - dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(CoreSetupRid)$(InstallerExtension) - $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) - - + $(CoreSetupRid) x64 + + dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedSharedHostInstallerFileName) + + dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedHostFxrInstallerFileName) + dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension) $(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName) - + $(CoreSetupRid) linux-x64 dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) - + + $(CoreSetupBlobRootUrl)Runtime/ From ed8d9c6390bfd0cba9fe602e0776c020a9fbc428 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Fri, 5 Jan 2018 23:11:47 +0000 Subject: [PATCH 3/6] Download the 'dotnet-runtime-deps' installer file to address the 'BuildSDKDeb' errors. --- build/BundledRuntimes.props | 10 ++++++++++ build/package/Installer.DEB.proj | 1 + 2 files changed, 11 insertions(+) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index 4c7b3a125..f00ba9433 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -7,6 +7,9 @@ -internal + dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedSharedHostDepsInstallerFileName) + $(CoreSetupRid) x64 @@ -56,6 +59,13 @@ $(SharedFrameworkPublishDirectory) + <_DownloadAndExtractItem Include="DownloadedSharedHostDepsInstallerFile" + Condition="'$(IsDebianBaseDistro)' == 'true' And $(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostDepsInstallerFile)') And '$(InstallerExtension)' != ''"> + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedSharedHostDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(DownloadedSharedHostDepsInstallerFile) + + + <_DownloadAndExtractItem Include="DownloadedSharedFrameworkInstallerFile" Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedFrameworkInstallerFile)') And '$(InstallerExtension)' != ''"> $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedSharedFrameworkInstallerFileName)$(CoreSetupBlobAccessTokenParam) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 4b684d161..672ee16eb 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -22,6 +22,7 @@ Outputs="$(SdkInstallerFile)" > + From 002ddd637469037419070b1e28e8cba1c06c45aa Mon Sep 17 00:00:00 2001 From: jbeisner Date: Fri, 5 Jan 2018 23:23:15 +0000 Subject: [PATCH 4/6] Fixing a typo... --- build/BundledRuntimes.props | 12 ++++++------ build/package/Installer.DEB.proj | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props index f00ba9433..42a41d189 100644 --- a/build/BundledRuntimes.props +++ b/build/BundledRuntimes.props @@ -7,8 +7,8 @@ -internal - dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) - $(PackagesDirectory)/$(DownloadedSharedHostDepsInstallerFileName) + dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension) + $(PackagesDirectory)/$(DownloadedRuntimeDepsInstallerFileName) $(CoreSetupRid) @@ -59,10 +59,10 @@ $(SharedFrameworkPublishDirectory) - <_DownloadAndExtractItem Include="DownloadedSharedHostDepsInstallerFile" - Condition="'$(IsDebianBaseDistro)' == 'true' And $(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedSharedHostDepsInstallerFile)') And '$(InstallerExtension)' != ''"> - $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedSharedHostDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam) - $(DownloadedSharedHostDepsInstallerFile) + <_DownloadAndExtractItem Include="DownloadedRuntimeDepsInstallerFile" + Condition="'$(IsDebianBaseDistro)' == 'true' And '$(SkipBuildingInstallers)' != 'true' And !Exists('$(DownloadedRuntimeDepsInstallerFile)') And '$(InstallerExtension)' != ''"> + $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam) + $(DownloadedRuntimeDepsInstallerFile) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 672ee16eb..decc4ed70 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -22,7 +22,7 @@ Outputs="$(SdkInstallerFile)" > - + From eb2565719b4a6b35f47d232d7ceee265e8145cbc Mon Sep 17 00:00:00 2001 From: jbeisner Date: Sat, 6 Jan 2018 00:14:57 +0000 Subject: [PATCH 5/6] Fixing the install and uninstall of the 'RuntimeDepsPackage' --- build/package/Installer.DEB.proj | 5 +++-- build/package/Installer.DEB.targets | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index decc4ed70..339fb5faa 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -91,7 +91,7 @@ - + @@ -105,6 +105,7 @@ Outputs="$(DebianTestResultsXmlFile)" > + @@ -125,7 +126,7 @@ - + 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) From 8d95d05f1aeeaf179708ac548568f388decf0384 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Sat, 6 Jan 2018 00:49:43 +0000 Subject: [PATCH 6/6] Uninstall the 'dotnet-host' before 'dotnet-runtime-deps' --- build/package/Installer.DEB.proj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj index 339fb5faa..7f865ba07 100644 --- a/build/package/Installer.DEB.proj +++ b/build/package/Installer.DEB.proj @@ -91,8 +91,8 @@ - + - +