diff --git a/README.md b/README.md
index d37d8232f..ad0c22641 100644
--- a/README.md
+++ b/README.md
@@ -216,3 +216,5 @@ License
-------
By downloading the .zip you are agreeing to the terms in the project [EULA](https://aka.ms/dotnet-core-eula).
+
+
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 49bfc555a..0198a3f1a 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -12,7 +12,7 @@
2.1.1
2.2.0-preview1-26609-02
$(MicrosoftNETCoreAppPackageVersion)
- 15.8.0-preview-000138
+ 15.8.0-preview-000160
$(MicrosoftBuildPackageVersion)
$(MicrosoftBuildPackageVersion)
$(MicrosoftBuildPackageVersion)
@@ -23,10 +23,10 @@
$(MicrosoftCodeAnalysisCSharpPackageVersion)
$(MicrosoftCodeAnalysisCSharpPackageVersion)
$(MicrosoftCodeAnalysisCSharpPackageVersion)
- 1.0.0-preview1-62924-06
+ 2.2.100-preview1-63118-02
$(MicrosoftNETSdkPackageVersion)
- $(MicrosoftAspNetCoreAppPackageVersion)
- 2.1.400-preview1-20180614-1774926
+ 2.1.1
+ 2.1.400-preview1-20180705-1834985
$(MicrosoftNETSdkWebPackageVersion)
$(MicrosoftNETSdkWebPackageVersion)
1.0.2-beta3
@@ -42,8 +42,8 @@
0.1.1
1.3.1
$(MicrosoftDotNetProjectJsonMigrationPackageVersion)
- 0.2.0-beta-62628-01
- 4.8.0-preview3.5278
+ 0.2.0-beta-63027-01
+ 4.8.0-preview5.5328
$(NuGetBuildTasksPackageVersion)
$(NuGetBuildTasksPackageVersion)
$(NuGetBuildTasksPackageVersion)
@@ -53,7 +53,7 @@
$(NuGetBuildTasksPackageVersion)
$(NuGetBuildTasksPackageVersion)
$(NuGetBuildTasksPackageVersion)
- 15.8.0-preview-20180605-02
+ 15.8.0
$(MicrosoftNETTestSdkPackageVersion)
$(MicrosoftNETTestSdkPackageVersion)
0.2.0-beta-000042
diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets
index adb6c3529..7f5bf054a 100644
--- a/build/NugetConfigFile.targets
+++ b/build/NugetConfigFile.targets
@@ -30,6 +30,7 @@
+
]]>
diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 649947574..3c8f0f2f8 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -14,6 +14,7 @@
$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe
$(RepoRoot)/packaging/windows/clisdk/generatemsi.ps1
+ $(RepoRoot)/packaging/windows/clisdk/stablefileidforapphosttransform.xslt
$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1
$(RepoRoot)/packaging/windows/clisdk/generatenupkg.ps1
@@ -110,7 +111,9 @@
'$(SimpleVersion)'
'$(NugetVersion)'
'$(SdkInstallerUpgradeCode)'
- '$(Architecture)'" />
+ '$(Architecture)'
+ '$(SdkStableFileIdForApphostTransform)'
+ " />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ apphosttemplateapphostexe
+
+
+
+
diff --git a/packaging/windows/clisdk/generatemsi.ps1 b/packaging/windows/clisdk/generatemsi.ps1
index fc9da871d..69c17d078 100644
--- a/packaging/windows/clisdk/generatemsi.ps1
+++ b/packaging/windows/clisdk/generatemsi.ps1
@@ -10,7 +10,8 @@ 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]$StableFileIdForApphostTransform
)
. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
@@ -26,7 +27,19 @@ function RunHeat
Write-Output Running heat..
- .\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr DOTNETHOME -out $InstallFileswsx | Out-Host
+ # -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as whitelist name.
+ # Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file
+ # path, and file path has version number)
+ # use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time.
+
+ .\heat.exe dir `"$inputDir`" -template fragment `
+ -sreg -gg `
+ -var var.DotnetSrc `
+ -cg InstallFiles `
+ -srd `
+ -dr DOTNETHOME `
+ -t $StableFileIdForApphostTransform `
+ -out $InstallFileswsx | Out-Host
if($LastExitCode -ne 0)
{
diff --git a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx
index 0052c7542..18c0804fd 100644
--- a/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx
+++ b/src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx
@@ -276,4 +276,7 @@
dotnet tool install --global {1}
+
+ Using home directory '{0}' set by the '{1}' environment variable.
+
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
index bad5c47e0..d3f30ffc4 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
@@ -268,6 +268,11 @@ dotnet tool install --global {1}
dotnet tool install --global {1}
+
+ Using home directory '{0}' set by the '{1}' environment variable.
+ Použije se domovský adresář {0} nastavený proměnnou prostředí {1}.
+
+