Merge pull request #9001 from livarcocc/automatic_build_numbers_installers

Automatic build numbers flow into installers

build/Branding.props

@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <BuildName>cli</BuildName>
-    <SdkBrandName>Microsoft .NET Core SDK 2.1.300 - Preview</SdkBrandName>
+    <SdkBrandName>Microsoft .NET Core SDK $(CliBrandingVersion)</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
     <SharedFrameworkBrandName>Microsoft .NET Core Runtime 2.1.0 - Preview</SharedFrameworkBrandName>
     <SharedHostBrandName>Microsoft .NET Core Host 2.1.0 - Preview</SharedHostBrandName>

build/Version.props

@@ -5,18 +5,20 @@
     <VersionPatch>300</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview3</ReleaseSuffix>
 
-    <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
+    <CliVersionNoSuffix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</CliVersionNoSuffix>
-    <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)</SimpleVersion> 
+    <CliVersionPrefix>$(CliVersionNoSuffix)-$(ReleaseSuffix)</CliVersionPrefix>
-    <SimpleVersion Condition=" '$(SimpleVersion)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)</SimpleVersion> 
+    <CliBrandingVersion>$(CliVersionNoSuffix) - $(ReleaseSuffix)</CliBrandingVersion>
+    <SimpleVersion Condition=" '$(DropSuffix)' == '' ">$(CliVersionNoSuffix).$(CommitCount)</SimpleVersion>
+    <SimpleVersion Condition=" '$(SimpleVersion)' == '' ">$(CliVersionNoSuffix)</SimpleVersion>
 
-    <VersionSuffix Condition=" '$(DropSuffix)' == '' ">$(ReleaseSuffix)-$(CommitCount)</VersionSuffix> 
+    <VersionSuffix Condition=" '$(DropSuffix)' == '' ">$(ReleaseSuffix)-$(CommitCount)</VersionSuffix>
 
-    <FullNugetVersion>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)-$(CommitCount)</FullNugetVersion> 
+    <FullNugetVersion>$(CliVersionNoSuffix)-$(ReleaseSuffix)-$(CommitCount)</FullNugetVersion>
 
-    <NugetVersion Condition=" '$(DropSuffix)' == '' ">$(FullNugetVersion)</NugetVersion> 
+    <NugetVersion Condition=" '$(DropSuffix)' == '' ">$(FullNugetVersion)</NugetVersion>
-    <NugetVersion Condition=" '$(NugetVersion)' == '' ">$(VersionMajor).$(VersionMinor).$(VersionPatch)</NugetVersion> 
+    <NugetVersion Condition=" '$(NugetVersion)' == '' ">$(CliVersionNoSuffix)</NugetVersion>
 
     <SdkVersion>$(NugetVersion)</SdkVersion>
-    <SdkNugetVersion>$(NugetVersion)</SdkNugetVersion> 
+    <SdkNugetVersion>$(NugetVersion)</SdkNugetVersion>
   </PropertyGroup>
 </Project>

build/package/Installer.DEB.proj

@@ -53,8 +53,8 @@
 
       <!-- Create layout: Generate and Place postinst -->
       <ReplaceFileContents
-        InputFile="$(DebianPostinstTemplateFile)"
+        InputFiles="$(DebianPostinstTemplateFile)"
-        DestinationFile="$(DebianPostinstFile)"
+        DestinationFiles="$(DebianPostinstFile)"
         ReplacementItems="@(DebianPostInstTokenValues)" />
 
       <Chmod
@@ -63,8 +63,8 @@
 
       <!-- Create layout: Generate and Place debian_config.json -->
       <ReplaceFileContents
-        InputFile="$(DebianConfigTemplateFile)"
+        InputFiles="$(DebianConfigTemplateFile)"
-        DestinationFile="$(DebianConfigJsonFile)"
+        DestinationFiles="$(DebianConfigJsonFile)"
         ReplacementItems="@(DebianConfigTokenValues)" />
 
       <Chmod

build/package/Installer.MSI.targets

@@ -154,7 +154,9 @@
                       '$(SimpleVersion)'
                       '$(NugetVersion)'
                       '$(CombinedFrameworkSDKHostInstallerUpgradeCode)'
-                      '$(Architecture)'" />
+                      '$(Architecture)'
+                      '$(MicrosoftNETCoreAppPackageVersion)'
+                      '$(AspNetCoreVersion)'" />
     </Target>
 
     <Target Name="GenerateSdkNupkg"

build/package/Installer.PKG.targets

@@ -17,7 +17,7 @@
     <SdkPkgScriptTemplateFile>$(SdkPkgScriptsDirectory)/postinstall</SdkPkgScriptTemplateFile>
     <SdkPkgDestinationScriptsDirectory>$(PkgIntermediateDirectory)/scripts</SdkPkgDestinationScriptsDirectory>
     <SdkPkgScriptFile>$(SdkPkgDestinationScriptsDirectory)/postinstall</SdkPkgScriptFile>
-    <SdkProductArchiveResourcesDirectory>$(SdkPkgSourcesRootDirectory)/resources</SdkProductArchiveResourcesDirectory>
+    <SdkProductArchiveResourcesDirectory>$(PkgIntermediateDirectory)/resources</SdkProductArchiveResourcesDirectory>
 
     <SdkProductArchiveDistributionTemplateFile>$(SdkPkgSourcesRootDirectory)/Distribution-Template</SdkProductArchiveDistributionTemplateFile>
     <SdkProductArchiveDistributionFile>$(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml</SdkProductArchiveDistributionFile>
@@ -61,6 +61,16 @@
         <PostInstallScriptReplacement Include="%SDK_VERSION%">
           <ReplacementString>$(SdkVersion)</ReplacementString>
         </PostInstallScriptReplacement>
+
+        <ResourcesReplacement Include="{DOTNETSDKVERSION}">
+          <ReplacementString>$(SdkVersion)</ReplacementString>
+        </ResourcesReplacement>
+        <ResourcesReplacement Include="{DOTNETRUNTIMEVERSION}">
+          <ReplacementString>$(MicrosoftNETCoreAppPackageVersion)</ReplacementString>
+        </ResourcesReplacement>
+        <ResourcesReplacement Include="{ASPNETCOREVERSION}">
+          <ReplacementString>$(AspNetCoreVersion)</ReplacementString>
+        </ResourcesReplacement>
       </ItemGroup>
       
       <!-- Consumed By Publish -->
@@ -69,6 +79,8 @@
       </ItemGroup>
 
       <ItemGroup>
+        <SdkProductArchiveResourcesTemplateFiles Include="$(SdkPkgSourcesRootDirectory)/resources/**/*" />
+
         <GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" />
         <GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" />
 
@@ -77,7 +89,7 @@
         <GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
-        <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveResourcesDirectory)/**/*" />
+        <GenerateSdkProductArchiveInputs Include="@(SdkProductArchiveResourcesTemplateFiles)" />
       </ItemGroup>
     </Target>
 
@@ -91,11 +103,17 @@
             DestinationFiles="@(AspNetRuntimeFilesInput->'$(SdkLayoutOutputDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
 
       <ReplaceFileContents
-        InputFile="$(SdkPkgScriptTemplateFile)"
+        InputFiles="$(SdkPkgScriptTemplateFile)"
-        DestinationFile="$(SdkPkgScriptFile)"
+        DestinationFiles="$(SdkPkgScriptFile)"
         ReplacementPatterns="@(PostInstallScriptReplacement -> '%(Identity)')"
         ReplacementStrings="@(PostInstallScriptReplacement -> '%(ReplacementString)')" />
 
+      <ReplaceFileContents 
+        InputFiles="@(SdkProductArchiveResourcesTemplateFiles)"
+        DestinationFiles="@(SdkProductArchiveResourcesTemplateFiles -> '$(SdkProductArchiveResourcesDirectory)/%(RecursiveDir)%(Filename)%(Extension)')"
+        ReplacementPatterns="@(ResourcesReplacement -> '%(Identity)')"
+        ReplacementStrings="@(ResourcesReplacement -> '%(ReplacementString)')" />
+
       <Chmod
         Glob="$(SdkPkgScriptFile)"
         Mode="ugo+x" />
@@ -130,8 +148,8 @@
 
       <!-- Fill out parameters in the Distribution Template -->
       <ReplaceFileContents
-        InputFile="$(SdkProductArchiveDistributionTemplateFile)"
+        InputFiles="$(SdkProductArchiveDistributionTemplateFile)"
-        DestinationFile="$(SdkProductArchiveDistributionFile)"
+        DestinationFiles="$(SdkProductArchiveDistributionFile)"
         ReplacementPatterns="@(DistributionTemplateReplacement -> '%(Identity)')"
         ReplacementStrings="@(DistributionTemplateReplacement -> '%(ReplacementString)')" />
 

build/package/Installer.RPM.targets

@@ -104,8 +104,8 @@
       <GeneratedInstallers Include="$(SdkInstallerFile)" />
     </ItemGroup>
 
-    <ReplaceFileContents InputFile="$(AfterInstallHostScriptTemplateFile)"
+    <ReplaceFileContents InputFiles="$(AfterInstallHostScriptTemplateFile)"
-                         DestinationFile="$(AfterInstallHostScriptDestinationFile)"
+                         DestinationFiles="$(AfterInstallHostScriptDestinationFile)"
                          ReplacementItems="@(AfterInstallHostTokenValue)"/>
 
     <Chmod

build/publish/Badge.targets

@@ -9,8 +9,8 @@
     <Message Text="$(VersionBadge)"  />
 
     <ReplaceFileContents
-      InputFile="$(VersionSvgTemplate)"
+      InputFiles="$(VersionSvgTemplate)"
-      DestinationFile="$(VersionBadge)"
+      DestinationFiles="$(VersionBadge)"
       ReplacementPatterns="ver_number"
       ReplacementStrings="$(SdkVersion)" />
   </Target>
@@ -21,8 +21,8 @@
     <Message Text="$(CoherentBadge)"  />
 
     <ReplaceFileContents
-      InputFile="$(VersionSvgTemplate)"
+      InputFiles="$(VersionSvgTemplate)"
-      DestinationFile="$(CoherentBadge)"
+      DestinationFiles="$(CoherentBadge)"
       ReplacementPatterns="ver_number"
       ReplacementStrings="$(SdkVersion)" />
   </Target>

build_projects/dotnet-cli-build/ReplaceFileContents.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using Microsoft.Build.Utilities;
 using Microsoft.Build.Framework;
@@ -28,10 +29,10 @@ namespace Microsoft.DotNet.Cli.Build
     public class ReplaceFileContents : Task
     {
         [Required]
-        public string InputFile { get; set; }
+        public ITaskItem[] InputFiles { get; set; }
 
         [Required]
-        public string DestinationFile { get; set; }
+        public ITaskItem[] DestinationFiles { get; set; }
 
         public ITaskItem[] ReplacementItems { get; set; }
 
@@ -55,19 +56,36 @@ namespace Microsoft.DotNet.Cli.Build
                 throw new Exception($"Expected {nameof(ReplacementPatterns)}  (length {ReplacementPatterns.Length}) and {nameof(ReplacementStrings)} (length {ReplacementStrings.Length}) to have the same length.");
             }
 
-            if (!File.Exists(InputFile))
+            if (InputFiles.Length != DestinationFiles.Length)
             {
-                throw new FileNotFoundException($"Expected file {InputFile} was not found.");
+                throw new Exception($"Expected {nameof(InputFiles)}  (length {InputFiles.Length}) and {nameof(DestinationFiles)} (length {DestinationFiles.Length}) to have the same length.");
             }
 
-            string inputFileText = File.ReadAllText(InputFile);
+            var filesNotFound = InputFiles.Where(i => !File.Exists(i.ItemSpec)).Select(i => i.ItemSpec);
-            string outputFileText = ReplacePatterns(inputFileText);
+            if (filesNotFound.Any())
+            {
+                var filesNotFoundString = string.Join(",", filesNotFound);
+                throw new FileNotFoundException($"Expected files where not found: {filesNotFoundString}");
+            }
 
-            WriteOutputFile(outputFileText);
+            Log.LogMessage(MessageImportance.High, $"ReplacingContents for `{InputFiles.Length}` files.");
+
+            for (var i = 0; i < InputFiles.Length; i++)
+            {
+                ReplaceContents(InputFiles[i].ItemSpec, DestinationFiles[i].ItemSpec);
+            }
 
             return true;
         }
 
+        public void ReplaceContents(string inputFile, string destinationFile)
+        {
+            string inputFileText = File.ReadAllText(inputFile);
+            string outputFileText = ReplacePatterns(inputFileText);
+
+            WriteOutputFile(destinationFile, outputFileText);
+        }
+
         public string ReplacePatterns(string inputFileText)
         {
             var outText = inputFileText;
@@ -92,15 +110,18 @@ namespace Microsoft.DotNet.Cli.Build
             return outText;
         }
 
-        public void WriteOutputFile(string outputFileText)
+        public void WriteOutputFile(string destinationFile, string outputFileText)
         {
-            var destinationDirectory = Path.GetDirectoryName(DestinationFile);
+            var destinationDirectory = Path.GetDirectoryName(destinationFile);
+            Log.LogMessage(MessageImportance.High, $"Destination Directory: {destinationDirectory}");
             if (!Directory.Exists(destinationDirectory))
             {
+                Log.LogMessage(MessageImportance.High, $"Destination Directory `{destinationDirectory}` does not exist. Creating...");
                 Directory.CreateDirectory(destinationDirectory);
             }
 
-            File.WriteAllText(DestinationFile, outputFileText);
+            Log.LogMessage(MessageImportance.High, $"Writing file: {destinationFile}");
+            File.WriteAllText(destinationFile, outputFileText);
         }
     }
 }

packaging/osx/clisdk/resources/cs.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/de.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/en.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/es.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/fr.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/it.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/ja.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/ko.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/pl.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/ru.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/tr.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html

@@ -7,9 +7,9 @@
         <div align="left" style="font-family: Helvetica;padding-left:10px">
             <p>The following was installed at /usr/local/share/dotnet</h2>
                 <ul>
-                    <li>.NET Core SDK 2.1.300</li>
+                    <li>.NET Core SDK {DOTNETSDKVERSION}</li>
-                    <li>.NET Core Runtime 2.1.0</li>
+                    <li>.NET Core Runtime {DOTNETRUNTIMEVERSION}</li>
-                    <li>ASP.NET Core Runtime 2.1.0</li>
+                    <li>ASP.NET Core Runtime {ASPNETCOREVERSION}</li>
                 </ul>
         </div>
         <br>

packaging/windows/clisdk/bundle.wxl

@@ -50,9 +50,9 @@
   <String Id="FirstTimeWelcomeMessage">The installation was successful
 
 The following were installed at [DOTNETHOME]
-    • .NET Core SDK 2.1.300
+    • .NET Core SDK [DOTNETSDKVERSION]
-    • .NET Core Runtime 2.1.0
+    • .NET Core Runtime [DOTNETRUNTIMEVERSION]
-    • ASP.NET Core Runtime 2.1.0
+    • ASP.NET Core Runtime [ASPNETCOREVERSION]
 
 This product collects usage data
     • More information and opt-out https://aka.ms/dotnet-cli-telemetry

packaging/windows/clisdk/bundle.wxs

@@ -24,6 +24,9 @@
 
     <Variable Name="DOTNETHOME" Type="string" Value="[ProgramFiles6432Folder]dotnet" bal:Overridable="no" />
     <Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker)" bal:Overridable="no" />
+    <Variable Name="DOTNETSDKVERSION" Type="string" Value="$(var.DisplayVersion)" bal:Overridable="no" />
+    <Variable Name="DOTNETRUNTIMEVERSION" Type="string" Value="$(var.DotNetRuntimeVersion)" bal:Overridable="no" />
+    <Variable Name="ASPNETCOREVERSION" Type="string" Value="$(var.AspNetCoreVersion)" bal:Overridable="no" />
 
     <Chain DisableSystemRestore="yes" ParallelCache="yes">
       <MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">

packaging/windows/clisdk/generatebundle.ps1

@@ -14,7 +14,9 @@ param(
     [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
     [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
     [Parameter(Mandatory=$true)][string]$UpgradeCode,
-    [Parameter(Mandatory=$true)][string]$Architecture
+    [Parameter(Mandatory=$true)][string]$Architecture,
+    [Parameter(Mandatory=$true)][string]$DotNetRuntimeVersion,
+    [Parameter(Mandatory=$true)][string]$AspNetCoreVersion
 )
 
 . "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@@ -43,6 +45,8 @@ function RunCandleForBundle
         -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" `
         -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" `
         -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" `
+        -dDotNetRuntimeVersion="$DotNetRuntimeVersion" `
+        -dAspNetCoreVersion="$AspNetCoreVersion" `
         -arch "$Architecture" `
         -ext WixBalExtension.dll `
         -ext WixUtilExtension.dll `

src/redist/redist.csproj

@@ -356,8 +356,8 @@
       <ReplacementString>"version": "$(MicrosoftNETCoreAppPackageVersion)"</ReplacementString>
     </PropertyGroup>
     <ReplaceFileContents
-      InputFile="$(VSTestRuntimeConfigPath)"
+      InputFiles="$(VSTestRuntimeConfigPath)"
-      DestinationFile="$(VSTestRuntimeConfigPath)"
+      DestinationFiles="$(VSTestRuntimeConfigPath)"
       ReplacementPatterns="$(ReplacementPattern)"
       ReplacementStrings="$(ReplacementString)" />
   </Target>