diff --git a/src/core-sdk-tasks/GenerateGuidFromName.cs b/src/core-sdk-tasks/GenerateGuidFromName.cs
index 05b6198d9..3ae08347b 100644
--- a/src/core-sdk-tasks/GenerateGuidFromName.cs
+++ b/src/core-sdk-tasks/GenerateGuidFromName.cs
@@ -23,6 +23,7 @@ namespace Microsoft.DotNet.Cli.Build
return true;
}
+ // Generate a Version 5 (SHA1 Name Based) Guid from a name.
public static Guid GenerateGuid(string name)
{
// Any fixed GUID will do for a namespace.
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 82ab2e2e3..0e26d135c 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -32,6 +32,7 @@
$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)
$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)
+ $(ProductBandCombinedHostHostFxrFrameworkSdkName)
+ Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid)
$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-
$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid)$(HostMonikerRidForFileName)
-
+
diff --git a/src/redist/targets/Versions.targets b/src/redist/targets/Versions.targets
index 4160fbea5..4de284967 100644
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@@ -2,7 +2,8 @@
3
0
- 100
+ 1
+ 00
preview3
@@ -27,7 +28,8 @@
$(VersionMajor).$(VersionMinor)
- $(VersionMajor).$(VersionMinor).$(VersionPatch)
+ $(MajorMinorVersion).$(VersionSDKMinor)
+ $(CliProductBandVersion)$(VersionPatch)
$(CliVersionNoSuffix)-$(ReleaseSuffix)
$(CliVersionNoSuffix) - $(ReleaseSuffix)
$(CliVersionNoSuffix)
diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index 8ce12580b..7af0a0ac6 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -10,10 +10,27 @@
AboutUrl="https://dotnet.github.io/"
Compressed="yes">
-
+
WixBundleInstalled OR ((NOT (DOTNETHOME_X64 ~= DOTNETHOME_X86)) OR DOTNETHOMESIMILARITYCHECKOVERRIDE)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+