Updates per code review.

2019-08-16 21:54:47 +00:00 · 2019-08-16 21:54:47 +00:00 · c3ae4a64a8
commit c3ae4a64a8
parent 9fe66e5c0f
7 changed files with 19 additions and 19 deletions
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@ -39,12 +39,12 @@
    <PropertyGroup>
      <SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
      <SdkMSICabFile>$(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab</SdkMSICabFile>
-      <SdkDependencyKeyPrefix>Dotnet_CLI</SdkDependencyKeyPrefix>
+      <SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName>
      <Templates30MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates30MSIInstallerFile>
      <Templates22MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates22MSIInstallerFile>
      <Templates21MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates21MSIInstallerFile>
      <SdkPlaceholderMSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-sdkplaceholder-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</SdkPlaceholderMSIInstallerFile>
-      <SdkPlaceholderDependencyKeyPrefix>NetCore_SdkPlaceholder</SdkPlaceholderDependencyKeyPrefix>
+      <SdkPlaceholderDependencyKeyName>NetCore_SdkPlaceholder</SdkPlaceholderDependencyKeyName>
      <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
      <SdkBundleInstallerOutputGuidString>$(ProductBandCombinedHostHostFxrFrameworkSdkName)</SdkBundleInstallerOutputGuidString>

@ -141,7 +141,7 @@
                      '$(SDKBundleVersion)' ^
                      '$(NugetVersion)' ^
                      '$(SdkInstallerUpgradeCode)' ^
-                      '$(SdkDependencyKeyPrefix)' ^
+                      '$(SdkDependencyKeyName)' ^
                      '$(Architecture)' ^
                      '$(SdkStableFileIdForApphostTransform)' ^
                      -InformationAction Continue" />
@ -161,7 +161,7 @@
                      '$(SDKBundleVersion)' ^
                      '$(NugetVersion)' ^
                      '$(SdkPlaceholderInstallerUpgradeCode)' ^
-                      '$(SdkPlaceholderDependencyKeyPrefix)' ^
+                      '$(SdkPlaceholderDependencyKeyName)' ^
                      '$(Architecture)' ^
                      -InformationAction Continue" />
  </Target>
@ -182,7 +182,7 @@
                      '@(TemplatesMsiComponent->'%(MsiVersion)')' ^
                      '$(FullNugetVersion)' ^
                      '@(TemplatesMsiComponent->'%(UpgradeCode)')' ^
-                      '@(TemplatesMsiComponent->'%(DependencyKeyPrefix)')' ^
+                      '@(TemplatesMsiComponent->'%(DependencyKeyName)')' ^
                      '$(Architecture)' ^
                      -InformationAction Continue" />
  </Target>
@ -199,7 +199,7 @@
        <BrandName>$(BundledTemplates30BrandName)</BrandName>
        <MsiVersion>$(BundledTemplates30MsiVersion)</MsiVersion>
        <UpgradeCode>$(Templates30InstallerUpgradeCode)</UpgradeCode>
-        <DependencyKeyPrefix>NetCore_Templates_3.0</DependencyKeyPrefix>
+        <DependencyKeyName>NetCore_Templates_3.0</DependencyKeyName>
      </TemplatesMsiComponent>
      <TemplatesMsiComponent Include="NetCore22TemplatesMsi">
        <LayoutPath>$(Templates22LayoutPath.TrimEnd('\'))</LayoutPath>
@ -207,7 +207,7 @@
        <BrandName>$(BundledTemplates22BrandName)</BrandName>
        <MsiVersion>$(BundledTemplates22MsiVersion)</MsiVersion>
        <UpgradeCode>$(Templates22InstallerUpgradeCode)</UpgradeCode>
-        <DependencyKeyPrefix>NetCore_Templates_2.2</DependencyKeyPrefix>
+        <DependencyKeyName>NetCore_Templates_2.2</DependencyKeyName>
      </TemplatesMsiComponent>
      <TemplatesMsiComponent Include="NetCore21TemplatesMsi">
        <LayoutPath>$(Templates21LayoutPath.TrimEnd('\'))</LayoutPath>
@ -215,7 +215,7 @@
        <BrandName>$(BundledTemplates21BrandName)</BrandName>
        <MsiVersion>$(BundledTemplates21MsiVersion)</MsiVersion>
        <UpgradeCode>$(Templates21InstallerUpgradeCode)</UpgradeCode>
-        <DependencyKeyPrefix>NetCore_Templates_2.1</DependencyKeyPrefix>
+        <DependencyKeyName>NetCore_Templates_2.1</DependencyKeyName>
      </TemplatesMsiComponent>
    </ItemGroup>
  </Target>
@ -251,7 +251,7 @@
                      '$(NugetVersion)' ^
                      '$(MicrosoftWindowsDesktopPackageVersion)' ^
                      '$(CombinedFrameworkSDKHostInstallerUpgradeCode)' ^
-                      '$(SdkDependencyKeyPrefix)' ^
+                      '$(SdkDependencyKeyName)' ^
                      '$(Architecture)' ^
                      '$(MicrosoftNETCoreAppPackageVersion)' ^
                      '$(AspNetCoreVersion)' ^
--- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
@ -22,7 +22,7 @@ param(
    [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
    [Parameter(Mandatory=$true)][string]$WindowsDesktopVersion,
    [Parameter(Mandatory=$true)][string]$UpgradeCode,
-    [Parameter(Mandatory=$true)][string]$DependencyKeyPrefix,
+    [Parameter(Mandatory=$true)][string]$DependencyKeyName,
    [Parameter(Mandatory=$true)][string]$Architecture,
    [Parameter(Mandatory=$true)][string]$DotNetRuntimeVersion,
    [Parameter(Mandatory=$true)][string]$AspNetCoreVersion,
@ -45,7 +45,7 @@ function RunCandleForBundle
        -dSDKProductBandVersion="$SDKProductBandVersion" `
        -dNugetVersion="$DotnetCLINugetVersion" `
        -dCLISDKMsiSourcePath="$CLISDKMSIFile" `
-        -dDependencyKeyPrefix="$DependencyKeyPrefix" `
+        -dDependencyKeyName="$DependencyKeyName" `
        -dUpgradeCode="$UpgradeCode" `
        -dSharedFXMsiSourcePath="$SharedFxMSIFile" `
        -dHostFXRMsiSourcePath="$HostFxrMSIFile" `
--- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1
@ -10,7 +10,7 @@ param(
    [Parameter(Mandatory=$true)][string]$SDKBundleVersion,
    [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
    [Parameter(Mandatory=$true)][string]$UpgradeCode,
-    [Parameter(Mandatory=$true)][string]$DependencyKeyPrefix,
+    [Parameter(Mandatory=$true)][string]$DependencyKeyName,
    [Parameter(Mandatory=$true)][string]$Architecture,
    [Parameter(Mandatory=$true)][string]$StableFileIdForApphostTransform
 )
@ -67,7 +67,7 @@ function RunCandle
        -dSDKBundleVersion="$SDKBundleVersion" `
        -dNugetVersion="$DotnetCLINugetVersion" `
        -dUpgradeCode="$UpgradeCode" `
-        -dDependencyKeyPrefix="$DependencyKeyPrefix" `
+        -dDependencyKeyName="$DependencyKeyName" `
        -arch "$Architecture" `
        -ext WixDependencyExtension.dll `
        "$PSScriptRoot\dotnet.wxs" `
--- a/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatesdkplaceholdermsi.ps1
@ -9,7 +9,7 @@ param(
    [Parameter(Mandatory=$true)][string]$SDKBundleVersion,
    [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
    [Parameter(Mandatory=$true)][string]$UpgradeCode,
-    [Parameter(Mandatory=$true)][string]$DependencyKeyPrefix,
+    [Parameter(Mandatory=$true)][string]$DependencyKeyName,
    [Parameter(Mandatory=$true)][string]$Architecture
 )

@ -28,7 +28,7 @@ function RunCandle
        -dSDKBundleVersion="$SDKBundleVersion" `
        -dNugetVersion="$DotnetCLINugetVersion" `
        -dUpgradeCode="$UpgradeCode" `
-        -dDependencyKeyPrefix="$DependencyKeyPrefix" `
+        -dDependencyKeyName="$DependencyKeyName" `
        -arch "$Architecture" `
        -ext WixDependencyExtension.dll `
        "$PSScriptRoot\sdkplaceholder.wxs" `
--- a/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatetemplatesmsi.ps1
@ -10,7 +10,7 @@ param(
    [Parameter(Mandatory=$true)][string]$SDKBundleVersion,
    [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
    [Parameter(Mandatory=$true)][string]$UpgradeCode,
-    [Parameter(Mandatory=$true)][string]$DependencyKeyPrefix,
+    [Parameter(Mandatory=$true)][string]$DependencyKeyName,
    [Parameter(Mandatory=$true)][string]$Architecture
 )

@ -60,7 +60,7 @@ function RunCandle
        -dSDKBundleVersion="$SDKBundleVersion" `
        -dNugetVersion="$DotnetCLINugetVersion" `
        -dUpgradeCode="$UpgradeCode" `
-        -dDependencyKeyPrefix="$DependencyKeyPrefix" `
+        -dDependencyKeyName="$DependencyKeyName" `
        -arch "$Architecture" `
        -ext WixDependencyExtension.dll `
        "$PSScriptRoot\templates.wxs" `
--- a/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/sdkplaceholder.wxs
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
  <?include "Variables.wxi" ?>
-  <Product Id="*" Name="$(var.ProductName) from Visual Studio" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+  <Product Id="*" Name="$(var.ProductName) from Visual Studio" Language="$(var.ProductLanguage)" Version="$(var.SDKBundleVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
    <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />

    <Condition Message="$(var.ProductName) must be installed as part of a coordinated SDK installation.">
--- a/src/redist/targets/packaging/windows/clisdk/variables.wxi
+++ b/src/redist/targets/packaging/windows/clisdk/variables.wxi
@ -30,6 +30,6 @@
  <?error Invalid Platform ($(var.Platform))?>
  <?endif?>

-  <?define DependencyKey   = "$(var.DependencyKeyPrefix)_$(var.SDKBundleVersion)_$(var.Platform)"?>
+  <?define DependencyKey   = "$(var.DependencyKeyName)_$(var.SDKBundleVersion)_$(var.Platform)"?>
  <?define DependencyKeyId = "$(var.DependencyKey)" ?>
 </Include>