mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove check for previous versions of CLI SDK.

Browse source 
In the MSI we used to check for any previous installation and we prevent any
installation of 'Release' version on top of 'Nightly' version and vice
versa. This is no longer needed since CLI SxS now. This is reminiscent of
pre-sharedFx CLI.

Fixes - #2467
This commit is contained in:
Sridhar Periyasamy 2016-04-14 11:47:51 -07:00
parent 880dcf2fc8
commit 5ea0d2c665
9 changed files with 5 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packaging/windows/clisdk/bundle.thm
View file

@ -23,7 +23,6 @@
<Text X="0" Y="0" Width="620" Height="75" FontId="1" />
<Text Name="InstallVersion" X="11" Y="80" Width="135" Height="30" FontId="2" DisablePrefix="yes" HideWhenDisabled="yes">v[DisplayVersion]</Text>
<Text X="11" Y="110" Width="135" Height="30" FontId="2" DisablePrefix="yes">[ReleaseSuffix] [BuildType]</Text>
<Text X="11" Y="145" Width="135" Height="100" FontId="5" DisablePrefix="yes">#(loc.Motto)</Text>
<Text X="155" Y="80" Width="-11" Height="-70" TabStop="no" FontId="2" HexStyle="0x800000" DisablePrefix="yes" />

2
packaging/windows/clisdk/bundle.wxs
View file

@ -23,9 +23,7 @@
<swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
<Variable Name="BuildType" Value="$(var.BuildType)" />
<Variable Name="DisplayVersion" Value="$(var.DisplayVersion)" />
<Variable Name="ReleaseSuffix" Value="$(var.ReleaseSuffix)" />
<Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="yes" />

14
packaging/windows/clisdk/checkbuildtype.wxs
View file

@ -1,14 +0,0 @@
<?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?include "Variables.wxi" ?>
<Fragment>
<Property Id="INSTALLEDCLIBUILDTYPE">
<RegistrySearch Id="DotnetCLI_BuildType" Type="raw"
Root="HKLM" Key="SOFTWARE\dotnet\Setup" Name="BuildType" Win64="$(var.Win64AttributeValue)"/>
</Property>
<Condition Message="$(var.IncompatibleBuildTypeError)">
Installed OR NOT INSTALLEDCLIBUILDTYPE OR INSTALLEDCLIBUILDTYPE ~= "$(var.BuildType)"
</Condition>
</Fragment>
</Wix>

2
packaging/windows/clisdk/dotnet.wxs
View file

@ -28,8 +28,6 @@
<UIRef Id="WixUI_InstallDir" />
<CustomActionRef Id="WixBroadcastEnvironmentChange" />
<PropertyRef Id="INSTALLEDCLIBUILDTYPE"/>
</Product>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">

4
packaging/windows/clisdk/generatebundle.ps1
View file

@ -10,8 +10,7 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIVersion,
[Parameter(Mandatory=$true)][string]$UpgradeCode,
[Parameter(Mandatory=$true)][string]$Architecture,
[Parameter(Mandatory=$true)][string]$ReleaseSuffix
[Parameter(Mandatory=$true)][string]$Architecture
)
. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@ -30,7 +29,6 @@ function RunCandleForBundle
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" `
-dReleaseSuffix="$ReleaseSuffix" `
-dCLISDKMsiSourcePath="$CLISDKMSIFile" `
-dUpgradeCode="$UpgradeCode" `
-dSharedFXMsiSourcePath="$SharedFxMSIFile" `

6
packaging/windows/clisdk/generatemsi.ps1
View file

@ -8,8 +8,7 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIVersion,
[Parameter(Mandatory=$true)][string]$UpgradeCode,
[Parameter(Mandatory=$true)][string]$Architecture,
[Parameter(Mandatory=$true)][string]$ReleaseSuffix
[Parameter(Mandatory=$true)][string]$Architecture
)
. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@ -51,13 +50,11 @@ function RunCandle
-dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" `
-dUpgradeCode="$UpgradeCode" `
-dReleaseSuffix="$ReleaseSuffix" `
-arch "$Architecture" `
-ext WixDependencyExtension.dll `
"$AuthWsxRoot\dotnet.wxs" `
"$AuthWsxRoot\provider.wxs" `
"$AuthWsxRoot\registrykeys.wxs" `
"$AuthWsxRoot\checkbuildtype.wxs" `
$InstallFileswsx | Out-Host
if($LastExitCode -ne 0)
@ -84,7 +81,6 @@ function RunLight
dotnet.wixobj `
provider.wixobj `
registrykeys.wixobj `
checkbuildtype.wixobj `
$InstallFilesWixobj `
-b "$inputDir" `
-b "$AuthWsxRoot" `

2
packaging/windows/clisdk/registrykeys.wxs
View file

@ -10,7 +10,6 @@
<RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/>
<RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
<RegistryValue Action="write" Name="Version" Type="string" Value="$(var.Dotnet_ProductVersion)" />
<RegistryValue Action="write" Name="BuildType" Type="string" Value="$(var.BuildType)" />
</RegistryKey>
</Component>
<?endif?>
@ -21,7 +20,6 @@
<RegistryValue Action="write" Name="Install" Type="integer" Value="1" KeyPath="yes"/>
<RegistryValue Action="write" Name="InstallDir" Type="string" Value="[DOTNETHOME]" />
<RegistryValue Action="write" Name="Version" Type="string" Value="$(var.Dotnet_ProductVersion)" />
<RegistryValue Action="write" Name="BuildType" Type="string" Value="$(var.BuildType)" />
</RegistryKey>
</Component>
</ComponentGroup>

9
packaging/windows/clisdk/variables.wxi
View file

@ -1,11 +1,5 @@
<?xml version="1.0"?>
<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
<?if $(var.ReleaseSuffix) ~= "beta" OR $(var.ReleaseSuffix) ~= "rc1" OR $(var.ReleaseSuffix) ~= "rtm" OR $(var.ReleaseSuffix) ~= ""?>
<?define BuildType="Release"?>
<?else?>
<?define BuildType="Nightly"?>
<?endif?>
<?define Servicing_Key_SP = "0" ?>
<?define Servicing_Key_SPIndex = "0" ?>
<?define Servicing_Key_SPName = "Beta" ?>
@ -13,14 +7,13 @@
<?define Dotnet_DisplayVersion = "1.0" ?>
<?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
<?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "Microsoft .NET Core CLI for Windows ($(var.DisplayVersion) $(var.ReleaseSuffix))" ?>
<?define ProductName = "Microsoft .NET Core CLI for Windows ($(var.DisplayVersion))" ?>
<?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?>
<?define ProductFamily = "dotnet" ?>
<?define ProductEdition = "001dotnet" ?>
<?define LCID = "$(var.ProductLanguage)"?>
<?define DowngradeErrorMessage = "A newer version is already installed; please uninstall it and re-run setup."?>
<?define IncompatibleBuildTypeError = "You have installed '[INSTALLEDCLIBUILDTYPE]' build of .NET Core CLI. It cannot be upgraded to a '$(var.BuildType)' build of .NET Core CLI. Please uninstall it and re-run setup."?>
<?define Platform = "$(sys.BUILDARCH)" ?>
<?if $(var.Platform)=x86?>

4
scripts/dotnet-cli-build/MsiTargets.cs
View file

@ -127,7 +127,7 @@ namespace Microsoft.DotNet.Cli.Build
Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatemsi.ps1"),
cliSdkRoot, SdkMsi, WixRoot, MsiVersion, CliVersion, upgradeCode, Arch, Channel)
cliSdkRoot, SdkMsi, WixRoot, MsiVersion, CliVersion, upgradeCode, Arch)
.Execute()
.EnsureSuccessful();
return c.Success();
@ -188,7 +188,7 @@ namespace Microsoft.DotNet.Cli.Build
Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"),
SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, MsiVersion, CliVersion, upgradeCode, Arch, Channel)
SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, MsiVersion, CliVersion, upgradeCode, Arch)
.EnvironmentVariable("Stage2Dir", Dirs.Stage2)
.Execute()
.EnsureSuccessful();