diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props index a59bce70..06e16b51 100644 --- a/platforms/Windows/Directory.Build.props +++ b/platforms/Windows/Directory.Build.props @@ -81,6 +81,7 @@ ArePackageCabsEmbedded=$(ArePackageCabsEmbedded); BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl); ImageRoot=$(ImageRoot); + PythonVersion=$(PythonVersion); WindowsRuntimeARM64=$(WindowsRuntimeARM64); WindowsRuntimeX64=$(WindowsRuntimeX64); WindowsRuntimeX86=$(WindowsRuntimeX86); diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props index ae79f273..5320ae94 100644 --- a/platforms/Windows/SideBySideUpgradeStrategy.props +++ b/platforms/Windows/SideBySideUpgradeStrategy.props @@ -24,6 +24,7 @@ {BEA8C6DC-F73E-445B-9486-2333D1CF2886} {313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A} {01AFF1CF-A025-41B6-BCBC-728D794353FD} + {5FC42BA9-ABF5-4CCD-B93B-BDFED936BA37} @@ -61,6 +62,7 @@ RtlUpgradeCode=$(RtlUpgradeCode); AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode); WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode); + PythonUpgradeCode=$(PythonUpgradeCode); diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj index b62f1e58..8737d9d2 100644 --- a/platforms/Windows/bundle/installer.wixproj +++ b/platforms/Windows/bundle/installer.wixproj @@ -21,6 +21,7 @@ + diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs index 717a719b..e833e565 100644 --- a/platforms/Windows/bundle/installer.wxs +++ b/platforms/Windows/bundle/installer.wxs @@ -31,6 +31,7 @@ + @@ -101,6 +102,13 @@ + + + + Segoe UI Segoe UI +<<<<<<< HEAD +======= + + + +>>>>>>> 0eec7fd ([windows] add an option to install Embeddable Python 3.10.1 in the toolchain installer) @@ -55,25 +61,25 @@ - - #(loc.Bld_ProductName) - #(loc.Cli_ProductName) - #(loc.Dbg_ProductName) - #(loc.Ide_ProductName) - #(loc.Rtl_ProductName) - #(loc.Plt_ProductName_Windows) - #(loc.Sdk_ProductName_Windows_amd64) - #(loc.Redist_amd64) - #(loc.Sdk_ProductName_Windows_arm64) - #(loc.Redist_arm64) - #(loc.Sdk_ProductName_Windows_x86) - #(loc.Redist_x86) - #(loc.Plt_ProductName_Android) - #(loc.Sdk_ProductName_Android_arm64) - #(loc.Sdk_ProductName_Android_amd64) - #(loc.Sdk_ProductName_Android_armv7) - #(loc.Sdk_ProductName_Android_x86) - + + #(loc.Bld_ProductName) + #(loc.Cli_ProductName) + #(loc.Dbg_ProductName) + #(loc.EmbeddedPython_ProductName) + #(loc.Ide_ProductName) + #(loc.Rtl_ProductName) + #(loc.Plt_ProductName_Windows) + #(loc.Sdk_ProductName_Windows_amd64) + #(loc.Redist_amd64) + #(loc.Sdk_ProductName_Windows_arm64) + #(loc.Redist_arm64) + #(loc.Sdk_ProductName_Windows_x86) + #(loc.Redist_x86) + #(loc.Plt_ProductName_Android) + #(loc.Sdk_ProductName_Android_arm64) + #(loc.Sdk_ProductName_Android_amd64) + #(loc.Sdk_ProductName_Android_armv7) + #(loc.Sdk_ProductName_Android_x86)