From 6a0cf8d5e1c3caa9a0d5b31e1f1d93360c39c0f3 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 21 Nov 2018 09:38:54 -0800 Subject: [PATCH 1/2] Changes in SDK bundle installation methodology (#121) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes in SDK bundle installation methodology: 1. Manage the 3 potential SDK bundle installation locations In precedential order: A. the SDK bundle’s self-registered installation location [x64 or x86] B. ‘Program Files’ + “dotnet” [if 'dotnet.exe' exists] C. the “installpath’s” input parameter’s value D. ‘Program Files’ + “dotnet” 2. Communicate the SDK bundle installation location to the chained MSIs 3. Disable the CLI SDK MSI from installing ‘stand-alone’ 4. SDK bundle self-registers the installation location value. Other: * Adding a file search for 'dotnet.exe'; updates * Changing the MSI blocking conditional. * Changed: "AuthoredRegistryKeys" to : "AuthoredRegistryKeys_x86node" * Managing the x86 and x64 install locations * "DOTNETHOME" should not overridable; adding an explicit override for identical install paths: "DOTNETHOMESIMILARITYCHECKOVERRIDE"; adding comments. --- .gitignore | 2 +- build/package/Installer.MSI.targets | 3 +- packaging/windows/clisdk/bundle.thm | 6 +- packaging/windows/clisdk/bundle.wxl | 10 +-- packaging/windows/clisdk/bundle.wxs | 83 +++++++++++++++++++++-- packaging/windows/clisdk/dotnet.wxs | 6 +- packaging/windows/clisdk/registrykeys.wxs | 18 ++++- packaging/windows/clisdk/variables.wxi | 2 + 8 files changed, 109 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 397d2babe..5618b84d5 100644 --- a/.gitignore +++ b/.gitignore @@ -128,7 +128,7 @@ bin/ *.scc # BinLog artifacts -msbuild.*.ProjectImports.zip +msbuild*ProjectImports.zip # Chutzpah Test files _Chutzpah* diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets index 0551abef9..2ea419296 100644 --- a/build/package/Installer.MSI.targets +++ b/build/package/Installer.MSI.targets @@ -115,8 +115,7 @@ '$(NugetVersion)' ^ '$(SdkInstallerUpgradeCode)' ^ '$(Architecture)' ^ - '$(SdkStableFileIdForApphostTransform)' ^ - " /> + '$(SdkStableFileIdForApphostTransform)'" /> #(loc.Caption) Segoe UI - Segoe UI + Segoe UI Segoe UI Segoe UI Segoe UI @@ -11,7 +11,7 @@ #(loc.Title) - + #(loc.HelpHeader) #(loc.HelpText) @@ -96,4 +96,4 @@ - \ No newline at end of file + diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index dee03bb18..7546889a1 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -5,13 +5,13 @@ Are you sure you want to cancel? Previous version Setup Help - /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or - creates a complete local copy of the bundle in directory. Install is the default. + /install | /repair | /uninstall | /layout [\[]"directory"[\]] - installs, repairs, uninstalls + or creates a complete local copy of the bundle in directory. '/install' is the default. -/passive | /quiet - displays minimal UI with no prompts or displays no UI and +/passive | /quiet - displays minimal UI with no prompts or displays no UI and no prompts. By default UI and all prompts are displayed. -/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/norestart - suppress any attempts to restart. By default UI will prompt before restart. /log log.txt - logs to a specific file. By default a log file is created in %TEMP%. &Close I &agree to the license terms and conditions @@ -49,7 +49,7 @@ &Cancel The installation was successful -The following were installed at [DOTNETHOME] +The following were installed at: '[DOTNETHOME]' • .NET Core SDK [DOTNETSDKVERSION] • .NET Core Runtime [DOTNETRUNTIMEVERSION] • ASP.NET Core Runtime [ASPNETCOREVERSION] diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs index af6482f3f..b1bd6fdde 100644 --- a/packaging/windows/clisdk/bundle.wxs +++ b/packaging/windows/clisdk/bundle.wxs @@ -10,25 +10,93 @@ AboutUrl="https://dotnet.github.io/" Compressed="yes"> + + WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE) + + + ShowVersion="yes" /> - + + + + + + + + + + + + + + + + - - + + + @@ -41,9 +109,12 @@ - + + + + diff --git a/packaging/windows/clisdk/dotnet.wxs b/packaging/windows/clisdk/dotnet.wxs index fbcebfbbf..939059f6d 100644 --- a/packaging/windows/clisdk/dotnet.wxs +++ b/packaging/windows/clisdk/dotnet.wxs @@ -4,13 +4,17 @@ + + Installed OR ALLOWCLISDKMSIINSTALL + + - + diff --git a/packaging/windows/clisdk/registrykeys.wxs b/packaging/windows/clisdk/registrykeys.wxs index c8c7e91d5..318bb068b 100644 --- a/packaging/windows/clisdk/registrykeys.wxs +++ b/packaging/windows/clisdk/registrykeys.wxs @@ -2,12 +2,24 @@ - - + + + + VersionNT64 AND DOTNETHOME_X64 + + + + + + DOTNETHOME_X86 + + + + - \ No newline at end of file + diff --git a/packaging/windows/clisdk/variables.wxi b/packaging/windows/clisdk/variables.wxi index d76680561..bcef69b81 100644 --- a/packaging/windows/clisdk/variables.wxi +++ b/packaging/windows/clisdk/variables.wxi @@ -17,10 +17,12 @@ + + From 146f82dbf48c3bb83ce0032892d5f56ca1227d39 Mon Sep 17 00:00:00 2001 From: Peter Huene Date: Wed, 21 Nov 2018 13:36:15 -0800 Subject: [PATCH 2/2] Bump toolset to `3.0.100-preview-009724`. Bumping toolset to `3.0.100-preview-009724`. --- build/DependencyVersions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index cf74e297b..c67596fef 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -1,7 +1,7 @@ - 3.0.100-preview-009722 + 3.0.100-preview-009724