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

Remove any 'beta' string from the MSI installers.

Browse source 
Fixes #2463
This commit is contained in:
Sridhar Periyasamy 2016-04-15 12:11:10 -07:00
parent 5ea0d2c665
commit 47816da80d
10 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,8 +22,7 @@
<Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" /> <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="620" Height="75" FontId="1" /> <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="80" Width="135" Height="100" FontId="5" DisablePrefix="yes">#(loc.Motto)</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" /> <Text X="155" Y="80" Width="-11" Height="-70" TabStop="no" FontId="2" HexStyle="0x800000" DisablePrefix="yes" />
<Richedit Name="EulaRichedit" X="158" Y="81" Width="-12" Height="-71" TabStop="yes" FontId="0" /> <Richedit Name="EulaRichedit" X="158" Y="81" Width="-12" Height="-71" TabStop="yes" FontId="0" />

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

@ -23,8 +23,6 @@
<swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" /> <swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />
<Variable Name="DisplayVersion" Value="$(var.DisplayVersion)" />
<Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="yes" /> <Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="yes" />
<util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="SOFTWARE\dotnet\Setup" Value="InstallDir" Variable="PreviousInstallFolder" /> <util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="SOFTWARE\dotnet\Setup" Value="InstallDir" Variable="PreviousInstallFolder" />

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

@ -8,7 +8,8 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetBundleOutput, [Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
[Parameter(Mandatory=$true)][string]$WixRoot, [Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIVersion, [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
[Parameter(Mandatory=$true)][string]$UpgradeCode, [Parameter(Mandatory=$true)][string]$UpgradeCode,
[Parameter(Mandatory=$true)][string]$Architecture [Parameter(Mandatory=$true)][string]$Architecture
) )
@ -28,7 +29,8 @@ function RunCandleForBundle
-dDotnetSrc="$inputDir" ` -dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIDisplayVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `
-dCLISDKMsiSourcePath="$CLISDKMSIFile" ` -dCLISDKMsiSourcePath="$CLISDKMSIFile" `
-dUpgradeCode="$UpgradeCode" ` -dUpgradeCode="$UpgradeCode" `
-dSharedFXMsiSourcePath="$SharedFxMSIFile" ` -dSharedFXMsiSourcePath="$SharedFxMSIFile" `

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

@ -6,7 +6,8 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetMSIOutput, [Parameter(Mandatory=$true)][string]$DotnetMSIOutput,
[Parameter(Mandatory=$true)][string]$WixRoot, [Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIVersion, [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
[Parameter(Mandatory=$true)][string]$UpgradeCode, [Parameter(Mandatory=$true)][string]$UpgradeCode,
[Parameter(Mandatory=$true)][string]$Architecture [Parameter(Mandatory=$true)][string]$Architecture
) )
@ -48,7 +49,8 @@ function RunCandle
-dDotnetSrc="$inputDir" ` -dDotnetSrc="$inputDir" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIDisplayVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `
-dUpgradeCode="$UpgradeCode" ` -dUpgradeCode="$UpgradeCode" `
-arch "$Architecture" ` -arch "$Architecture" `
-ext WixDependencyExtension.dll ` -ext WixDependencyExtension.dll `

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

@ -4,10 +4,10 @@
<?define Servicing_Key_SPIndex = "0" ?> <?define Servicing_Key_SPIndex = "0" ?>
<?define Servicing_Key_SPName = "Beta" ?> <?define Servicing_Key_SPName = "Beta" ?>
<?define Dotnet_ProductVersion = "$(var.BuildVersion)" ?> <?define Dotnet_ProductVersion = "$(var.BuildVersion)" ?>
<?define Dotnet_DisplayVersion = "1.0" ?> <?define Dotnet_DisplayVersion = "$(var.DisplayVersion)" ?>
<?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?> <?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
<?define Manufacturer = "Microsoft Corporation" ?> <?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "Microsoft .NET Core CLI for Windows ($(var.DisplayVersion))" ?> <?define ProductName = "Microsoft .NET Core CLI for Windows ($(var.NugetVersion))" ?>
<?define ProductLanguage = "1033" ?> <?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?> <?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?>
<?define ProductFamily = "dotnet" ?> <?define ProductFamily = "dotnet" ?>

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

@ -6,7 +6,8 @@ param(
[Parameter(Mandatory=$true)][string]$DotnetHostMSIOutput, [Parameter(Mandatory=$true)][string]$DotnetHostMSIOutput,
[Parameter(Mandatory=$true)][string]$WixRoot, [Parameter(Mandatory=$true)][string]$WixRoot,
[Parameter(Mandatory=$true)][string]$DotnetMSIVersion, [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLIVersion, [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
[Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
[Parameter(Mandatory=$true)][string]$Architecture, [Parameter(Mandatory=$true)][string]$Architecture,
[Parameter(Mandatory=$true)][string]$WixObjRoot [Parameter(Mandatory=$true)][string]$WixObjRoot
) )
@ -28,7 +29,8 @@ function RunCandle
-dHostSrc="$SharedHostPublishRoot" ` -dHostSrc="$SharedHostPublishRoot" `
-dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\clisdk\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIDisplayVersion" `
-dNugetVersion="$DotnetCLINugetVersion" `
-arch $Architecture ` -arch $Architecture `
"$AuthWsxRoot\host.wxs" ` "$AuthWsxRoot\host.wxs" `
"$AuthWsxRoot\provider.wxs" ` "$AuthWsxRoot\provider.wxs" `

2
packaging/windows/host/variables.wxi
View file

@ -8,7 +8,7 @@
<?define Dotnet_DisplayVersion = "$(var.DisplayVersion)" ?> <?define Dotnet_DisplayVersion = "$(var.DisplayVersion)" ?>
<?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?> <?define Dotnet_BuildVersion = "$(var.BuildVersion)" ?>
<?define Manufacturer = "Microsoft Corporation" ?> <?define Manufacturer = "Microsoft Corporation" ?>
<?define ProductName = "Microsoft .NET Core Host for Windows ($(var.DisplayVersion))" ?> <?define ProductName = "Microsoft .NET Core Host for Windows ($(var.NugetVersion))" ?>
<?define ProductLanguage = "1033" ?> <?define ProductLanguage = "1033" ?>
<?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?> <?define ProductVersion = "$(var.Dotnet_ProductVersion)" ?>
<?define LCID = "$(var.ProductLanguage)"?> <?define LCID = "$(var.ProductLanguage)"?>

4
packaging/windows/sharedframework/bundle.thm
View file

@ -22,9 +22,7 @@
<Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" /> <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
<Text X="0" Y="0" Width="620" Height="75" FontId="1" /> <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="80" Width="135" Height="100" FontId="5" DisablePrefix="yes">#(loc.Motto)</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" /> <Text X="155" Y="80" Width="-11" Height="-70" TabStop="no" FontId="2" HexStyle="0x800000" DisablePrefix="yes" />
<Richedit Name="EulaRichedit" X="158" Y="81" Width="-12" Height="-71" TabStop="yes" FontId="0" /> <Richedit Name="EulaRichedit" X="158" Y="81" Width="-12" Height="-71" TabStop="yes" FontId="0" />

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

@ -11,8 +11,7 @@ param(
[Parameter(Mandatory=$true)][string]$SharedFrameworkNugetName, [Parameter(Mandatory=$true)][string]$SharedFrameworkNugetName,
[Parameter(Mandatory=$true)][string]$SharedFrameworkNugetVersion, [Parameter(Mandatory=$true)][string]$SharedFrameworkNugetVersion,
[Parameter(Mandatory=$true)][string]$SharedFrameworkUpgradeCode, [Parameter(Mandatory=$true)][string]$SharedFrameworkUpgradeCode,
[Parameter(Mandatory=$true)][string]$Architecture, [Parameter(Mandatory=$true)][string]$Architecture
[Parameter(Mandatory=$true)][string]$ReleaseSuffix
) )
. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1" . "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@ -30,7 +29,6 @@ function RunCandleForBundle
-dMicrosoftEula="$RepoRoot\packaging\osx\sharedframework\resources\en.lproj\eula.rtf" ` -dMicrosoftEula="$RepoRoot\packaging\osx\sharedframework\resources\en.lproj\eula.rtf" `
-dBuildVersion="$DotnetMSIVersion" ` -dBuildVersion="$DotnetMSIVersion" `
-dDisplayVersion="$DotnetCLIVersion" ` -dDisplayVersion="$DotnetCLIVersion" `
-dReleaseSuffix="$ReleaseSuffix" `
-dSharedFXMsiSourcePath="$SharedFxMSIFile" ` -dSharedFXMsiSourcePath="$SharedFxMSIFile" `
-dSharedHostMsiSourcePath="$SharedHostMSIFile" ` -dSharedHostMsiSourcePath="$SharedHostMSIFile" `
-dFrameworkName="$SharedFrameworkNugetName" ` -dFrameworkName="$SharedFrameworkNugetName" `

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

@ -41,12 +41,12 @@ namespace Microsoft.DotNet.Cli.Build
private static string MsiVersion { get; set; } private static string MsiVersion { get; set; }
private static string CliVersion { get; set; } private static string CliDisplayVersion { get; set; }
private static string CliNugetVersion { get; set; }
private static string Arch { get; } = CurrentArchitecture.Current.ToString(); private static string Arch { get; } = CurrentArchitecture.Current.ToString();
private static string Channel { get; set; }
private static void AcquireWix(BuildTargetContext c) private static void AcquireWix(BuildTargetContext c)
{ {
if (File.Exists(Path.Combine(WixRoot, "candle.exe"))) if (File.Exists(Path.Combine(WixRoot, "candle.exe")))
@ -92,8 +92,8 @@ namespace Microsoft.DotNet.Cli.Build
var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion"); var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
MsiVersion = buildVersion.GenerateMsiVersion(); MsiVersion = buildVersion.GenerateMsiVersion();
CliVersion = buildVersion.SimpleVersion; CliDisplayVersion = buildVersion.SimpleVersion;
Channel = c.BuildContext.Get<string>("Channel"); CliNugetVersion = buildVersion.NuGetVersion;
AcquireWix(c); AcquireWix(c);
return c.Success(); return c.Success();
@ -127,7 +127,7 @@ namespace Microsoft.DotNet.Cli.Build
Cmd("powershell", "-NoProfile", "-NoLogo", Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatemsi.ps1"), Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatemsi.ps1"),
cliSdkRoot, SdkMsi, WixRoot, MsiVersion, CliVersion, upgradeCode, Arch) cliSdkRoot, SdkMsi, WixRoot, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();
return c.Success(); return c.Success();
@ -148,7 +148,7 @@ namespace Microsoft.DotNet.Cli.Build
Cmd("powershell", "-NoProfile", "-NoLogo", Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "host", "generatemsi.ps1"), Path.Combine(Dirs.RepoRoot, "packaging", "windows", "host", "generatemsi.ps1"),
inputDir, SharedHostMsi, WixRoot, MsiVersion, CliVersion, Arch, wixObjRoot) inputDir, SharedHostMsi, WixRoot, MsiVersion, CliDisplayVersion, CliNugetVersion, Arch, wixObjRoot)
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();
return c.Success(); return c.Success();
@ -188,7 +188,7 @@ namespace Microsoft.DotNet.Cli.Build
Cmd("powershell", "-NoProfile", "-NoLogo", Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"), Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"),
SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, MsiVersion, CliVersion, upgradeCode, Arch) SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
.EnvironmentVariable("Stage2Dir", Dirs.Stage2) .EnvironmentVariable("Stage2Dir", Dirs.Stage2)
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();
@ -205,7 +205,7 @@ namespace Microsoft.DotNet.Cli.Build
Cmd("powershell", "-NoProfile", "-NoLogo", Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "sharedframework", "generatebundle.ps1"), Path.Combine(Dirs.RepoRoot, "packaging", "windows", "sharedframework", "generatebundle.ps1"),
SharedFrameworkMsi, SharedHostMsi, SharedFrameworkBundle, WixRoot, MsiVersion, CliVersion, sharedFrameworkNuGetName, sharedFrameworkNuGetVersion, upgradeCode, Arch, Channel) SharedFrameworkMsi, SharedHostMsi, SharedFrameworkBundle, WixRoot, MsiVersion, CliDisplayVersion, sharedFrameworkNuGetName, sharedFrameworkNuGetVersion, upgradeCode, Arch)
.Execute() .Execute()
.EnsureSuccessful(); .EnsureSuccessful();
return c.Success(); return c.Success();