From 1a383a9d90c781ff5e47b79895f4bb538196e4ee Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 24 Apr 2025 08:53:45 -0700 Subject: [PATCH 01/47] Add WiX SDK to global.json --- global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index 22681c0d3027..dcc2d15def08 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,7 @@ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1", "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1", "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.Build.Traversal": "3.4.0" + "Microsoft.Build.Traversal": "3.4.0", + "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2690783" } } From 78ef9983be5b38fc02cc01ded92251ff736b9655 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 24 Apr 2025 08:55:28 -0700 Subject: [PATCH 02/47] Add WiX packages for CPM --- Directory.Packages.props | 5 +++++ eng/Versions.props | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8b7dd4136423..527806675b5c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -78,6 +78,11 @@ + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index b8c7b2632a45..a719cc6b2d20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -322,6 +322,10 @@ 15.2.10322-net10-p1 18.2.10322-net10-p1 + + + 5.0.2-dotnet.2690783 + 2.0.1-servicing-26011-01 From 0498cc7ff1341a2836a865cde7a3e0310641b6b4 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 24 Apr 2025 09:24:27 -0700 Subject: [PATCH 03/47] Add WiX files to editor config --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index 840178621fdb..e5b299aedb1e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -475,6 +475,10 @@ indent_brace_style = Allman [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}] indent_size = 2 +# WiX files +[*.{wixproj,wxs,wxi}] +indent_size = 2 + [*.{csproj,vbproj,proj,nativeproj,locproj}] charset = utf-8-bom From fbeaf9af802ccb580cc662e5229aaff39ada62fe Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 24 Apr 2025 09:42:23 -0700 Subject: [PATCH 04/47] Add directory fragment --- src/Layout/pkg/windows/msis/directories.wxs | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/Layout/pkg/windows/msis/directories.wxs diff --git a/src/Layout/pkg/windows/msis/directories.wxs b/src/Layout/pkg/windows/msis/directories.wxs new file mode 100644 index 000000000000..901dc30325bd --- /dev/null +++ b/src/Layout/pkg/windows/msis/directories.wxs @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + From ba026e9181076ae4874d136a1e9c6b3908d06cbf Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 24 Apr 2025 10:39:46 -0700 Subject: [PATCH 05/47] Rename and convert provider key fragment to v5 --- src/Layout/pkg/windows/msis/provider.wxs | 24 ++++++++++++++++++++++++ src/Layout/pkg/windows/provider.wxs | 8 -------- 2 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 src/Layout/pkg/windows/msis/provider.wxs delete mode 100644 src/Layout/pkg/windows/provider.wxs diff --git a/src/Layout/pkg/windows/msis/provider.wxs b/src/Layout/pkg/windows/msis/provider.wxs new file mode 100644 index 000000000000..5ef7033ebdff --- /dev/null +++ b/src/Layout/pkg/windows/msis/provider.wxs @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/provider.wxs b/src/Layout/pkg/windows/provider.wxs deleted file mode 100644 index 84c8677d010b..000000000000 --- a/src/Layout/pkg/windows/provider.wxs +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - From 5376bce50c9fbeda84bcc4960266c277f830fa7f Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 1 May 2025 13:55:22 -0700 Subject: [PATCH 06/47] Add project to generate targets for .wixproj --- .../wix.props/Directory.Wix.targets.pp | 8 +++ .../pkg/windows/wix.props/wix.props.csproj | 63 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp create mode 100644 src/Layout/pkg/windows/wix.props/wix.props.csproj diff --git a/src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp b/src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp new file mode 100644 index 000000000000..6ae6292d4ac4 --- /dev/null +++ b/src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp @@ -0,0 +1,8 @@ + + + + + $(DefineConstants);ProductVersion={msiVersion} + $(DefineConstants);BundleVersion={bundleVersion} + + diff --git a/src/Layout/pkg/windows/wix.props/wix.props.csproj b/src/Layout/pkg/windows/wix.props/wix.props.csproj new file mode 100644 index 000000000000..e2890f4950e7 --- /dev/null +++ b/src/Layout/pkg/windows/wix.props/wix.props.csproj @@ -0,0 +1,63 @@ + + + + $(SdkTargetFramework) + false + false + + SetDirectoryWixTargets + + + + + Directory.Wix.targets.pp + $(ArtifactsDir)$(DirectoryWixTargetsTemplate.Replace(.pp,'')) + + + + + + + + + + $([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000')) + + + $(FileVersion) + + + + + + + + + + + + <!-- DO NOT MODIFY! Auto-generated from $(MSBuildProjectFullPath) --> + $([System.IO.File]::ReadAllText($(DirectoryWixTargetsTemplate))) + + $(DirectoryWixTargetsText.Replace('{msiVersion}', $(MsiVersion))) + $(DirectoryWixTargetsText.Replace('{bundleVersion}', $(SDKBundleVersion))) + + + + + + + From 93d82c27be68d392862262e3f706f08005ce9cbc Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 1 May 2025 22:20:53 -0700 Subject: [PATCH 07/47] Add .wxl to .editorconfig --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index e5b299aedb1e..051a0c71d565 100644 --- a/.editorconfig +++ b/.editorconfig @@ -476,7 +476,7 @@ indent_brace_style = Allman indent_size = 2 # WiX files -[*.{wixproj,wxs,wxi}] +[*.{wixproj,wxs,wxi,wxl}] indent_size = 2 [*.{csproj,vbproj,proj,nativeproj,locproj}] From 60972071677c19353dd1c5f3a79e21419ae052e4 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 2 May 2025 22:55:47 -0700 Subject: [PATCH 08/47] Add .wixproj for SDK placeholder MSI --- src/Layout/pkg/windows/Directory.Build.props | 22 ++++++++++++++ .../pkg/windows/Directory.Build.targets | 14 +++++++++ .../pkg/windows/msis/Directory.Build.props | 17 +++++++++++ .../pkg/windows/msis/Directory.Build.targets | 8 +++++ .../msis/placeholder/Directory.Build.targets | 30 +++++++++++++++++++ .../msis/placeholder/placeholder.wixproj | 27 +++++++++++++++++ .../pkg/windows/msis/placeholder/product.wxs | 28 +++++++++++++++++ 7 files changed, 146 insertions(+) create mode 100644 src/Layout/pkg/windows/Directory.Build.props create mode 100644 src/Layout/pkg/windows/Directory.Build.targets create mode 100644 src/Layout/pkg/windows/msis/Directory.Build.props create mode 100644 src/Layout/pkg/windows/msis/Directory.Build.targets create mode 100644 src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets create mode 100644 src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj create mode 100644 src/Layout/pkg/windows/msis/placeholder/product.wxs diff --git a/src/Layout/pkg/windows/Directory.Build.props b/src/Layout/pkg/windows/Directory.Build.props new file mode 100644 index 000000000000..bf74af2043c7 --- /dev/null +++ b/src/Layout/pkg/windows/Directory.Build.props @@ -0,0 +1,22 @@ + + + + + + + full + $(TargetArchitecture) + $(TargetArchitecture) + $(TargetArchitecture) + + + + $(DefineConstants);SdkFeatureBandVersion=$(CliProductBandVersion)00 + $(DefineConstants);ProductLanguage=1033 + $(DefineConstants);Manufacturer="Microsoft Corporation" + + + $(DefineConstants);InstallerVersion=200 + $(DefineConstants);InstallerVersion=500 + + diff --git a/src/Layout/pkg/windows/Directory.Build.targets b/src/Layout/pkg/windows/Directory.Build.targets new file mode 100644 index 000000000000..91771b1b9681 --- /dev/null +++ b/src/Layout/pkg/windows/Directory.Build.targets @@ -0,0 +1,14 @@ + + + + + $(SdkBrandName) ($(InstallerPlatform)) + + + + + $(DefineConstants);SdkBrandName=$(SdkBrandName) + + $(DefineConstants);SdkPlatformBrandName=$(SdkPlatformBrandName) + + diff --git a/src/Layout/pkg/windows/msis/Directory.Build.props b/src/Layout/pkg/windows/msis/Directory.Build.props new file mode 100644 index 000000000000..c10f3f5ae9e0 --- /dev/null +++ b/src/Layout/pkg/windows/msis/Directory.Build.props @@ -0,0 +1,17 @@ + + + + + + $(ArtifactsNonShippingPackagesDir) + + + Package + + + $(MSBuildThisFileDirectory)inc + + + true + + diff --git a/src/Layout/pkg/windows/msis/Directory.Build.targets b/src/Layout/pkg/windows/msis/Directory.Build.targets new file mode 100644 index 000000000000..68ddb4bb8b6a --- /dev/null +++ b/src/Layout/pkg/windows/msis/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + + $(DefineConstants);Version=$(Version) + + diff --git a/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets b/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets new file mode 100644 index 000000000000..a482ea59e85b --- /dev/null +++ b/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets @@ -0,0 +1,30 @@ + + + + + $(DefineConstants);ProductName=$(SdkPlatformBrandName) from Visual Studio + + + + + + + + + + $(DefineConstants);UpgradeCode=$(UpgradeCode) + + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj new file mode 100644 index 000000000000..98aa97218b9b --- /dev/null +++ b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj @@ -0,0 +1,27 @@ + + + + $(SdkPlaceholderMsiOutputName) + + + + + $(DefineConstants);DependencyKeyName=NetCore_SdkPlaceholder + + + + + + + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/msis/placeholder/product.wxs b/src/Layout/pkg/windows/msis/placeholder/product.wxs new file mode 100644 index 000000000000..6643be4562bf --- /dev/null +++ b/src/Layout/pkg/windows/msis/placeholder/product.wxs @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 1174585de87d0c1a682420574c49a9775bd13573 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 2 May 2025 22:58:32 -0700 Subject: [PATCH 09/47] Delete old placeholder source --- src/Layout/pkg/windows/sdkplaceholder.wxs | 35 ----------------------- 1 file changed, 35 deletions(-) delete mode 100644 src/Layout/pkg/windows/sdkplaceholder.wxs diff --git a/src/Layout/pkg/windows/sdkplaceholder.wxs b/src/Layout/pkg/windows/sdkplaceholder.wxs deleted file mode 100644 index 50974bc1bab7..000000000000 --- a/src/Layout/pkg/windows/sdkplaceholder.wxs +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - Installed OR ALLOWMSIINSTALL - - - - NOT Installed OR ALLOWMSIUNINSTALL - - - - - - - - - - - - - - - - - - - - - - - - From 13575cf8e42c855d638f81f482645b07a8180cbd Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 2 May 2025 23:05:15 -0700 Subject: [PATCH 10/47] Delete placeholder MSI targets, .ps1 --- .../pkg/windows/generatesdkplaceholdermsi.ps1 | 109 ------------------ .../redist/targets/GenerateMSIs.targets | 43 ------- 2 files changed, 152 deletions(-) delete mode 100644 src/Layout/pkg/windows/generatesdkplaceholdermsi.ps1 diff --git a/src/Layout/pkg/windows/generatesdkplaceholdermsi.ps1 b/src/Layout/pkg/windows/generatesdkplaceholdermsi.ps1 deleted file mode 100644 index a4f16745872f..000000000000 --- a/src/Layout/pkg/windows/generatesdkplaceholdermsi.ps1 +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. - -param( - [Parameter(Mandatory=$true)][string]$DotnetMSIOutput, - [Parameter(Mandatory=$true)][string]$WixRoot, - [Parameter(Mandatory=$true)][string]$ProductMoniker, - [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, - [Parameter(Mandatory=$true)][string]$SDKBundleVersion, - [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, - [Parameter(Mandatory=$true)][string]$VersionMajor, - [Parameter(Mandatory=$true)][string]$VersionMinor, - [Parameter(Mandatory=$true)][string]$UpgradeCode, - [Parameter(Mandatory=$true)][string]$DependencyKeyName, - [Parameter(Mandatory=$true)][string]$Architecture -) - -function RunCandle -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running candle.." - - $candleOutput = .\candle.exe -nologo ` - -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` - -dProductMoniker="$ProductMoniker" ` - -dBuildVersion="$DotnetMSIVersion" ` - -dSDKBundleVersion="$SDKBundleVersion" ` - -dNugetVersion="$DotnetCLINugetVersion" ` - -dVersionMajor="$VersionMajor" ` - -dVersionMinor="$VersionMinor" ` - -dUpgradeCode="$UpgradeCode" ` - -dDependencyKeyName="$DependencyKeyName" ` - -arch "$Architecture" ` - -ext WixDependencyExtension.dll ` - "$PSScriptRoot\sdkplaceholder.wxs" ` - "$PSScriptRoot\provider.wxs" - - Write-Information "Candle output: $candleOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Candle failed with exit code $LastExitCode." - } - - popd - return $result -} - -function RunLight -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running light.." - $CabCache = Join-Path $WixRoot "cabcache" - - $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension ` - -cultures:en-us ` - sdkplaceholder.wixobj ` - provider.wixobj ` - -b "$PSScriptRoot" ` - -reusecab ` - -cc "$CabCache" ` - -out $DotnetMSIOutput - - Write-Information "Light output: $lightOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Light failed with exit code $LastExitCode." - } - - popd - return $result -} - -Write-Information "Creating SdkPlaceholder MSI at $DotnetMSIOutput" - -if([string]::IsNullOrEmpty($WixRoot)) -{ - Exit -1 -} - -if(-Not (RunCandle)) -{ - Write-Information "Candle failed" - Exit -1 -} - -if(-Not (RunLight)) -{ - Write-Information "Light failed" - Exit -1 -} - -if(!(Test-Path $DotnetMSIOutput)) -{ - throw "Unable to create the SdkPlaceholder MSI." - Exit -1 -} - -Write-Information "Successfully created SdkPlaceholder MSI - $DotnetMSIOutput" - -exit $LastExitCode diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index b0092ff3d7a6..7aeb26b2d5e7 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -4,7 +4,6 @@ GenerateSdkMsi; GenerateTemplatesMsis; - GenerateSdkPlaceholderMsi $(GenerateMsisDependsOn);GenerateSdkBundle @@ -30,7 +29,6 @@ $(SdkPkgSourcesRootDirectory)windows $(SdkPkgSourcesWindowsDirectory)\generatemsi.ps1 - $(SdkPkgSourcesWindowsDirectory)\generatesdkplaceholdermsi.ps1 $(SdkPkgSourcesWindowsDirectory)\stablefileidforapphosttransform.xslt $(SdkPkgSourcesWindowsDirectory)\generatebundle.ps1 @@ -47,7 +45,6 @@ Dotnet_CLI - NetCore_SdkPlaceholder $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) $(SdkBrandName) ($(InstallerPlatform)) - - + + $(DefineConstants);SdkBrandName=$(SdkBrandName) From 65386037e876e09e62acc6565be70894089d80c4 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 12 May 2025 23:15:17 -0700 Subject: [PATCH 12/47] Replace dotnethome_x64.wxs with Arcade copy --- src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj index 98aa97218b9b..09d2f4bfb153 100644 --- a/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj +++ b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj @@ -10,10 +10,7 @@ - - - - + From 1d85ec31505998df2a1eee85eba0ddf4fcaab9c8 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 14 May 2025 22:11:00 -0700 Subject: [PATCH 13/47] Generalize GenerateUpgradeCode and RenameOutput targets --- .../pkg/windows/msis/Directory.Build.targets | 28 ++++++++++++++++++- .../msis/placeholder/Directory.Build.targets | 27 ------------------ .../msis/placeholder/placeholder.wixproj | 9 +++++- 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/Layout/pkg/windows/msis/Directory.Build.targets b/src/Layout/pkg/windows/msis/Directory.Build.targets index 68ddb4bb8b6a..e47e409e9b91 100644 --- a/src/Layout/pkg/windows/msis/Directory.Build.targets +++ b/src/Layout/pkg/windows/msis/Directory.Build.targets @@ -2,7 +2,33 @@ - + $(DefineConstants);Version=$(Version) + + + + + + + + + + + + $(DefineConstants);UpgradeCode=$(UpgradeCode) + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets b/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets index a482ea59e85b..144371187031 100644 --- a/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets +++ b/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets @@ -1,30 +1,3 @@ - - - $(DefineConstants);ProductName=$(SdkPlatformBrandName) from Visual Studio - - - - - - - - - - $(DefineConstants);UpgradeCode=$(UpgradeCode) - - - - - - - - - - - - diff --git a/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj index 09d2f4bfb153..5b40c6910df4 100644 --- a/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj +++ b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj @@ -1,4 +1,4 @@ - + $(SdkPlaceholderMsiOutputName) @@ -21,4 +21,11 @@ + + + + $(SdkPlaceholderMSIInstallerFile) + $(DefineConstants);ProductName=$(SdkPlatformBrandName) from Visual Studio + + From 597e613479bc520c1c54e83ccbda9888369c4101 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 22 May 2025 10:20:32 -0700 Subject: [PATCH 14/47] Onboard templates and toolset MSIs --- src/Layout/pkg/dotnet-sdk.proj | 16 +- src/Layout/pkg/windows/Directory.Build.props | 2 +- .../pkg/windows/Directory.Build.targets | 16 +- .../pkg/windows/bundles/sdk/bundle.wixproj | 58 +++++ src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 242 ++++++++++++++++++ src/Layout/pkg/windows/dotnet.wxs | 79 ------ src/Layout/pkg/windows/dotnethome_x64.wxs | 42 --- .../pkg/windows/msis/Directory.Build.targets | 11 +- .../pkg/windows/{ => msis/inc}/variables.wxi | 40 +-- .../msis/placeholder/Directory.Build.targets | 3 - .../msis/placeholder/placeholder.wixproj | 13 +- .../pkg/windows/msis/placeholder/product.wxs | 2 +- src/Layout/pkg/windows/msis/provider.wxs | 2 +- .../pkg/windows/{ => msis}/registrykeys.wxs | 10 +- .../pkg/windows/msis/templates/product.wxs | 29 +++ .../windows/msis/templates/templates.wixproj | 35 +++ src/Layout/pkg/windows/{ => msis/toolset}/msi | 0 .../pkg/windows/msis/toolset/product.wxs | 59 +++++ .../pkg/windows/msis/toolset/toolset.wixproj | 35 +++ src/Layout/pkg/windows/templates.wxs | 39 --- .../wix.props/Directory.Wix.targets.pp | 8 - .../pkg/windows/wix.props/wix.props.csproj | 63 ----- .../redist/targets/GenerateMSIs.targets | 125 +++------ 23 files changed, 558 insertions(+), 371 deletions(-) create mode 100644 src/Layout/pkg/windows/bundles/sdk/bundle.wixproj create mode 100644 src/Layout/pkg/windows/bundles/sdk/bundle.wxs delete mode 100644 src/Layout/pkg/windows/dotnet.wxs delete mode 100644 src/Layout/pkg/windows/dotnethome_x64.wxs rename src/Layout/pkg/windows/{ => msis/inc}/variables.wxi (55%) delete mode 100644 src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets rename src/Layout/pkg/windows/{ => msis}/registrykeys.wxs (61%) create mode 100644 src/Layout/pkg/windows/msis/templates/product.wxs create mode 100644 src/Layout/pkg/windows/msis/templates/templates.wixproj rename src/Layout/pkg/windows/{ => msis/toolset}/msi (100%) create mode 100644 src/Layout/pkg/windows/msis/toolset/product.wxs create mode 100644 src/Layout/pkg/windows/msis/toolset/toolset.wixproj delete mode 100644 src/Layout/pkg/windows/templates.wxs delete mode 100644 src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp delete mode 100644 src/Layout/pkg/windows/wix.props/wix.props.csproj diff --git a/src/Layout/pkg/dotnet-sdk.proj b/src/Layout/pkg/dotnet-sdk.proj index fb59cba365be..0b3059d3a92c 100644 --- a/src/Layout/pkg/dotnet-sdk.proj +++ b/src/Layout/pkg/dotnet-sdk.proj @@ -1,4 +1,4 @@ - + true @@ -33,6 +33,20 @@ + + + + + + + + + + diff --git a/src/Layout/pkg/windows/Directory.Build.props b/src/Layout/pkg/windows/Directory.Build.props index 4d13728ceef8..9feb93f51cf6 100644 --- a/src/Layout/pkg/windows/Directory.Build.props +++ b/src/Layout/pkg/windows/Directory.Build.props @@ -15,7 +15,7 @@ $(DefineConstants);ProductLanguage=1033 $(DefineConstants);Manufacturer="Microsoft Corporation" - + $(DefineConstants);InstallerVersion=200 $(DefineConstants);InstallerVersion=500 diff --git a/src/Layout/pkg/windows/Directory.Build.targets b/src/Layout/pkg/windows/Directory.Build.targets index 010d24f15cde..fa596f3898d7 100644 --- a/src/Layout/pkg/windows/Directory.Build.targets +++ b/src/Layout/pkg/windows/Directory.Build.targets @@ -2,14 +2,20 @@ - - $(SdkBrandName) ($(InstallerPlatform)) - - $(DefineConstants);SdkBrandName=$(SdkBrandName) - $(DefineConstants);SdkPlatformBrandName=$(SdkPlatformBrandName) + $(DefineConstants);SdkPlatformBrandName=$(SdkBrandName) ($(InstallerPlatform)) + + + $(DefineConstants);NativeMachine_x86=332 + $(DefineConstants);NativeMachine_x64=34404 + $(DefineConstants);NativeMachine_arm64=43620 + + + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj new file mode 100644 index 000000000000..2639b7e6d7d7 --- /dev/null +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj @@ -0,0 +1,58 @@ + + + + + $(ArtifactsShippingPackagesDir) + + Bundle + + C:\git\forks\sdk\src\Layout\pkg\windows + + + + + + + + $(DefineConstants);WinFormsAndWpfVersion=$(WindowsDesktopVersion) + $(DefineConstants);DotNetRuntimeVersion=$(DotNetRuntimeVersion) + $(DefineConstants);AspNetCoreVersion=$(AspNetCoreVersion) + $(DefineConstants);CLISDKMsiSourcePath=$(CLISDKMsiSourcePath) + $(DefineConstants);SharedFXMsiSourcePath=$(SharedFXMsiSourcePath) + $(DefineConstants);HostFXRMsiSourcePath=$(HostFXRMsiSourcePath) + $(DefineConstants);SharedHostMsiSourcePath=$(SharedHostMsiSourcePath) + $(DefineConstants);ASPNETRuntimeMsiSourcePath=$(ASPNETRuntimeMsiSourcePath) + $(DefineConstants);WinFormsAndWpfMsiSourcePath=$(WinFormsAndWpfMsiSourcePath) + $(DefineConstants);NetCoreAppTargetingPackMsiSourcePath=$(NetCoreAppTargetingPackMsiSourcePath) + $(DefineConstants);NetCoreAppHostPackMsiSourcePath=$(NetCoreAppHostPackMsiSourcePath) + $(DefineConstants);AlternateNetCoreAppHostPackMsiSourcePath=$(AlternateNetCoreAppHostPackMsiSourcePath) + $(DefineConstants);Arm64NetCoreAppHostPackMsiSourcePath=$(Arm64NetCoreAppHostPackMsiSourcePath) + $(DefineConstants);NetStandardTargetingPackMsiSourcePath=$(NetStandardTargetingPackMsiSourcePath) + $(DefineConstants);AspNetTargetingPackMsiSourcePath=$(AspNetTargetingPackMsiSourcePath) + $(DefineConstants);WindowsDesktopTargetingPackMsiSourcePath=$(WindowsDesktopTargetingPackMsiSourcePath) + $(DefineConstants);FinalizerExeSourcePath=$(FinalizerExeSourcePath) + $(DefineConstants);TemplatesMsiSourcePath=$(TemplatesMsiSourcePath) + + $(DefineConstants);MinimumVSVersion=$(MinimumVSVersion) + + $(DefineConstants);BundleVersion=$(BundleVersion) + + + + + + + + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs new file mode 100644 index 000000000000..4a94764bc19e --- /dev/null +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/dotnet.wxs b/src/Layout/pkg/windows/dotnet.wxs deleted file mode 100644 index 4c04ccd8f7b8..000000000000 --- a/src/Layout/pkg/windows/dotnet.wxs +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - Installed OR ALLOWMSIINSTALL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT Installed - NOT Installed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Layout/pkg/windows/dotnethome_x64.wxs b/src/Layout/pkg/windows/dotnethome_x64.wxs deleted file mode 100644 index e8a9b5cc0228..000000000000 --- a/src/Layout/pkg/windows/dotnethome_x64.wxs +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - VersionNT64 OR - - WIX_NATIVE_MACHINE AND NOT WIX_NATIVE_MACHINE="$(var.InstallerNativeMachine)" - - - - - - - - NON_NATIVE_ARCHITECTURE AND NOT DOTNETHOME - - - - \ No newline at end of file diff --git a/src/Layout/pkg/windows/msis/Directory.Build.targets b/src/Layout/pkg/windows/msis/Directory.Build.targets index e47e409e9b91..362467d0d938 100644 --- a/src/Layout/pkg/windows/msis/Directory.Build.targets +++ b/src/Layout/pkg/windows/msis/Directory.Build.targets @@ -1,17 +1,22 @@ - $(DefineConstants);Version=$(Version) + $(DefineConstants);ProductVersion=$(ProductVersion) + $(DefineConstants);BundleVersion=$(BundleVersion) + + + $(DefineConstants);DotnetSrc=$(DotnetSrc) - + - + diff --git a/src/Layout/pkg/windows/variables.wxi b/src/Layout/pkg/windows/msis/inc/variables.wxi similarity index 55% rename from src/Layout/pkg/windows/variables.wxi rename to src/Layout/pkg/windows/msis/inc/variables.wxi index da37e6030559..1da2bb30d614 100644 --- a/src/Layout/pkg/windows/variables.wxi +++ b/src/Layout/pkg/windows/msis/inc/variables.wxi @@ -1,28 +1,28 @@ - + + + + + + + + + - + - + - + - - + diff --git a/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets b/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets deleted file mode 100644 index 144371187031..000000000000 --- a/src/Layout/pkg/windows/msis/placeholder/Directory.Build.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj index 5b40c6910df4..2554820cc89f 100644 --- a/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj +++ b/src/Layout/pkg/windows/msis/placeholder/placeholder.wixproj @@ -1,14 +1,5 @@  - - $(SdkPlaceholderMsiOutputName) - - - - - $(DefineConstants);DependencyKeyName=NetCore_SdkPlaceholder - - @@ -22,10 +13,10 @@ - + - $(SdkPlaceholderMSIInstallerFile) $(DefineConstants);ProductName=$(SdkPlatformBrandName) from Visual Studio + $(DefineConstants);DependencyKeyName=NetCore_SdkPlaceholder diff --git a/src/Layout/pkg/windows/msis/placeholder/product.wxs b/src/Layout/pkg/windows/msis/placeholder/product.wxs index 6643be4562bf..f153b94b3bd1 100644 --- a/src/Layout/pkg/windows/msis/placeholder/product.wxs +++ b/src/Layout/pkg/windows/msis/placeholder/product.wxs @@ -1,7 +1,7 @@ - - + diff --git a/src/Layout/pkg/windows/registrykeys.wxs b/src/Layout/pkg/windows/msis/registrykeys.wxs similarity index 61% rename from src/Layout/pkg/windows/registrykeys.wxs rename to src/Layout/pkg/windows/msis/registrykeys.wxs index 32536a7d5fb3..5fea97190ab5 100644 --- a/src/Layout/pkg/windows/registrykeys.wxs +++ b/src/Layout/pkg/windows/msis/registrykeys.wxs @@ -1,15 +1,17 @@ - + + - + - + + - + diff --git a/src/Layout/pkg/windows/msis/templates/product.wxs b/src/Layout/pkg/windows/msis/templates/product.wxs new file mode 100644 index 000000000000..9fbfe6d86eed --- /dev/null +++ b/src/Layout/pkg/windows/msis/templates/product.wxs @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/msis/templates/templates.wixproj b/src/Layout/pkg/windows/msis/templates/templates.wixproj new file mode 100644 index 000000000000..d481634ea52d --- /dev/null +++ b/src/Layout/pkg/windows/msis/templates/templates.wixproj @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);ProductName=$(BrandName) $(InstallerPlatform) + $(DefineConstants);DependencyKeyName=$(DependencyKeyName) + + + diff --git a/src/Layout/pkg/windows/msi b/src/Layout/pkg/windows/msis/toolset/msi similarity index 100% rename from src/Layout/pkg/windows/msi rename to src/Layout/pkg/windows/msis/toolset/msi diff --git a/src/Layout/pkg/windows/msis/toolset/product.wxs b/src/Layout/pkg/windows/msis/toolset/product.wxs new file mode 100644 index 000000000000..4a51d0ea9cf3 --- /dev/null +++ b/src/Layout/pkg/windows/msis/toolset/product.wxs @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Layout/pkg/windows/msis/toolset/toolset.wixproj b/src/Layout/pkg/windows/msis/toolset/toolset.wixproj new file mode 100644 index 000000000000..2290f839b3cf --- /dev/null +++ b/src/Layout/pkg/windows/msis/toolset/toolset.wixproj @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + $(DefineConstants);ProductName=$(BrandName) $(InstallerPlatform) + $(DefineConstants);DependencyKeyName=Dotnet_CLI + + + diff --git a/src/Layout/pkg/windows/templates.wxs b/src/Layout/pkg/windows/templates.wxs deleted file mode 100644 index 72155518064a..000000000000 --- a/src/Layout/pkg/windows/templates.wxs +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Installed OR ALLOWMSIINSTALL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp b/src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp deleted file mode 100644 index 6ae6292d4ac4..000000000000 --- a/src/Layout/pkg/windows/wix.props/Directory.Wix.targets.pp +++ /dev/null @@ -1,8 +0,0 @@ - - - - - $(DefineConstants);ProductVersion={msiVersion} - $(DefineConstants);BundleVersion={bundleVersion} - - diff --git a/src/Layout/pkg/windows/wix.props/wix.props.csproj b/src/Layout/pkg/windows/wix.props/wix.props.csproj deleted file mode 100644 index e2890f4950e7..000000000000 --- a/src/Layout/pkg/windows/wix.props/wix.props.csproj +++ /dev/null @@ -1,63 +0,0 @@ - - - - $(SdkTargetFramework) - false - false - - SetDirectoryWixTargets - - - - - Directory.Wix.targets.pp - $(ArtifactsDir)$(DirectoryWixTargetsTemplate.Replace(.pp,'')) - - - - - - - - - - $([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000')) - - - $(FileVersion) - - - - - - - - - - - - <!-- DO NOT MODIFY! Auto-generated from $(MSBuildProjectFullPath) --> - $([System.IO.File]::ReadAllText($(DirectoryWixTargetsTemplate))) - - $(DirectoryWixTargetsText.Replace('{msiVersion}', $(MsiVersion))) - $(DirectoryWixTargetsText.Replace('{bundleVersion}', $(SDKBundleVersion))) - - - - - - - diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 693203ca7f59..72ff35c76fd1 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -4,6 +4,7 @@ GenerateSdkMsi; GenerateTemplatesMsis; + GenerateSdkPlaceholderMsi $(GenerateMsisDependsOn);GenerateSdkBundle @@ -29,7 +30,6 @@ $(SdkPkgSourcesRootDirectory)windows $(SdkPkgSourcesWindowsDirectory)\generatemsi.ps1 - $(SdkPkgSourcesWindowsDirectory)\stablefileidforapphosttransform.xslt $(SdkPkgSourcesWindowsDirectory)\generatebundle.ps1 $(ArtifactsBinDir)finalizer\win-$(TargetArchitecture)\$(Configuration)\bin\finalizer.exe @@ -52,21 +52,24 @@ Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) + $([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000')) - - $(FileVersion) + + $(FileVersion) + - + @@ -93,104 +96,45 @@ - - - - - - - - - - - - - - - - + - - - - - - - - - + - - - + - - - $(SdkPkgSourcesWindowsDirectory)\generatetemplatesmsi.ps1 - + - + $(IntermediateOutputPath)templates-%(TemplatesComponents.TemplatesMajorMinorVersion) %(TemplatesComponents.BrandNameWithoutVersion) $(Version) - %(TemplatesComponents.MSIVersion) - %(TemplatesComponents.InstallerUpgradeCode) NetCore_Templates_%(TemplatesComponents.TemplatesMajorMinorVersion) - + %(TemplatesComponents.InstallerUpgradeCode) + $(RepoRoot)src\Layout\pkg\windows\msis\templates\templates.wixproj + + + @@ -336,6 +280,7 @@ + DependsOnTargets="$(GenerateMsisDependsOn)"> + From 0d0e221f178c6360d9a002e18d04b1c4dcd56fa1 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 22 May 2025 13:14:48 -0700 Subject: [PATCH 15/47] Convert .wxl files to v4 schema --- src/Layout/pkg/windows/LCID/1028/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1029/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1031/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1033/bundle.wxl | 146 +++++++++----------- src/Layout/pkg/windows/LCID/1036/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1040/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1041/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1042/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1045/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1046/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1049/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/1055/bundle.wxl | 142 ++++++++----------- src/Layout/pkg/windows/LCID/2052/bundle.wxl | 141 ++++++++----------- src/Layout/pkg/windows/LCID/3082/bundle.wxl | 141 ++++++++----------- 14 files changed, 817 insertions(+), 1163 deletions(-) diff --git a/src/Layout/pkg/windows/LCID/1028/bundle.wxl b/src/Layout/pkg/windows/LCID/1028/bundle.wxl index fc6e58cd73c5..8c77449fc733 100644 --- a/src/Layout/pkg/windows/LCID/1028/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1028/bundle.wxl @@ -1,84 +1,59 @@ - - [WixBundleName] 安裝程式 - [BUNDLEMONIKER] - 確定要取消嗎? - 前一版 - 安裝說明 - /install | /repair | /uninstall | /layout [\[]"directory"[\]] - 安裝、修復、解除安裝 - 或在目錄中建立套件組合的完整本機複本。'/install' 是預設值。 - -/passive | /quiet - 顯示最基本的 UI 且不出現提示，或是不顯示任何 UI 且 - 不出現提示。預設會顯示 UI 及所有提示。 - -/norestart - 抑制任何重新啟動嘗試。UI 預設會在重新啟動前提示。 -/log [\[]"log.txt"[\]] - 記錄到特定檔案。預設會在 %TEMP% 中建立記錄檔。 - 關閉(&C) - 我同意授權條款及條件(&A) - 選項(&O) - 安裝(&I) - 關閉(&C) - 安裝進度 - 處理中: - 正在初始化... - 取消(&C) - 修改安裝 - 修復(&R) - 解除安裝(&U) - 關閉(&C) - 修復已成功完成 - 解除安裝已成功完成 - 設定成功 - 啟動(&L) - 您必須重新啟動電腦，以完成軟體的安裝。 - 重新啟動(&R) - 關閉(&C) - 安裝失敗 - 設定失敗 - 解除安裝失敗 - 修復失敗 - 有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱<a href="#">記錄檔</a>。 - 必須重新啟動電腦，才能完成軟體的復原。 - 重新啟動(&R) - 關閉(&C) - 使用中的檔案 - 以下應用程式正在使用需要進行更新的檔案: - 關閉應用程式並嘗試重新啟動(&A) - 不關閉應用程式，需要重新啟動(&D) - 確定(&O) - 取消(&C) - 安裝成功。 - -已安裝下列產品: - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] - -此產品會收集使用量資料 - • 詳細資訊和退出 https://aka.ms/dotnet-cli-telemetry - -資源 - • .NET 文件 https://aka.ms/dotnet-docs - • SDK 文件 https://aka.ms/dotnet-sdk-docs - • 版本資訊 https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • 教學課程 https://aka.ms/dotnet-tutorials - .NET SDK - - .NET SDK 可用於建置、執行和測試 .NET 應用程式。您可以選擇多種語言、編輯器以及開發人員工具，並可利用程式庫的大型生態系統，來建置 Web、行動裝置、桌面、遊戲及 IoT 的應用程式。希望您會喜歡! - 深入了解 .NET - 資源 - <A HREF="https://aka.ms/dotnet-docs">.NET 文件</A> - <A HREF="https://aka.ms/dotnet-cli-docs">SDK 文件</A> - <A HREF="https://aka.ms/dev-privacy">隱私權聲明</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET 的授權資訊</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">遙測集合與退出功能</A> - 安裝附註 - 安裝程序期間將會執行命令，加快專案還原速度並啟用離線存取。最多需要一分鐘的時間完成。 - - 如果計劃使用 .NET [VERSIONMAJOR].[VERSIONMINOR] 搭配 Visual Studio，需要 Visual Studio 2022 [MINIMUMVSVERSION] 或更新版本。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">深入了解</A>。 - - 按一下 “安裝” 即表示您同意下列條款: - x64 SDK 安裝的安裝路徑: "[DOTNETHOME_X64]" 不能與 x86 SDK 安裝的路徑相同: "[DOTNETHOME_X86]" - ARM64 SDK 安裝的安裝路徑: "[DOTNETHOME_ARM64]" 不能與 x86 SDK 安裝的路徑相同: "[DOTNETHOME_X86]" - ARM64 SDK 安裝的安裝路徑: "[DOTNETHOME_ARM64]" 不能與 x64 SDK 安裝的路徑相同: "[DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1029/bundle.wxl b/src/Layout/pkg/windows/LCID/1029/bundle.wxl index 6189bb220753..0d4351e6b8e8 100644 --- a/src/Layout/pkg/windows/LCID/1029/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1029/bundle.wxl @@ -1,84 +1,59 @@ - - Instalační program pro [WixBundleName] - [BUNDLEMONIKER] - Opravdu chcete akci zrušit? - Předchozí verze - Nápověda nastavení - /install | /repair | /uninstall | /layout [\[]"adresář"[\]] – Nainstaluje, opraví, odinstaluje - nebo vytvoří úplnou místní kopii sady v adresáři. Výchozí nastavení je /install. - -/passive | /quiet – Zobrazí minimální uživatelské rozhraní bez jakýchkoli výzev nebo nezobrazí žádné uživatelské rozhraní ani - žádné výzvy. Ve výchozím nastavení se zobrazí uživatelské rozhraní a všechny výzvy. - -/norestart – Potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní zobrazí před restartováním výzvu. -/log [\[]"log.txt"[\]] – Zapíše protokol do konkrétního souboru. Ve výchozím nastavení se soubor protokolu vytvoří ve složce %TEMP%. - &Zavřít - Souhl&asím s licenčními podmínkami. - M&ožnosti - &Instalovat - &Zavřít - Průběh instalace - Probíhá zpracování: - Inicializování... - &Storno - Změnit instalaci - Op&ravit - O&dinstalovat - &Zavřít - Oprava byla úspěšně dokončena - Odinstalace se úspěšně dokončila - Instalace byla úspěšná. - &Spustit - Aby bylo možné dokončit instalaci softwaru, je nutné restartovat počítač. - &Restartovat - &Zavřít - Instalace se nepovedla - Instalace se nepovedla - Odinstalace se nepovedla - Oprava se nepovedla - Nejméně jeden problém způsobil selhání instalace. Opravte prosím tyto problémy a zkuste instalaci zopakovat. Další informace najdete v <a href="#">log file</a>. - Pro dokončení vrácení změn tohoto softwaru je potřeba restartovat počítač. - &Restartovat - &Zavřít - Soubory jsou používány - Následující aplikace používají soubory, které je potřeba aktualizovat: - Zavřete &aplikace a zkuste je restartovat. - A&plikace nezavírejte. Bude potřeba provést restart. - &OK - &Zrušit - Instalace byla úspěšná. - -Byly nainstalovány následující produkty: - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] - -Tento produkt shromažďuje data o využití. - • Další informace a možnosti vyjádřit nesouhlas: https://aka.ms/dotnet-cli-telemetry - -Zdroje informací - • Dokumentace k rozhraní .NET: https://aka.ms/dotnet-docs - • Dokumentace k sadě SDK: https://aka.ms/dotnet-sdk-docs - • Zpráva k vydání verze: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Kurzy: https://aka.ms/dotnet-tutorials - Sada .NET SDK - - Sada .NET SDK slouží k sestavování, spouštění a testování aplikací .NET. Můžete si vybrat z několika jazyků, editorů a vývojářských nástrojů a využít rozsáhlého ekosystému knihoven k vytváření aplikací pro web, mobilní zařízení, stolní počítače, hry a IoT. Doufáme, že se vám bude líbit! - Další informace o .NET - Prostředky - <A HREF="https://aka.ms/dotnet-docs">Dokumentace k architektuře .NET</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Dokumentace k sadě SDK</A> - <A HREF="https://aka.ms/dev-privacy">Prohlášení o zásadách ochrany osobních údajů</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informace o licencování pro .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Kolekce telemetrie a výslovný nesouhlas</A> - Poznámka k instalaci - Během procesu instalace se spustí příkaz, který zlepší rychlost obnovení projektu a povolí offline přístup. Akce se dokončí přibližně za minutu. - - Pokud plánujete používat rozhraní .NET [VERSIONMAJOR].[VERSIONMINOR] se sadou Visual Studio, je vyžadována verze Visual Studio 2022 [MINIMUMVSVERSION] nebo novější. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Přečtěte si další informace</A>. - - Kliknutím na Nainstalovat vyjadřujete souhlas s následujícími podmínkami: - Instalační cesta pro instalace sady x64 SDK[ DOTNETHOME_X64] nemůže být stejná jako u instalací sady x86 SDK: [DOTNETHOME_X86]. - Instalační cesta pro instalace sady ARM64 SDK[ DOTNETHOME_ARM64] nemůže být stejná jako u instalací sady x86 SDK: [DOTNETHOME_X86] - Instalační cesta pro instalace sady ARM64 SDK[ DOTNETHOME_ARM64] nemůže být stejná jako u instalací sady x64 SDK: [DOTNETHOME_X64] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1031/bundle.wxl b/src/Layout/pkg/windows/LCID/1031/bundle.wxl index feb24bba7898..53146996be71 100644 --- a/src/Layout/pkg/windows/LCID/1031/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1031/bundle.wxl @@ -1,84 +1,59 @@ - - [WixBundleName]-Installationsprogramm - [BUNDLEMONIKER] - Möchten Sie den Vorgang abbrechen? - Vorherige Version - Setup-Hilfe - /install | /repair | /uninstall | /layout [\[]„Verzeichnis“[\]] – installiert, repariert, deinstalliert - oder erstellt eine vollständige lokale Kopie des Bündels im Verzeichnis. „/install“ ist die Standardeinstellung. - -/passive | /quiet – Zeigt eine minimale Benutzeroberfläche ohne Eingabeaufforderungen an oder zeigt weder eine Benutzeroberfläche noch - Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und alle Eingabeaufforderungen angezeigt. - -/norestart – Unterdrückt alle Neustartversuche. Standardmäßig wird die Benutzeroberfläche vor dem Neustart aufgefordert. -/log [\[]"log.txt"[\]] – Protokolliert eine bestimmte Datei. Standardmäßig wird eine Protokolldatei in %TEMP% erstellt. - S&chließen - Ich &stimme den Bedingungen des Lizenzvertrags zu - &Optionen - &Installieren - S&chließen - Setupstatus - Wird verarbeitet: - Initialisierung... - &Abbrechen - Setup ändern - &Reparieren - &Deinstallieren - S&chließen - Reparatur erfolgreich abgeschlossen - Deinstallation erfolgreich abgeschlossen - Setup wurde erfolgreich abgeschlossen - &Starten - Sie müssen den Computer neu starten, um die Installation der Software abzuschließen. - &Neustart - S&chließen - Setupfehler - Fehler beim Setup - Fehler bei der Deinstallation - Fehler bei der Reparatur - Setup ist aufgrund eines oder mehrerer Probleme fehlgeschlagen. Beheben Sie die Probleme, und führen Sie Setup erneut aus. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>. - Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen. - &Neustart - S&chließen - Dateien in Verwendung - Die folgenden Anwendungen verwenden Dateien, die aktualisiert werden müssen: - Schließen Sie die &Anwendungen, und versuchen Sie sie erneut zu starten. - &Anwendungen nicht schließen. Ein Neustart ist erforderlich. - &OK - &Abbrechen - Die Installation war erfolgreich. - -Die folgenden Produkte wurden installiert: - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] - -Dieses Produkt sammelt Nutzungsdaten - • Weitere Informationen und Kündigung https://aka.ms/dotnet-cli-telemetry - -Ressourcen - • .NET-Dokumentation https://aka.ms/dotnet-docs - • SDK-Dokumentation https://aka.ms/dotnet-sdk-docs - • Versionshinweise https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Tutorials https://aka.ms/dotnet-tutorials - .NET-SDK - - Das .NET SDK wird zum Erstellen, Ausführen und Testen von .NET-Anwendungen verwendet. Sie können aus mehreren Sprachen, Editoren und Entwicklungstools wählen und ein großes Bibliotheksnetzwerk nutzen, um Apps für das Web, mobile Geräte, Desktops, Gaming und IoT zu entwickeln. Wir wünschen Ihnen viel Spaß dabei! - Weitere Informationen zu .NET - Ressourcen - <A HREF="https://aka.ms/dotnet-docs">.NET-Dokumentation</A> - <A HREF="https://aka.ms/dotnet-cli-docs">SDK-Dokumentation</A> - <A HREF="https://aka.ms/dev-privacy">Datenschutzerklärung</A> - <A HREF="https://aka.ms/dotnet-license-windows">Lizenzierungsinformationen für .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Sammlung von Telemetriedaten und Deaktivieren der Telemetriefunktion</A> - Installationshinweis - Während des Installationsvorgangs wird ein Befehl ausgeführt, durch den die Geschwindigkeit der Projektwiederherstellung verbessert und der Offlinezugriff aktiviert wird. Der Vorgang dauert bis zu einer Minute. - - Wenn Sie beabsichtigen, .NET [VERSIONMAJOR]. [VERSIONMINOR] mit Visual Studio zu verwenden, ist Visual Studio 2022 [MINIMUMVSVERSION] oder neuer erforderlich. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Weitere Informationen</A>. - - Durch Klicken auf „Installieren“ stimmen Sie den nachstehenden Bedingungen zu: - Der Installationspfad „[DOTNETHOME_X64]“ für x64 SDK-Installationen kann nicht derselbe sein wie für x86 SDK-Installationen: „[DOTNETHOME_X86]“ - Der Installationspfad „[DOTNETHOME_ARM64]“ für ARM64 SDK-Installationen kann nicht derselbe sein wie für x86 SDK-Installationen: „[DOTNETHOME_X86]“ - Der Installationspfad „[DOTNETHOME_ARM64]“ für ARM64 SDK-Installationen kann nicht derselbe sein wie für x64 SDK-Installationen: „[DOTNETHOME_X64]“ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1033/bundle.wxl b/src/Layout/pkg/windows/LCID/1033/bundle.wxl index 6010869e9bc2..10446c5d38c9 100644 --- a/src/Layout/pkg/windows/LCID/1033/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1033/bundle.wxl @@ -1,84 +1,64 @@ - - [WixBundleName] Installer - [BUNDLEMONIKER] - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [\[]"directory"[\]] - installs, repairs, uninstalls - or creates a complete local copy of the bundle in directory. '/install' is the default. - -/passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default, UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default, UI will prompt before restart. -/log [\[]"log.txt"[\]] - logs to a specific file. By default, a log file is created in %TEMP%. - &Close - I &agree to the license terms and conditions - &Options - &Install - &Close - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Close - Repair Successfully Completed - Uninstall Successfully Completed - Setup Successful - &Launch - You must restart your computer to complete the installation of the software. - &Restart - &Close - Setup Failed - Setup Failed - Uninstall Failed - Repair Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information, see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - Files In Use - The following applications are using files that need to be updated: - Close the &applications and attempt to restart them. - &Do not close applications. A reboot will be required. - &OK - &Cancel - The installation was successful. - -The following products were installed: - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] - -This product collects usage data - • More information and opt-out https://aka.ms/dotnet-cli-telemetry - -Resources - • .NET Documentation https://aka.ms/dotnet-docs - • SDK Documentation https://aka.ms/dotnet-sdk-docs - • Release Notes https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Tutorials https://aka.ms/dotnet-tutorials - .NET SDK - - The .NET SDK is used to build, run, and test .NET applications. You can choose from multiple languages, editors, and developer tools, and take advantage of a large ecosystem of libraries to build apps for web, mobile, desktop, gaming, and IoT. We hope you enjoy it! - Learn more about .NET - Resources - <A HREF="https://aka.ms/dotnet-docs">.NET Documentation</A> - <A HREF="https://aka.ms/dotnet-cli-docs">SDK Documentation</A> - <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> - <A HREF="https://aka.ms/dotnet-license-windows">Licensing Information for .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetry collection and opt-out</A> - Installation note - A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete. - - If you plan to use .NET [VERSIONMAJOR].[VERSIONMINOR] with Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] or newer is required. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Learn more</A>. - - By clicking Install, you agree to the following terms: - The installation path for x64 SDK installations: "[DOTNETHOME_X64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" - The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x86 SDK installations: "[DOTNETHOME_X86]" - The installation path for ARM64 SDK installations: "[DOTNETHOME_ARM64]" cannot be the same as for x64 SDK installations: "[DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1036/bundle.wxl b/src/Layout/pkg/windows/LCID/1036/bundle.wxl index 667dddd946d5..0c7d19aa8599 100644 --- a/src/Layout/pkg/windows/LCID/1036/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1036/bundle.wxl @@ -1,84 +1,59 @@ - - Programme d’installation de [WixBundleName] - [BUNDLEMONIKER] - Voulez-vous vraiment annuler ? - Version précédente - Aide du programme d'installation - /install | /repair | /uninstall | /layout [\[]"directory"[\]] : installe, répare, désinstalle - ou crée une copie locale complète de l’offre groupée dans le répertoire. '/install' est la valeur par défaut. - -/passive | /quiet – affiche une interface utilisateur minimale sans invites ou n’affiche ni interface utilisateur et - aucune invite. Par défaut, l’interface utilisateur et toutes les invites sont affichées. - -/norestart : supprime toutes les tentatives de redémarrage. Par défaut, l’interface utilisateur vous invite à redémarrer. -/log [\[]"log.txt"[\]] : journalise un fichier spécifique. Par défaut, un fichier journal est créé dans %TEMP%. - &Fermer - J'&accepte les conditions générales de la licence - &Options - &Installer - &Fermer - Avancement de l'installation - En cours : - Initialisation... - &Annuler - Modifier l'installation - &Réparer - &Désinstaller - &Fermer - Réparation terminée avec succès - Désinstallation terminée avec succès - Opération réussie - &Démarrer - Vous devez redémarrer l'ordinateur pour achever l'installation du logiciel. - &Redémarrer - &Fermer - Échec de l'installation - Échec de l'installation - Échec de la désinstallation - Échec de la réparation - Le programme d’installation a échoué en raison d’un ou de plusieurs problèmes. Veuillez corriger ces problèmes, puis relancez le programme d’installation. Pour en savoir plus, consultez le <a href="#">fichier journal</a>. - Vous devez redémarrer votre ordinateur pour terminer l'opération de restauration du logiciel. - &Redémarrer - &Fermer - Fichiers en cours d'utilisation - Les applications suivantes utilisent des fichiers nécessitant une mise à jour : - &Fermer les applications essayer de les ouvrir de nouveau. - &Ne pas fermer les applications. Un redémarrage sera nécessaire. - &OK - &Annuler - L’installation a réussi. - -Les éléments suivants ont été installés : - • Kit SDK .NET [DOTNETSDKVERSION] - • Runtime .NET [DOTNETRUNTIMEVERSION] - • Runtime ASP.NET Core [ASPNETCOREVERSION] - • Runtime .NET Windows Desktop [WINFORMSANDWPFVERSION] - -Ce produit collecte des données d’utilisation - • Plus informations et refus d’adhésion sur https://aka.ms/dotnet-cli-telemetry - -Ressources - • Documentation .NET sur https://aka.ms/dotnet-docs - • Documentation de kit SDK sur https://aka.ms/dotnet-sdk-docs - • Notes de publication sur https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Tutoriels sur https://aka.ms/dotnet-tutorials - Kit de développement logiciel (SDK) .NET - - Le Kit de développement logiciel (SDK) .NET est utilisé pour générer, exécuter et tester des applications .NET. Vous pouvez choisir parmi plusieurs langages, éditeurs et outils de développement, et tirer parti d’un vaste écosystème de bibliothèques pour créer des applications pour le web, les appareils mobiles, les ordinateurs de bureau, les jeux et l’IoT. Nous espérons que vous l’apprécierez ! - En savoir plus sur .NET - Ressources - <A HREF="https://aka.ms/dotnet-docs">Documentation .NET</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Documentation du kit SDK</A> - <A HREF="https://aka.ms/dev-privacy">Déclaration de confidentialité</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informations de licence pour .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Collecte et désactivation de la télémétrie</A> - Note d’installation - Une commande va être exécutée pendant le processus d'installation, ce qui va améliorer la vitesse de restauration du projet et permettre l'accès hors connexion. L'opération va prendre environ une minute. - - Si vous envisagez d’utiliser .NET [VERSIONMAJOR].[VERSIONMINOR] avec Visual Studio, Visual Studio 2022 [MINIMUMVSVERSION] ou une version ultérieure est nécessaire. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">En savoir plus</A>. - - En cliquant sur Installer, vous acceptez les conditions suivantes : - Le chemin d’installation des installations du Kit de développement logiciel (SDK) x64 : « [DOTNETHOME_X64] » ne peut pas être identique à celui des installations du Kit de développement logiciel (SDK) x86 : « [DOTNETHOME_X86] » - Le chemin d’installation des installations du Kit de développement logiciel (SDK) ARM64 : "[DOTNETHOME_ARM64]" ne peut pas être identique à celui des installations du Kit de développement logiciel (SDK) x86 : "[DOTNETHOME_X86]" - Le chemin d’installation des installations du Kit de développement logiciel (SDK) ARM64 : « [DOTNETHOME_ARM64] » ne peut pas être identique à celui des installations du Kit de développement logiciel (SDK) x64 : « [DOTNETHOME_X64] » + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1040/bundle.wxl b/src/Layout/pkg/windows/LCID/1040/bundle.wxl index 14fd33a2e7cd..f6c5eae15a67 100644 --- a/src/Layout/pkg/windows/LCID/1040/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1040/bundle.wxl @@ -1,84 +1,59 @@ - - Programma di installazione di [WixBundleName] - [BUNDLEMONIKER] - Annullare? - Versione precedente - Guida all'installazione - /install | /repair | /uninstall | /layout [\[]"directory"[\]] - installa, ripristina, disinstalla - oppure crea una copia locale completa del pacchetto nella directory. '/install' è l'impostazione predefinita. - -/passive | /quiet - consente di visualizzare un'interfaccia utente minima senza messaggi o di non visualizzare alcuna interfaccia utente - nessuna richiesta. Per impostazione predefinita, vengono visualizzati l'interfaccia utente e tutte le richieste. - -/norestart - consente di sopprimere qualsiasi tentativo di riavvio. Per impostazione predefinita, prima del riavvio verrà visualizzata una richiesta nell'interfaccia utente. -/log [\[]"log.txt"[\]] - esegue la registrazione in un file specifico. Per impostazione predefinita, il file di log viene creato in %TEMP%. - &Chiudi - &Accetto i termini e le condizioni di licenza - &Opzioni - &Installa - &Chiudi - Stato installazione - Elaborazione di: - Inizializzazione in corso... - &Annulla - Modifica installazione - &Ripristina - &Disinstalla - &Chiudi - La riparazione è stata completata - La disinstallazione è stata completata - L'installazione è stata completata - &Avvia - Per completare l'installazione del software, è necessario riavviare il computer. - &Riavvia - &Chiudi - Installazione non riuscita - Installazione non riuscita - Disinstallazione non riuscita - La riparazione non è riuscita - Installazione non riuscita a causa di uno o più problemi. Risolvere i problemi e ritentare l'installazione. Per ulteriori informazioni, vedere <a href="#">log file</a>. - È necessario riavviare il computer per completare il rollback del software. - &Riavvia - &Chiudi - File in uso - Le applicazioni seguenti usano file che necessitano di aggiornamento: - Chiudere le &applicazioni e provare a riavviarle. - &Non chiudere le applicazioni; sarà necessario riavviare il sistema - &OK - &Annulla - L'installazione è riuscita! - -Sono stati installati i prodotti seguenti: - • .NET SDK [DOTNETSDKVERSION] - • Runtime .NET [DOTNETRUNTIMEVERSION] - • Runtime ASP.NET Core [ASPNETCOREVERSION] - • Runtime Desktop Windows .NET [WINFORMSANDWPFVERSION] - -Questo prodotto raccoglie i dati di utilizzo - • Altre informazioni e rifiuto esplicito su https://aka.ms/dotnet-cli-telemetry - -Risorse - • Documentazione .NET https://aka.ms/dotnet-docs - • Documentazione SDK https://aka.ms/dotnet-sdk-docs - • Note sulla versione https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Esercitazioni https://aka.ms/dotnet-tutorials - .NET SDK - - .NET SDK viene usato per compilare, eseguire e testare applicazioni .NET. È possibile scegliere tra più linguaggi, editor e strumenti di sviluppo e sfruttare un vasto ecosistema di librerie per creare app per Web, dispositivi mobili, desktop, giochi e IoT. Ci auguriamo che ti piaccia. - Altre informazioni su .NET - Risorse - <A HREF="https://aka.ms/dotnet-docs">Documentazione di .NET</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Documentazione dell'SDK</A> - <A HREF="https://aka.ms/dev-privacy">Informativa sulla privacy</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informazioni sulla licenza per .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Raccolta e rifiuto esplicito dei dati di telemetria</A> - Nota sull'installazione - Durante il processo di installazione verrà eseguito un comando che migliorerà la velocità di ripristino del progetto e abiliterà l'accesso offline. Il completamento del comando richiederà un minuto. - - Se si prevede di usare .NET [VERSIONMAJOR]. [VERSIONMINOR] con Visual Studio, è necessario Visual Studio 2022 [MINIMUMVSVERSION] o versione successiva. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Altre informazioni</A>. - - Facendo clic su Installa, si accettano le condizioni seguenti: - Percorso di installazione per le installazioni x64 SDK: "[DOTNETHOME_X64]" non può essere uguale a quello delle installazioni di x86 SDK: "[DOTNETHOME_X86]" - Percorso di installazione per le installazioni di ARM64 SDK: "[DOTNETHOME_ARM64]" non può essere uguale a quello delle installazioni di x86 SDK: "[DOTNETHOME_X86]" - Percorso di installazione per le installazioni di ARM64 SDK: "[DOTNETHOME_ARM64]" non può essere uguale a quello delle installazioni x64 SDK: "[DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1041/bundle.wxl b/src/Layout/pkg/windows/LCID/1041/bundle.wxl index cb009f405560..3463b40bfc3e 100644 --- a/src/Layout/pkg/windows/LCID/1041/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1041/bundle.wxl @@ -1,84 +1,59 @@ - - [WixBundleName] インストーラー - [BUNDLEMONIKER] - 取り消しますか? - 以前のバージョン - セットアップのヘルプ - /install | /repair | /uninstall | /layout [\[]"directory"[\]] - インストール、修復、アンインストール - または、バンドルの完全なローカル コピーをディレクトリに作成します。'/install' が既定値です。 - -/passive | /quiet - 最小限の UI をプロンプトなしで表示するか、UI と - プロンプトを表示しません。既定では、UI とすべてのプロンプトが表示されます。 - -/norestart - 再起動の試行をすべて抑止します。既定では、再起動の前に UI が表示されます。 -/log [\[]"log.txt"[\]] - 特定のファイルにログを出力します。既定では、ログ ファイルは %TEMP% 内に作成されます。 - 閉じる(&C) - ライセンス条項および使用条件に同意する(&A) - オプション(&O) - インストール(&I) - 閉じる(&C) - セットアップの進行状況 - 処理中: - 初期化しています... - キャンセル(&C) - セットアップの変更 - 修復(&R) - アンインストール(&U) - 閉じる(&C) - 修復が正常に完了しました - アンインストールが正常に完了しました - セットアップ完了 - 起動(&L) - ソフトウェアのインストールを完了するには、コンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - セットアップに失敗しました - セットアップに失敗しました - アンインストールに失敗しました - 修復に失敗しました - 1 つまたは複数の問題により、セットアップが失敗しました。問題を解決してからセットアップを再試行してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 - ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - ファイルが使用中 - 次のアプリケーションは、更新の必要があるファイルを使用しています: - アプリケーションを閉じて再起動を試みる。(&A) - アプリケーションを終了させない (コンピューターの再起動が必要になります)(&D) - OK(&O) - キャンセル(&C) - 正常にインストールされました。 - -次の製品がインストールされました: - • .NET SDK [DOTNETSDKVERSION] - • .NET ランタイム [DOTNETRUNTIMEVERSION] - • ASP.NET Core ランタイム [ASPNETCOREVERSION] - • .NET Windows デスクトップ ランタイム [WINFORMSANDWPFVERSION] - -この製品は利用状況データを収集します - • 詳細情報とオプトアウト https://aka.ms/dotnet-cli-telemetry - -リソース - • .NET Documentation https://aka.ms/dotnet-docs - • SDK ドキュメント https://aka.ms/dotnet-sdk-docs - • リリース ノート https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • チュートリアル https://aka.ms/dotnet-tutorials - .NET SDK - - .Net SDK は、.NET アプリケーションをビルド、実行、テストするために使用されます。複数の言語、エディター、開発者ツールから選択し、ライブラリの大規模なエコシステムを利用して、Web、モバイル、デスクトップ、ゲーム、IoT 用のアプリを作成できます。ぜひご利用ください。 - .Net の詳細情報 - リソース - <A HREF="https://aka.ms/dotnet-docs">.NET ドキュメント</A> - <A HREF="https://aka.ms/dotnet-cli-docs">SDK ドキュメント</A> - <A HREF="https://aka.ms/dev-privacy">プライバシーに関する声明</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET のライセンス情報</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">テレメトリ コレクションおよびオプトアウト</A> - インストール メモ - コマンドはインストール処理中に実行されるので、プロジェクトの復元速度が向上し、オフラインでアクセスできます。完了するまでに最大 1 分かかります。 - - .NET [VERSIONMAJOR].[VERSIONMINOR] を Visual Studio と使用する場合は、Visual Studio 2022 [MINIMUMVSVERSION] 以降が必要です。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">詳細情報</A> - - インストール をクリックすると、次の条項に同意したものと見なされます: - x64 SDK インストールのインストール パス: "[DOTNETHOME_X64]" を x86 SDK インストールの場合と同じにすることはできません: "[DOTNETHOME_X86]" - ARM64 SDK インストールのインストール パス: "[DOTNETHOME_ARM64]" を x86 SDK インストールの場合と同じにすることはできません: "[DOTNETHOME_X86]" - ARM64 SDK インストールのインストール パス: "[DOTNETHOME_ARM64]" を x64 SDK インストールの場合と同じにすることはできません: "[DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1042/bundle.wxl b/src/Layout/pkg/windows/LCID/1042/bundle.wxl index 89c481c3f602..0a6662ce4d49 100644 --- a/src/Layout/pkg/windows/LCID/1042/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1042/bundle.wxl @@ -1,84 +1,59 @@ - - [WixBundleName] 설치 관리자 - [BUNDLEMONIKER] - 취소하시겠습니까? - 이전 버전 - 설치 도움말 - /install | /repair | /uninstall | /layout [\[]"directory"[\]] - 설치, 복구, 제거 - 또는 디렉터리에 번들의 전체 로컬 복사본을 만듭니다. '/install'이 기본값입니다. - -/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 - 프롬프트를 표시하지 않습니다. 기본적으로 UI 및 모든 프롬프트가 표시됩니다. - -/norestart - 다시 시작 시도를 중지합니다. 기본적으로 UI는 다시 시작하기 전에 메시지를 표시합니다. -/log [\[]"log.txt"[\]] - 특정 파일에 로그합니다. 기본적으로 로그 파일은 %TEMP%에 만들어집니다. - 닫기(&C) - 동의함(&A) - 옵션(&O) - 설치(&I) - 닫기(&C) - 설치 진행률 - 처리 중: - 초기화하는 중... - 취소(&C) - 설치 수정 - 복구(&R) - 제거(&U) - 닫기(&C) - 복구 완료됨 - 제거 완료됨 - 설치 완료 - 시작(&L) - 소프트웨어 설치를 완료하려면 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 설치 실패 - 설치 실패 - 제거 실패 - 복구 실패 - 하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하세요. 자세한 내용은 <a href="#">로그 파일</a>을 참조하세요 - 소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 사용 중인 파일 - 다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다. - 응용 프로그램을 닫고 다시 시작합니다(&A). - 응용 프로그램을 닫지 않습니다(&D). 다시 부팅해야 합니다. - 확인(&O) - 취소(&C) - 설치가 완료되었습니다. - -다음 제품이 설치되었습니다. - • .NET SDK [DOTNETSDKVERSION] - • .NET 런타임 [DOTNETRUNTIMEVERSION] - • ASP.NET Core 런타임 [ASPNETCOREVERSION] - • .NET Windows 데스크톱 런타임 [WINFORMSANDWPFVERSION] - -이 제품은 사용량 현황 데이터를 수집합니다. - • 추가 정보 및 옵트아웃 https://aka.ms/dotnet-cli-telemetry - -리소스 - • .NET 문서 https://aka.ms/dotnet-docs - • SDK 문서 https://aka.ms/dotnet-sdk-docs - • 릴리스 정보 https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • 자습서 https://aka.ms/dotnet-tutorials - .NET SDK - - .NET SDK는 .NET 애플리케이션을 빌드, 실행 및 테스트하는 데 사용됩니다. 여러 언어, 편집기 및 개발자 도구 중에서 선택하고 대규모 라이브러리 에코시스템을 활용하여 웹, 모바일, 데스크톱, 게임 및 IoT용 앱을 빌드할 수 있습니다. .NET SDK를 유용하게 사용하시길 바랍니다. - .NET에 대한 자세한 정보 - 리소스 - <A HREF="https://aka.ms/dotnet-docs">.NET 설명서</A> - <A HREF="https://aka.ms/dotnet-cli-docs">SDK 설명서</A> - <A HREF="https://aka.ms/dev-privacy">개인정보처리방침</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET에 대한 라이선스 정보</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">원격 분석 수집 및 옵트아웃</A> - 설치 정보 - 프로젝트 복원 속도를 향상하고 오프라인 액세스를 사용할 수 있도록 하는 설치 프로세스 중 명령이 실행됩니다. 완료하는 데 최대 1분이 걸립니다. - - Visual Studio에서 .NET [VERSIONMAJOR].[VERSIONMINOR]을(를) 사용하려는 경우 Visual Studio 2022 [MINIMUMVSVERSION] 이상이 필요합니다. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">자세히 알아보기</A>. - - 설치를 클릭하면 다음 사용 약관에 동의하는 것입니다. - x64 SDK 설치의 설치 경로: " [DOTNETHOME_x64]" x86 SDK 설치의 경우와 같을 수 없습니다. " [DOTNETHOME_X86]" - ARM64 SDK 설치의 설치 경로: " [DOTNETHOME_ARM64]" x86 SDK 설치의 경우와 같을 수 없습니다. " [DOTNETHOME_X86]" - ARM64 SDK 설치의 설치 경로: " [DOTNETHOME_ARM64]" x64 SDK 설치의 경우와 같을 수 없습니다. " [DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1045/bundle.wxl b/src/Layout/pkg/windows/LCID/1045/bundle.wxl index 2cb469ae7d21..3b08cca46e6a 100644 --- a/src/Layout/pkg/windows/LCID/1045/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1045/bundle.wxl @@ -1,84 +1,59 @@ - - Instalator pakietu [WixBundleName] - [BUNDLEMONIKER] - Czy na pewno chcesz anulować? - Poprzednia wersja - Instalator — Pomoc - /install | /repair | /uninstall | /layout [\[]directory[\]] — instaluje, naprawia, odinstalowuje - lub tworzy pełną lokalną kopię pakietu w katalogu. „/install” jest wartością domyślną. - -/passive | /quiet — wyświetla minimalny interfejs użytkownika bez monitów lub nie wyświetla interfejsu użytkownika - ani monitów. Domyślnie jest wyświetlany interfejs użytkownika i wszystkie monity. - -/norestart — wstrzymaj próby ponownego uruchomienia. Domyślnie interfejs użytkownika wyświetli monit przed ponownym uruchomieniem. -/log [\[]"log.txt"[\]] — rejestruje do określonego pliku. Domyślnie plik dziennika jest tworzony w katalogu %TEMP%. - &Zamknij - Zg&adzam się z warunkami licencji - &Opcje - Za&instaluj - &Zamknij - Postęp instalacji - Przetwarzanie: - Trwa inicjowanie... - A&nuluj - Zmodyfikuj instalatora - Nap&raw - O&dinstaluj - &Zamknij - Pomyślnie ukończono naprawę - Pomyślnie ukończono operację odinstalowania - Instalacja przebiegła pomyślnie - &Uruchom - Aby zakończyć instalację oprogramowania, należy ponownie uruchomić komputer. - &Uruchom ponownie - &Zamknij - Instalacja nie powiodła się - Konfiguracja nie powiodła się - Operacja odinstalowania nie powiodła się - Naprawa nie powiodła się - Jeden lub więcej problemów spowodowało niepowodzenie instalacji. Napraw błędy, a następnie ponownie uruchom instalację. Aby uzyskać więcej informacji zobacz <a href="#">plik dziennika</a>. - Należy ponownie uruchomić komputer, aby dokończyć wycofywanie oprogramowania. - &Uruchom ponownie - &Zamknij - Pliki w użyciu - Następujące aplikacje korzystają z plików, które muszą zostać zaktualizowane: - Zamknij &aplikacje i spróbuj je ponownie uruchomić. - &Nie zamykaj aplikacji. Będzie konieczne ponowne uruchomienie. - &OK - &Anuluj - Instalacja zakończyła się pomyślnie. - -Zainstalowano następujące produkty: - • Zestaw SDK .NET [DOTNETSDKVERSION] - • Środowisko uruchomieniowe platformy .NET [DOTNETRUNTIMEVERSION] - • Środowisko uruchomieniowe platformy ASP.NET Core [ASPNETCOREVERSION] - • Środowisko uruchomieniowe platformy .NET dla komputerów z systemem Windows [WINFORMSANDWPFVERSION] - -Ten produkt zbiera dane użycia - • Więcej informacji i niezgoda na uczestnictwo: https://aka.ms/dotnet-cli-telemetry - -Zasoby - • Dokumentacja platformy .NET: https://aka.ms/dotnet-docs - • Dokumentacja zestawu SDK: https://aka.ms/dotnet-sdk-docs - • Informacje o wersji: https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Samouczki: https://aka.ms/dotnet-tutorials - .NET SDK - - Zestaw SDK .NET służy do tworzenia, uruchamiania i testowania aplikacji platformy .NET. Możesz wybierać spośród wielu języków, edytorów i narzędzi deweloperskich oraz korzystać z dużego ekosystemu bibliotek, aby tworzyć aplikacje dla sieci Web, urządzeń przenośnych, komputerów, konsol i platformy IoT. Mamy nadzieję, że to Ci się spodoba! - Dowiedz się więcej o platformie .NET - Zasoby - <A HREF="https://aka.ms/dotnet-docs">Dokumentacja platformy .NET</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Dokumentacja zestawu SDK</A> - <A HREF="https://aka.ms/dev-privacy">Zasady zachowania poufności informacji</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informacje o licencjonowaniu dla platformy .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Zbieranie telemetrii i rezygnacja</A> - Uwaga dotycząca instalacji - W trakcie procesu instalacji zostanie uruchomione polecenie, które zwiększy szybkość przywracania projektu i umożliwi dostęp do trybu offline. Zajmie to maksymalnie minutę. - - Jeśli planujesz używać platformy .NET [VERSIONMAJOR].[VERSIONMINOR] za pomocą programu Visual Studio, wymaga to wersji programu Visual Studio 2022 [MINIMUMVSVERSION] lub nowszej. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Dowiedz się więcej</A>. - - Klikając pozycję Zainstaluj, wyrażasz zgodę na następujące warunki: - Ścieżka instalacji w przypadku instalacji zestawu SDK x64: „[DOTNETHOME_X64]” nie może być taka sama jak w przypadku instalacji zestawu SDK x86: „[DOTNETHOME_X86]” - Ścieżka instalacji w przypadku instalacji zestawu SDK ARM64: „[DOTNETHOME_ARM64]” nie może być taka sama jak w przypadku instalacji zestawu SDK X86: „[DOTNETHOME_X86]” - Ścieżka instalacji w przypadku instalacji zestawu SDK ARM64: „[DOTNETHOME_ARM64]” nie może być taka sama jak w przypadku instalacji zestawu SDK x64: „[DOTNETHOME_X64]” + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1046/bundle.wxl b/src/Layout/pkg/windows/LCID/1046/bundle.wxl index bdbb05f0fd48..cae9c5be5552 100644 --- a/src/Layout/pkg/windows/LCID/1046/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1046/bundle.wxl @@ -1,84 +1,59 @@ - - Instalador do [WixBundleName] - [BUNDLEMONIKER] - Tem certeza de que deseja cancelar? - Versão anterior - Ajuda da Instalação - /install | /repair | /uninstall | /layout [\[]"directory"[\]] – instala, repara, desinstala - ou cria uma cópia local completa do pacote no diretório. "/install" é o padrão. - -/passive | /quiet – exibe a interface do usuário mínima sem prompts ou não exibe nenhuma interface do usuário e - nenhum prompt. Por padrão, a interface do usuário e todos os prompts são exibidos. - -/norestart – suprime quaisquer tentativas de reinicialização. Por padrão, a interface do usuário será solicitada antes da reinicialização. -/log [\[]"log.txt"[\]] – registra em log um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. - &Fechar - &Concordo com os termos e condições da licença - &Opções - &Instalar - &Fechar - Progresso da Instalação - Processando: - Inicializando... - &Cancelar - Modificar Instalação - &Reparar - &Desinstalar - &Fechar - Reparação Concluída com Êxito - Desinstalação Concluída com Êxito - Instalação com Êxito - &Iniciar - É necessário reiniciar o computador para concluir a instalação do software. - &Reiniciar - &Fechar - Falha na Instalação - Falha na Instalação - Falha na Desinstalação - Falha ao Reparar - Um ou mais problemas fizeram com que a configuração falhasse. Corrija os problemas e tente novamente a configuração. Para obter mais informações, consulte o <a href="#">arquivo de log</a>. - Reinicie o computador para concluir a reversão do software. - &Reiniciar - &Fechar - Arquivos em Uso - Os aplicativos a seguir estão usando arquivos que precisam ser atualizados: - Feche os &aplicativos e tente reiniciá-los. - &Não feche os aplicativos. Uma reinicialização será necessária. - &OK - &Cancelar - A instalação foi bem-sucedida. - -Os seguintes produtos foram instalados: - • SDK .NET [DOTNETSDKVERSION] - • Runtime .NET [DOTNETRUNTIMEVERSION] - • Runtime ASP.NET Core [ASPNETCOREVERSION] - • Runtime .NET para Desktop no Windows [WINFORMSANDWPFVERSION] - -Esse produto coleta dados de uso - • Mais informações e recusa https://aka.ms/dotnet-cli-telemetry - -Recursos - • Documentação do .NET https://aka.ms/dotnet-docs - • Documentação do SDK https://aka.ms/dotnet-sdk-docs - • Notas de versão https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Tutoriais https://aka.ms/dotnet-tutorials - SDK do .NET - - O SDK do .NET é usado para compilar, executar e testar aplicativos .NET. Você pode escolher entre vários idiomas, editores e ferramentas de desenvolvedor e aproveitar um grande ecossistema de bibliotecas para criar aplicativos para Web, móveis, área de trabalho, jogos e IoT. Esperamos que goste! - Saiba mais sobre o .NET - Recursos - <A HREF="https://aka.ms/dotnet-docs">Documentação do .NET</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Documentação do SDK</A> - <A HREF="https://aka.ms/dev-privacy">Política de Privacidade</A> - <A HREF="https://aka.ms/dotnet-license-windows">Informações de licenciamento para .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Coleção e recusa de telemetria</A> - Nota de instalação - Um comando será executado durante o processo de instalação que melhorará a velocidade de restauração do projeto e habilitará o acesso offline. Isso levará até um minuto para ser concluído. - - Se você planeja usar .NET [VERSIONMAJOR].[VERSIONMINOR] com o Visual Studio, é necessário o Visual Studio 2022 [MINIMUMVSVERSION] ou mais recente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Saiba mais</A>. - - Ao clicar em Instalar, você concorda com os termos a seguir: - O caminho da instalação para instalações do SDK x64: "[DOTNETHOME_X64]" não pode ser o mesmo que para instalações do SDK x86: "[DOTNETHOME_X86]" - O caminho da instalação para instalações do SDK ARM64: "[DOTNETHOME_ARM64]" não pode ser o mesmo que para instalações do SDK x86: "[DOTNETHOME_X86]" - O caminho da instalação para instalações do SDK ARM64: "[DOTNETHOME_ARM64]" não pode ser o mesmo que para instalações do SDK x64: "[DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1049/bundle.wxl b/src/Layout/pkg/windows/LCID/1049/bundle.wxl index 18402ec4826b..0154dadf8608 100644 --- a/src/Layout/pkg/windows/LCID/1049/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1049/bundle.wxl @@ -1,84 +1,59 @@ - - Установщик [WixBundleName] - [BUNDLEMONIKER] - Отменить? - Предыдущая версия - Справка по установке - /install | /repair | /uninstall | /layout [\[]"directory"[\]] - устанавливает, исправляет, удаляет - или создает полную локальную копию пакета в каталоге. '/install' - значение по умолчанию. - -/passive | /quiet — отображает минимальный пользовательский интерфейс без запросов или не отображает пользовательский интерфейс и - запросы. По умолчанию отображаются пользовательский интерфейс и все запросы. - -/norestart — подавлять все попытки перезапуска. По умолчанию пользовательский интерфейс будет предложен перед перезагрузкой. -/log [\[]"log.txt"[\]] - журналы в определённом файле. По умолчанию файл журнала создается в %TEMP%. - &Закрыть - Я &принимаю условия лицензии - &Параметры - &Установить - &Закрыть - Ход установки - Обработка: - Инициализация... - Отм&ена - Изменение установки - &Исправить - &Удалить - &Закрыть - Исправление успешно завершено - Удаление успешно завершено - Установка успешно завершена - &Запустить - Для завершения установки программного обеспечения нужно перезагрузить компьютер. - &Перезапустить - &Закрыть - Сбой установки - Сбой установки - Сбой удаления - Сбой восстановления - Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в <a href="#">файле журнала</a>. - Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. - &Перезапустить - &Закрыть - Используемые файлы - Следующие приложения используют файлы, которые следует обновить: - Закройте &приложения и попробуйте перезапустить их. - &Не закрывайте приложения. Потребуется перезагрузка компьютера. - &ОК - &Отменить - Установка прошла успешно. - -Установлены следующие продукты: - • ПАКЕТ SDK ДЛЯ .NET [DOTNETSDKVERSION] - • Среда выполнения .NET [DOTNETRUNTIMEVERSION] - • Среда выполнения ASP.NET Core [ASPNETCOREVERSION] - • Среда выполнения .NET Windows Desktop [WINFORMSANDWPFVERSION] - -Этот продукт собирает данные об использовании - • Дополнительные сведения и отказ от использования https://aka.ms/dotnet-cli-telemetry - -Ресурсы - • Документация .NET https://aka.ms/dotnet-docs - • Документация SDK https://aka.ms/dotnet-sdk-docs - • Заметки о выпуске https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Руководства https://aka.ms/dotnet-tutorials - Пакет SDK для .NET - - Пакет SDK для .NET используется для сборки, запуска и тестирования приложений .NET. Вы можете выбрать один из нескольких языков, использовать различные редакторы и инструменты для разработчиков, а также воспользоваться преимуществами большой экосистемы библиотек для создания веб-приложений, мобильных и классических приложений, игр и приложений Интернета вещей. Надеемся, что вам понравится! - Дополнительные сведения о .NET - Ресурсы - <A HREF="https://aka.ms/dotnet-docs">Документация по .NET</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Документация по пакету SDK</A> - <A HREF="https://aka.ms/dev-privacy">Заявление о конфиденциальности</A> - <A HREF="https://aka.ms/dotnet-license-windows">Сведения о лицензировании .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Сбор данных телеметрии и отказ от использования</A> - Примечание по установке - В процессе установки будет выполнена команда, которая увеличит скорость восстановления проекта и обеспечит автономный доступ. Выполнение займет до минуты. - - Если вы планируете использовать .NET [VERSIONMAJOR].[VERSIONMINOR] с Visual Studio, требуется Visual Studio 2022 версии [MINIMUMVSVERSION] или более поздней. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Подробнее</A>. - - Нажимая кнопку "Установить", вы принимаете следующие условия. - Совпадение пути установки недопустимо для установок пакетов SDK x64: "[DOTNETHOME_X64]" и SDK x86: "[DOTNETHOME_X86]". - Совпадение пути установки недопустимо для установок пакетов SDK ARM64: "[DOTNETHOME_ARM64]" и SDK x86: "[DOTNETHOME_X86]". - Совпадение пути установки недопустимо для установок пакетов SDK ARM64: "[DOTNETHOME_ARM64]" и SDK x64: "[DOTNETHOME_X64]". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/1055/bundle.wxl b/src/Layout/pkg/windows/LCID/1055/bundle.wxl index e42f5bcdbbe5..9c94812a97e3 100644 --- a/src/Layout/pkg/windows/LCID/1055/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/1055/bundle.wxl @@ -1,85 +1,59 @@ - - [WixBundleName] Yükleyicisi - [BUNDLEMONIKER] - İptal etmek istediğinizden emin misiniz? - Önceki sürüm - Kurulum Yardımı - /install | /repair | /uninstall | /layout [\[]"dizin"[\]] - yüklemeler, onarımlar, kaldırmalar - veya paketin tam bir yerel kopyasını dizinde oluşturur. '/install' varsayılandır. - -/passive | /quiet - kullanıcı arabirimini istem olmadan minimum düzeyde görüntüler veya kullanıcı arabirimi ve - istem olmadan - görüntüler. Varsayılan olarak kullanıcı arabirimi ve tüm istemler görüntülenir. - -/norestart - yeniden başlatma girişimlerini durdur. Varsayılan olarak kullanıcı arabirimi yeniden başlatmadan önce sorar. -/log [\[]"log.txt"[\]] - belirli bir dosyaya kaydeder. Varsayılan olarak, %TEMP% içinde bir günlük dosyası oluşturulur. - &Kapat - Lisans hüküm ve koşullarını &kabul ediyorum - &Seçenekler - Yü&kle - &Kapat - Kurulum İlerleme Durumu - İşleniyor: - Başlatılıyor... - İ&ptal - Kurulumu değiştir - &Onar - &Kaldır - &Kapat - Onarım Başarıyla Tamamlandı - Kaldırma Başarıyla Tamamlandı - Kurulum Başarılı - &Başlat - Yazılım yükleme işlemini tamamlamak için bilgisayarınızı yeniden başlatmanız gerekir. - &Yeniden Başlat - &Kapat - Kurulum Başarısız - Kurulum Başarısız - Kaldırma Başarısız - Onarım Başarısız - Bir ya da daha fazla sorun nedeniyle kurulum başarısız oldu. Lütfen bu sorunları düzeltin ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın. - Yazılımın geri alınmasını tamamlamak için bilgisayarınızı yeniden başlatmanız gerekiyor. - &Yeniden Başlat - &Kapat - Kullanımda Olan Dosyalar - Şu uygulamalar güncelleştirilmesi gereken dosyaları kullanıyor: - &Uygulamaları kapatın ve yeniden başlatmayı deneyin. - &Uygulamaları kapatmayın. Sistemi yeniden başlatmanız gerekir. - &Tamam - İ&ptal - Yükleme başarılı oldu. - -Şu ürünler yüklendi: - • .NET SDK [DOTNETSDKVERSION] - • .NET Çalışma Zamanı [DOTNETRUNTIMEVERSION] - • ASP.NET Çekirdek Çalışma Zamanı [ASPNETCOREVERSION] - • .NET Windows Masaüstü Çalışma Zamanı [WINFORMSANDWPFVERSION] - -Bu ürün, kullanım verilerini toplar - • Daha fazla bilgi ve geri çevirme https://aka.ms/dotnet-cli-telemetry - -Kaynaklar - • .NET Belgeleri https://aka.ms/dotnet-docs - • SDK Belgeleri https://aka.ms/dotnet-sdk-docs - • Sürüm Notları https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Öğreticiler https://aka.ms/dotnet-tutorials - .NET SDK - - .NET SDK, .NET uygulamalarını derlemek, çalıştırmak ve test etmek için kullanılır. Birden çok dil, düzenleyici ve geliştirici aracı arasından seçim yapabilirsiniz ve web, mobil, masaüstü, oyun ve IoT uygulamaları oluşturmak için büyük bir kitaplık ekosisteminden yararlanabilirsiniz. Beğeneceğinizi umuyoruz! - .NET hakkında daha fazla bilgi edinin - Kaynaklar - <A HREF="https://aka.ms/dotnet-docs">.NET Belgeleri</A> - <A HREF="https://aka.ms/dotnet-cli-docs">SDK Belgeleri</A> - <A HREF="https://aka.ms/dev-privacy">Gizlilik Bildirimi</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET için Lisans Bilgileri</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Telemetri koleksiyonu ve katılmamayı seçme</A> - Yükleme notu - Yükleme işlemi sırasında, proje geri yükleme hızını artıran ve çevrimdışı erişimi etkinleştiren bir komut çalıştırılır. Tamamlanması bir dakikanızı alır. - - Visual Studio ile .NET [VERSIONMAJOR].[VERSIONMINOR] kullanmayı planlıyorsanız Visual Studio 2022 [MINIMUMVSVERSION] veya üzeri bir sürüm gerekir. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Daha fazla bilgi edinin</A>. - - Yükle'ye tıklayarak aşağıdaki koşulları kabul etmiş olursunuz: - x64 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X64]"), x86 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X86]") ile aynı olamaz - ARM64 SDK yüklemeleri için yükleme yolu ("[DOTNETHOME_ARM64]"), x86 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X86]") ile aynı olamaz - ARM64 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_ARM64]"), x64 SDK yüklemelerinin yükleme yolu ("[DOTNETHOME_X64]") ile aynı olamaz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/2052/bundle.wxl b/src/Layout/pkg/windows/LCID/2052/bundle.wxl index 3cd07d2fac77..b51c2bd763b9 100644 --- a/src/Layout/pkg/windows/LCID/2052/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/2052/bundle.wxl @@ -1,84 +1,59 @@ - - [WixBundleName] 安装程序 - [BUNDLEMONIKER] - 是否确实要取消? - 上一版本 - 安装程序帮助 - /install | /repair | /uninstall | /layout [\[]"directory"[\]] - 安装、修复、卸载 - 或在目录中创建捆绑包的完整本地副本。'/install' 是默认值。 - -/passive | /quiet - 显示最小 UI 且无提示，或不显示 UI 和 - 提示。默认情况下，将显示 UI 和所有提示。 - -/norestart - 抑制任何重启尝试。默认情况下，UI 将在重启前提示。 -/log [\[]"log.txt"[\]] - 记录到特定文件。默认情况下在 %TEMP% 中创建日志文件。 - 关闭(&C) - 我同意许可条款和条件(&A) - 选项(&O) - 安装(&I) - 关闭(&C) - 安装进度 - 正在处理: - 正在初始化... - 取消(&C) - 修改安装程序 - 修复(&R) - 卸载(&U) - 关闭(&C) - 成功完成了修复 - 成功完成了卸载 - 设置成功 - 启动(&L) - 必须重启计算机才能完成软件安装。 - 重新启动(&R) - 关闭(&C) - 安装失败 - 安装失败 - 卸载失败 - 修复失败 - 一个或多个问题导致了安装失败。请修复这些问题，然后重试安装。有关详细信息，请参阅<a href="#">日志文件</a>。 - 必须重新启动计算机才能完成软件回退。 - 重新启动(&R) - 关闭(&C) - 文件正在使用 - 以下应用程序正在使用的文件需要更新: - 关闭应用程序并尝试重启(&A)。 - 不关闭应用程序(&D)。需要重启。 - 确定(&O) - 取消(&C) - 安装成功。 - -已安装以下产品: - • .NET SDK [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] - -此产品会收集使用情况数据 - • 详细信息和选择退出 https://aka.ms/dotnet-cli-telemetry - -资源 - • .NET 文档 https://aka.ms/dotnet-docs - • SDK 文档 https://aka.ms/dotnet-sdk-docs - • 发行说明 https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • 教程 https://aka.ms/dotnet-tutorials - .NET SDK - - .NET SDK 用于生成、运行和测试 .NET 应用程序。有多种语言、编辑器和开发人员工具可供选择，你也可使用由库构成的大型生态系统来构建面向 Web、移动设备、桌面、游戏和 IoT 的应用。希望你喜欢它! - 了解有关 .NET 的详细信息 - 资源 - <A HREF="https://aka.ms/dotnet-docs">.NET 文档</A> - <A HREF="https://aka.ms/dotnet-cli-docs">SDK 文档</A> - <A HREF="https://aka.ms/dev-privacy">隐私声明</A> - <A HREF="https://aka.ms/dotnet-license-windows">.NET 的许可信息</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">遥测集合和选择退出选项</A> - 安装说明 - 将在要提升项目还原速度并实现脱机访问的安装进程期间运行命令。此操作最多 1 分钟即可完成。 - - 如果你计划将 .NET [VERSIONMAJOR].[VERSIONMINOR] 与 Visual Studio 配合使用，则 Visual Studio 2022 [MINIMUMVSVERSION] 或更高版本是必需的。<A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">了解详细信息</A>。 - - 单击“安装”即表示你同意以下条款: - x64 SDK 安装的安装路径: "[DOTNETHOME_X64]" 不能与 x86 SDK 安装的路径相同: "[DOTNETHOME_X86]" - ARM64 SDK 安装的安装路径: "[DOTNETHOME_ARM64]" 不能与 x86 SDK 安装的路径相同: "[DOTNETHOME_X86]" - ARM64 SDK 安装的安装路径: "[DOTNETHOME_ARM64]" 不能与 x64 SDK 安装的路径相同: "[DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Layout/pkg/windows/LCID/3082/bundle.wxl b/src/Layout/pkg/windows/LCID/3082/bundle.wxl index 0bd39310edc7..f8c382e9056f 100644 --- a/src/Layout/pkg/windows/LCID/3082/bundle.wxl +++ b/src/Layout/pkg/windows/LCID/3082/bundle.wxl @@ -1,84 +1,59 @@ - - Instalador de [WixBundleName] - [BUNDLEMONIKER] - ¿Está seguro de que desea cancelar la operación? - Versión anterior - Ayuda del programa de instalación - /install | /repair | /uninstall | /layout [\[]"directory"[\]]: instala, repara, desinstala - o crea una copia local completa de la agrupación en el directorio. "/install" es el valor predeterminado. - -/passive | /quiet: muestra una interfaz de usuario mínima sin avisos o no muestra ninguna interfaz de usuario ni - ningún aviso. De forma predeterminada, se muestran la interfaz de usuario y todos los avisos. - -/norestart: suprime los intentos de reinicio. De forma predeterminada, la interfaz de usuario le avisará antes de reiniciar. -/log [\[]"log.txt"[\]]: registra en un archivo específico. De forma predeterminada, se crea un archivo de registro en %TEMP%. - &Cerrar - &Acepto los términos y condiciones de licencia - &Opciones - &Instalar - &Cerrar - Progreso de la instalación - Procesando: - Inicializando... - &Cancelar - Modificar instalación - &Reparar - &Desinstalar - &Cerrar - La reparación se completó correctamente - La desinstalación se completó correctamente - La instalación o desinstalación se realizó correctamente - &Iniciar - Debe reiniciar el equipo para finalizar la instalación del software. - &Reiniciar - &Cerrar - Error de instalación - Error de instalación - No se pudo desinstalar - No se pudo reparar - Uno o varios problemas han provocado un error en la instalación. Solucione los problemas e intente de nuevo la instalación. Para obtener más información, consulte e <a href="#">log file</a>. - Debe reiniciar el equipo para completar la reversión del software. - &Reiniciar - &Cerrar - Archivos en uso - Las siguientes aplicaciones usan archivos que se deben actualizar: - Cerrar las &aplicaciones e intentar reiniciarlas. - &No cerrar las aplicaciones. Será necesario un reinicio. - &Aceptar - &Cancelar - La instalación se realizó correctamente. - -Se instalaron los siguientes productos: - • SDK DE .NET [DOTNETSDKVERSION] - • .NET Runtime [DOTNETRUNTIMEVERSION] - • ASP.NET Core Runtime [ASPNETCOREVERSION] - • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] - -Este producto recopila datos de uso - • Más información y optar por no participar https://aka.ms/dotnet-cli-telemetry - -Recursos - • Documentación de .NET https://aka.ms/dotnet-docs - • Documentación de SDK https://aka.ms/dotnet-sdk-docs - • Notas de la versión https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Tutoriales https://aka.ms/dotnet-tutorials - SDK de .NET - - El SDK de .NET se usa para compilar, ejecutar y probar las aplicaciones .NET. Puede elegir entre varios lenguajes, editores y herramientas de desarrollo y aprovechar las ventajas de un amplio ecosistema de bibliotecas para compilar aplicaciones web, móviles, de escritorio, juegos e IoT. Esperamos que la disfrute. - Más información sobre .NET - Recursos - <A HREF="https://aka.ms/dotnet-docs">Documentación de .NET</A> - <A HREF="https://aka.ms/dotnet-cli-docs">Documentación del SDK</A> - <A HREF="https://aka.ms/dev-privacy">Declaración de privacidad</A> - <A HREF="https://aka.ms/dotnet-license-windows">Información de licencias de .NET</A> - <A HREF="https://aka.ms/dotnet-cli-telemetry">Recopilación de telemetría y cómo desactivarla</A> - Nota de instalación - Se ejecutará un comando durante el proceso de instalación que mejorará la velocidad de restauración del proyecto y permitirá el acceso sin conexión. La operación tardará hasta un minuto en completarse. - - Si tiene previsto utilizar .NET [VERSIONMAJOR].[VERSIONMINOR] con Visual Studio, necesitará Visual Studio 2022 [MINIMUMVSVERSION] o una versión más reciente. <A HREF="https://aka.ms/dotnet[VERSIONMAJOR]-release-notes">Más información</A>. - - Al hacer clic en Instalar, acepta los siguientes términos: - La ruta de instalación para las instalaciones del SDK x64: "[DOTNETHOME_X64]" no puede ser la misma que para las instalaciones del SDK x86: "[DOTNETHOME_X86]" - La ruta de instalación para las instalaciones del SDK ARM64: "[DOTNETHOME_ARM64]" no puede ser la misma que para las instalaciones del SDK x86: "[DOTNETHOME_X86]" - La ruta de instalación para instalaciones del SDK ARM64: "[DOTNETHOME_ARM64]" no puede ser la misma que para las instalaciones del SDK x64: "[DOTNETHOME_X64]" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9f1b031e1419bbfd4f566b4e2402f975abe294fa Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 23 May 2025 14:10:36 -0700 Subject: [PATCH 16/47] Local upgradePolicies source to work around Arcade issue --- .../windows/bundles/sdk/upgradePolicies.wxs | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/Layout/pkg/windows/bundles/sdk/upgradePolicies.wxs diff --git a/src/Layout/pkg/windows/bundles/sdk/upgradePolicies.wxs b/src/Layout/pkg/windows/bundles/sdk/upgradePolicies.wxs new file mode 100644 index 000000000000..a214d99aad36 --- /dev/null +++ b/src/Layout/pkg/windows/bundles/sdk/upgradePolicies.wxs @@ -0,0 +1,37 @@ + + + + + + + + + + + From 0cf48df3da7eeaa35fe6573aa3d1dc93277b80ac Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 23 May 2025 16:57:25 -0700 Subject: [PATCH 17/47] Migrate bundle, 1st pass and cleanup --- src/Layout/pkg/dotnet-sdk.proj | 2 + src/Layout/pkg/windows/Directory.Build.props | 4 +- .../pkg/windows/Directory.Build.targets | 19 +++ .../pkg/windows/bundles/sdk/bundle.wixproj | 66 ++++----- src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 64 ++------- .../pkg/windows/msis/Directory.Build.targets | 21 +-- .../pkg/windows/msis/toolset/toolset.wixproj | 2 +- .../redist/targets/GenerateMSIs.targets | 131 ++++++++++-------- 8 files changed, 143 insertions(+), 166 deletions(-) diff --git a/src/Layout/pkg/dotnet-sdk.proj b/src/Layout/pkg/dotnet-sdk.proj index 0b3059d3a92c..875d36dd8bf6 100644 --- a/src/Layout/pkg/dotnet-sdk.proj +++ b/src/Layout/pkg/dotnet-sdk.proj @@ -44,6 +44,8 @@ Targets="Idle"/> + diff --git a/src/Layout/pkg/windows/Directory.Build.props b/src/Layout/pkg/windows/Directory.Build.props index 9feb93f51cf6..53d330ec774d 100644 --- a/src/Layout/pkg/windows/Directory.Build.props +++ b/src/Layout/pkg/windows/Directory.Build.props @@ -13,7 +13,9 @@ $(DefineConstants);SdkFeatureBandVersion=$(CliProductBandVersion)00 $(DefineConstants);ProductLanguage=1033 - $(DefineConstants);Manufacturer="Microsoft Corporation" + $(DefineConstants);Manufacturer=Microsoft Corporation + $(DefineConstants);MajorVersion=$(VersionMajor) + $(DefineConstants);MinorVersion=$(VersionMinor) $(DefineConstants);InstallerVersion=200 diff --git a/src/Layout/pkg/windows/Directory.Build.targets b/src/Layout/pkg/windows/Directory.Build.targets index fa596f3898d7..c57bc9b614f0 100644 --- a/src/Layout/pkg/windows/Directory.Build.targets +++ b/src/Layout/pkg/windows/Directory.Build.targets @@ -13,8 +13,27 @@ $(DefineConstants);NativeMachine_x86=332 $(DefineConstants);NativeMachine_x64=34404 $(DefineConstants);NativeMachine_arm64=43620 + + $(DefineConstants);Version=$(Version) + $(DefineConstants);ProductVersion=$(ProductVersion) + $(DefineConstants);BundleVersion=$(BundleVersion) + + + + + + + + + + + $(DefineConstants);UpgradeCode=$(UpgradeCode) + + + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj index 2639b7e6d7d7..fa42e2b9ab17 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj @@ -2,57 +2,45 @@ - $(ArtifactsShippingPackagesDir) Bundle - + C:\git\forks\sdk\src\Layout\pkg\windows - - - - - $(DefineConstants);WinFormsAndWpfVersion=$(WindowsDesktopVersion) - $(DefineConstants);DotNetRuntimeVersion=$(DotNetRuntimeVersion) - $(DefineConstants);AspNetCoreVersion=$(AspNetCoreVersion) - $(DefineConstants);CLISDKMsiSourcePath=$(CLISDKMsiSourcePath) - $(DefineConstants);SharedFXMsiSourcePath=$(SharedFXMsiSourcePath) - $(DefineConstants);HostFXRMsiSourcePath=$(HostFXRMsiSourcePath) - $(DefineConstants);SharedHostMsiSourcePath=$(SharedHostMsiSourcePath) - $(DefineConstants);ASPNETRuntimeMsiSourcePath=$(ASPNETRuntimeMsiSourcePath) - $(DefineConstants);WinFormsAndWpfMsiSourcePath=$(WinFormsAndWpfMsiSourcePath) - $(DefineConstants);NetCoreAppTargetingPackMsiSourcePath=$(NetCoreAppTargetingPackMsiSourcePath) - $(DefineConstants);NetCoreAppHostPackMsiSourcePath=$(NetCoreAppHostPackMsiSourcePath) - $(DefineConstants);AlternateNetCoreAppHostPackMsiSourcePath=$(AlternateNetCoreAppHostPackMsiSourcePath) - $(DefineConstants);Arm64NetCoreAppHostPackMsiSourcePath=$(Arm64NetCoreAppHostPackMsiSourcePath) - $(DefineConstants);NetStandardTargetingPackMsiSourcePath=$(NetStandardTargetingPackMsiSourcePath) - $(DefineConstants);AspNetTargetingPackMsiSourcePath=$(AspNetTargetingPackMsiSourcePath) - $(DefineConstants);WindowsDesktopTargetingPackMsiSourcePath=$(WindowsDesktopTargetingPackMsiSourcePath) - $(DefineConstants);FinalizerExeSourcePath=$(FinalizerExeSourcePath) - $(DefineConstants);TemplatesMsiSourcePath=$(TemplatesMsiSourcePath) - - $(DefineConstants);MinimumVSVersion=$(MinimumVSVersion) - - $(DefineConstants);BundleVersion=$(BundleVersion) - - - - - + + - - - - - + + + + + + + + $(DefineConstants);ProductName=$(SdkBrandName) ($(InstallerPlatform)) + $(DefineConstants);WinFormsAndWpfVersion=$(WindowsDesktopVersion) + $(DefineConstants);DotNetRuntimeVersion=$(DotNetRuntimeVersion) + $(DefineConstants);AspNetCoreVersion=$(AspNetCoreVersion) + $(DefineConstants);MinimumVSVersion=$(MinimumVSVersion) + + + $(DefineConstants);PlatformToken=$(InstallerPlatform.ToUpper()) + + + $(DefineConstants);FinalizerExeSourceFile=$(FinalizerExeSourceFile) + $(DefineConstants);TemplatesMsiSourceFile=$(TemplatesMsiSourceFile) + $(DefineConstants);SdkMsiSourceFile=$(SdkMsiSourceFile) + + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs index 4a94764bc19e..0cfe9478f3c7 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -30,10 +30,9 @@ - - + - + - - + + @@ -180,63 +179,30 @@ detect that there are no matching feature bands and then clean up workloads associated with the feature band. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + + + + diff --git a/src/Layout/pkg/windows/msis/Directory.Build.targets b/src/Layout/pkg/windows/msis/Directory.Build.targets index 362467d0d938..da5c0c4af843 100644 --- a/src/Layout/pkg/windows/msis/Directory.Build.targets +++ b/src/Layout/pkg/windows/msis/Directory.Build.targets @@ -2,28 +2,9 @@ - $(DefineConstants);Version=$(Version) - $(DefineConstants);ProductVersion=$(ProductVersion) - $(DefineConstants);BundleVersion=$(BundleVersion) - $(DefineConstants);DotnetSrc=$(DotnetSrc) - - - - - - - - - - - - - $(DefineConstants);UpgradeCode=$(UpgradeCode) - - + - $(DefineConstants);ProductName=$(BrandName) $(InstallerPlatform) + $(DefineConstants);ProductName=$(ToolsetBrandName) ($(InstallerPlatform)) $(DefineConstants);DependencyKeyName=Dotnet_CLI diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 72ff35c76fd1..83a902d2cc37 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -44,7 +44,6 @@ - Dotnet_CLI $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) - + @(_Manifests->' @@ -219,63 +228,73 @@ $(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs - - + + + - - + - - - + + <_DotNetMsiPackages Include="$(DownloadsFolder)$(DownloadedHostFxrInstallerFileName); + $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName); + $(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName); + $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)"/> + + + <_DotNetMsiPackages Include="$(DownloadsFolder)$(DownloadedAspNetCoreSharedFxInstallerFileName); + $(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)"/> + + + <_DotNetMsiPackages Include="$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName); + $(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)"/> + + + <_DotNetMsiPackages Condition="'$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64'" + Include="$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName); + $(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName); + $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)" /> - - - + + $(IntermediateOutputPath)dotnetPackageGroup.wxs + + + + + + + @(_DotNetMsiPackages->' + + ', ' + ') + + + +]]> + + + + + + Date: Tue, 27 May 2025 10:17:47 -0700 Subject: [PATCH 18/47] Bundle UI changes --- .../pkg/windows/Directory.Build.targets | 4 +- src/Layout/pkg/windows/bundle.thm | 95 ------------------- .../{ => bundles/sdk}/LCID/1028/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1029/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1031/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1033/bundle.wxl | 0 .../{ => bundles/sdk}/LCID/1036/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1040/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1041/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1042/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1045/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1046/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1049/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/1055/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/2052/bundle.wxl | 4 +- .../{ => bundles/sdk}/LCID/3082/bundle.wxl | 4 +- src/Layout/pkg/windows/bundles/sdk/bundle.thm | 92 ++++++++++++++++++ .../pkg/windows/bundles/sdk/bundle.wixproj | 5 + src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 14 +-- 19 files changed, 133 insertions(+), 129 deletions(-) delete mode 100644 src/Layout/pkg/windows/bundle.thm rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1028/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1029/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1031/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1033/bundle.wxl (100%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1036/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1040/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1041/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1042/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1045/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1046/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1049/bundle.wxl (99%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/1055/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/2052/bundle.wxl (98%) rename src/Layout/pkg/windows/{ => bundles/sdk}/LCID/3082/bundle.wxl (98%) create mode 100644 src/Layout/pkg/windows/bundles/sdk/bundle.thm diff --git a/src/Layout/pkg/windows/Directory.Build.targets b/src/Layout/pkg/windows/Directory.Build.targets index c57bc9b614f0..260db4df0a0d 100644 --- a/src/Layout/pkg/windows/Directory.Build.targets +++ b/src/Layout/pkg/windows/Directory.Build.targets @@ -5,7 +5,7 @@ $(DefineConstants);SdkBrandName=$(SdkBrandName) - + $(DefineConstants);SdkPlatformBrandName=$(SdkBrandName) ($(InstallerPlatform)) $(DefineConstants);Version=$(Version) + $(DefineConstants);ProductVersion=$(ProductVersion) $(DefineConstants);BundleVersion=$(BundleVersion) diff --git a/src/Layout/pkg/windows/bundle.thm b/src/Layout/pkg/windows/bundle.thm deleted file mode 100644 index f05dddf2acc1..000000000000 --- a/src/Layout/pkg/windows/bundle.thm +++ /dev/null @@ -1,95 +0,0 @@ - - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - #(loc.Title) - - - - - - #(loc.HelpHeader) - #(loc.HelpText) - - - - - - - - #(loc.WelcomeHeaderMessage) - #(loc.WelcomeDescription) - #(loc.VisualStudioWarning) - #(loc.LicenseAssent) - #(loc.PrivacyStatementLink) - #(loc.DotNetCLITelemetryLink) - #(loc.DotNetEulaLink) - - - - - - - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - - - - - - - - - - - - - - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - - - - - - #(loc.ModifyHeader) - - - - - - - - - #(loc.SuccessHeader) - #(loc.FirstTimeWelcomeMessage) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - - - - - - - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - - - diff --git a/src/Layout/pkg/windows/LCID/1028/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1028/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1028/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1028/bundle.wxl index 8c77449fc733..7c6493d8074e 100644 --- a/src/Layout/pkg/windows/LCID/1028/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1028/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1029/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1029/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1029/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1029/bundle.wxl index 0d4351e6b8e8..c37bbec44567 100644 --- a/src/Layout/pkg/windows/LCID/1029/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1029/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1031/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1031/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1031/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1031/bundle.wxl index 53146996be71..96c8627c467d 100644 --- a/src/Layout/pkg/windows/LCID/1031/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1031/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1033/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1033/bundle.wxl similarity index 100% rename from src/Layout/pkg/windows/LCID/1033/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1033/bundle.wxl diff --git a/src/Layout/pkg/windows/LCID/1036/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1036/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1036/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1036/bundle.wxl index 0c7d19aa8599..ff40f6624b15 100644 --- a/src/Layout/pkg/windows/LCID/1036/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1036/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1040/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1040/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1040/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1040/bundle.wxl index f6c5eae15a67..5828ca8e7a29 100644 --- a/src/Layout/pkg/windows/LCID/1040/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1040/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1041/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1041/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1041/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1041/bundle.wxl index 3463b40bfc3e..05701c3aedf2 100644 --- a/src/Layout/pkg/windows/LCID/1041/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1041/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1042/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1042/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1042/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1042/bundle.wxl index 0a6662ce4d49..867b719ce2df 100644 --- a/src/Layout/pkg/windows/LCID/1042/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1042/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1045/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1045/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1045/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1045/bundle.wxl index 3b08cca46e6a..a1dee9c83e0b 100644 --- a/src/Layout/pkg/windows/LCID/1045/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1045/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1046/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1046/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1046/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1046/bundle.wxl index cae9c5be5552..54d1a497104a 100644 --- a/src/Layout/pkg/windows/LCID/1046/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1046/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1049/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1049/bundle.wxl similarity index 99% rename from src/Layout/pkg/windows/LCID/1049/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1049/bundle.wxl index 0154dadf8608..98e37916ec8e 100644 --- a/src/Layout/pkg/windows/LCID/1049/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1049/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/1055/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1055/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/1055/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/1055/bundle.wxl index 9c94812a97e3..7588902ad420 100644 --- a/src/Layout/pkg/windows/LCID/1055/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1055/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/2052/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/2052/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/2052/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/2052/bundle.wxl index b51c2bd763b9..d920115efbb4 100644 --- a/src/Layout/pkg/windows/LCID/2052/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/2052/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/LCID/3082/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/3082/bundle.wxl similarity index 98% rename from src/Layout/pkg/windows/LCID/3082/bundle.wxl rename to src/Layout/pkg/windows/bundles/sdk/LCID/3082/bundle.wxl index f8c382e9056f..087da6e0ac9c 100644 --- a/src/Layout/pkg/windows/LCID/3082/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/3082/bundle.wxl @@ -1,4 +1,4 @@ - + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.thm b/src/Layout/pkg/windows/bundles/sdk/bundle.thm new file mode 100644 index 000000000000..1fbac2a52801 --- /dev/null +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.thm @@ -0,0 +1,92 @@ + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FirstTimeWelcomeMessage) + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj index fa42e2b9ab17..82a754218767 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj @@ -6,6 +6,11 @@ Bundle C:\git\forks\sdk\src\Layout\pkg\windows + + + $(DefaultItemExcludes);LCID\**\* diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs index 0cfe9478f3c7..ad3622e89b07 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -11,19 +11,19 @@ - + ThemeFile="bundle.thm" /> - + - + @@ -148,7 +148,7 @@ - + @@ -162,7 +162,7 @@ - GenerateSdkMsi; @@ -44,7 +44,7 @@ - $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) @@ -214,10 +214,10 @@ $(DownloadedHostFxrInstallerFile); $(DownloadedSharedHostInstallerFile); $(SdkGenerateBundlePowershellScript)" - Outputs="$(CombinedFrameworkSdkHostMSIInstallerFile)"> + Outputs="$(SdkBundleFile)"> - + @@ -287,6 +287,8 @@ + diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 6834a5ee675a..8770c5367ece 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -102,6 +102,8 @@ @@ -117,7 +119,10 @@ Outputs="$(SdkPlaceholderMSIInstallerFile)"> + Properties="InstallerPath=$(SdkPlaceholderMSIInstallerFile); + OutputPath=$([System.IO.Path]::GetDirectoryName($(SdkPlaceholderMSIInstallerFile))); + OutputName=$([System.IO.Path]::GetFileNameWithoutExtension($(SdkPlaceholderMSIInstallerFile))); + ProductVersion=$(ProductVersion);BundleVersion=$(BundleVersion)"/> @@ -212,8 +219,7 @@ Inputs="$(SdkMSIInstallerFile); $(DownloadedSharedFrameworkInstallerFile); $(DownloadedHostFxrInstallerFile); - $(DownloadedSharedHostInstallerFile); - $(SdkGenerateBundlePowershellScript)" + $(DownloadedSharedHostInstallerFile)" Outputs="$(SdkBundleFile)"> @@ -287,8 +293,9 @@ 5.0.2-dotnet.2690783 - 2.0.1-servicing-26011-01 diff --git a/src/Layout/pkg/windows/generatebundle.ps1 b/src/Layout/pkg/windows/generatebundle.ps1 deleted file mode 100644 index 746bab98a19f..000000000000 --- a/src/Layout/pkg/windows/generatebundle.ps1 +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. - -param( - [Parameter(Mandatory=$true)][string]$UpgradePoliciesWxsFile, - [Parameter(Mandatory=$true)][string]$WorkloadManifestWxsFile, - [Parameter(Mandatory=$true)][string]$CLISDKMSIFile, - [Parameter(Mandatory=$true)][string]$ASPNETRuntimeMSIFile, - [Parameter(Mandatory=$true)][string]$SharedFxMSIFile, - [Parameter(Mandatory=$true)][string]$HostFxrMSIFile, - [Parameter(Mandatory=$true)][string]$SharedHostMSIFile, - [Parameter(Mandatory=$true)][string]$WinFormsAndWpfMSIFile, - [Parameter(Mandatory=$true)][string]$NetCoreAppTargetingPackMSIFile, - [Parameter(Mandatory=$true)][string]$NetStandardTargetingPackMSIFile, - [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile, - [Parameter(Mandatory=$true)][string]$AlternateNetCoreAppHostPackMSIFile, - [Parameter(Mandatory=$true)][string]$Arm64NetCoreAppHostPackMSIFile, - [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile, - [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile, - [Parameter(Mandatory=$true)][string]$FinalizerExe, - [Parameter(Mandatory=$true)][string]$TemplatesMSIFile, - [Parameter(Mandatory=$true)][string]$DotnetBundleOutput, - [Parameter(Mandatory=$true)][string]$WixRoot, - [Parameter(Mandatory=$true)][string]$ProductMoniker, - [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, - [Parameter(Mandatory=$true)][string]$SDKBundleVersion, - [Parameter(Mandatory=$true)][string]$MinimumVSVersion, - [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, - [Parameter(Mandatory=$true)][string]$VersionMajor, - [Parameter(Mandatory=$true)][string]$VersionMinor, - [Parameter(Mandatory=$true)][string]$WindowsDesktopVersion, - [Parameter(Mandatory=$true)][string]$UpgradeCode, - [Parameter(Mandatory=$true)][string]$DependencyKeyName, - [Parameter(Mandatory=$true)][string]$Architecture, - [Parameter(Mandatory=$true)][string]$DotNetRuntimeVersion, - [Parameter(Mandatory=$true)][string]$AspNetCoreVersion, - [Parameter(Mandatory=$true)][string]$SDKProductBandVersion -) - -function RunCandleForBundle -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running candle for bundle.." - - $candleOutput = .\candle.exe -nologo ` - -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` - -dProductMoniker="$ProductMoniker" ` - -dBuildVersion="$DotnetMSIVersion" ` - -dSDKBundleVersion="$SDKBundleVersion" ` - -dMinimumVSVersion="$MinimumVSVersion" ` - -dSDKProductBandVersion="$SDKProductBandVersion" ` - -dNugetVersion="$DotnetCLINugetVersion" ` - -dVersionMajor="$VersionMajor" ` - -dMajorVersion="$VersionMajor" ` - -dVersionMinor="$VersionMinor" ` - -dMinorVersion="$VersionMinor" ` - -dCLISDKMsiSourcePath="$CLISDKMSIFile" ` - -dDependencyKeyName="$DependencyKeyName" ` - -dUpgradeCode="$UpgradeCode" ` - -dSharedFXMsiSourcePath="$SharedFxMSIFile" ` - -dHostFXRMsiSourcePath="$HostFxrMSIFile" ` - -dSharedHostMsiSourcePath="$SharedHostMSIFile" ` - -dASPNETRuntimeMsiSourcePath="$ASPNETRuntimeMSIFile" ` - -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" ` - -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" ` - -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" ` - -dAlternateNetCoreAppHostPackMsiSourcePath="$AlternateNetCoreAppHostPackMSIFile" ` - -dArm64NetCoreAppHostPackMsiSourcePath="$Arm64NetCoreAppHostPackMSIFile" ` - -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" ` - -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" ` - -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" ` - -dFinalizerExeSourcePath="$FinalizerExe" ` - -dTemplatesMsiSourcePath="$TemplatesMSIFile" ` - -dManifestsMsiSourcePath="$ManifestsMSIFile" ` - -dWinFormsAndWpfVersion="$WindowsDesktopVersion" ` - -dAdditionalSharedFXMsiSourcePath="$AdditionalSharedFxMSIFile" ` - -dAdditionalHostFXRMsiSourcePath="$AdditionalHostFxrMSIFile" ` - -dAdditionalSharedHostMsiSourcePath="$AdditionalSharedHostMSIFile" ` - -dDotNetRuntimeVersion="$DotNetRuntimeVersion" ` - -dAspNetCoreVersion="$AspNetCoreVersion" ` - -dLocalizedContentDirs="$LocalizedContentDirs" ` - -arch "$Architecture" ` - -ext WixBalExtension.dll ` - -ext WixUtilExtension.dll ` - -ext WixTagExtension.dll ` - "$AuthWsxRoot\bundle.wxs" "$WorkloadManifestWxsFile" "$UpgradePoliciesWxsFile" - - Write-Information "Candle output: $candleOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Candle failed with exit code $LastExitCode." - } - - popd - return $result -} - -function RunLightForBundle -{ - $result = $true - pushd "$WixRoot" - - $WorkloadManifestWixobjFile = [System.IO.Path]::GetFileNameWithoutExtension($WorkloadManifestWxsFile) + ".wixobj" - $UpgradePoliciesWixobjFile = [System.IO.Path]::GetFileNameWithoutExtension($UpgradePoliciesWxsFile) + ".wixobj" - - Write-Information "Running light for bundle.." - - $lightOutput = .\light.exe -nologo ` - -cultures:en-us ` - bundle.wixobj ` - $WorkloadManifestWixobjFile ` - $UpgradePoliciesWixobjFile ` - -ext WixBalExtension.dll ` - -ext WixUtilExtension.dll ` - -ext WixTagExtension.dll ` - -b "$AuthWsxRoot" ` - -out $DotnetBundleOutput - - Write-Information "Light output: $lightOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Light failed with exit code $LastExitCode." - } - - popd - return $result -} - - -if(!(Test-Path $CLISDKMSIFile)) -{ - throw "$CLISDKMSIFile not found" -} - -if([string]::IsNullOrEmpty($WixRoot)) -{ - Exit -1 -} - -Write-Information "Creating dotnet Bundle at $DotnetBundleOutput" - -$AuthWsxRoot = $PSScriptRoot -$LocalizedContentDirs = (Get-ChildItem "$AuthWsxRoot\LCID\*\bundle.wxl").Directory.Name -join ';' - -if(-Not (RunCandleForBundle)) -{ - Exit -1 -} - -if(-Not (RunLightForBundle)) -{ - Exit -1 -} - -if(!(Test-Path $DotnetBundleOutput)) -{ - throw "Unable to create the dotnet bundle." - Exit -1 -} - -Write-Information "Successfully created dotnet bundle - $DotnetBundleOutput" - -exit $LastExitCode diff --git a/src/Layout/pkg/windows/generatemsi.ps1 b/src/Layout/pkg/windows/generatemsi.ps1 deleted file mode 100644 index 126f4280473d..000000000000 --- a/src/Layout/pkg/windows/generatemsi.ps1 +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. - -param( - [Parameter(Mandatory=$true)][string]$inputDir, - [Parameter(Mandatory=$true)][string]$DotnetMSIOutput, - [Parameter(Mandatory=$true)][string]$WixRoot, - [Parameter(Mandatory=$true)][string]$ProductMoniker, - [Parameter(Mandatory=$true)][string]$SdkFeatureBandVersion, - [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, - [Parameter(Mandatory=$true)][string]$SDKBundleVersion, - [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, - [Parameter(Mandatory=$true)][string]$VersionMajor, - [Parameter(Mandatory=$true)][string]$VersionMinor, - [Parameter(Mandatory=$true)][string]$UpgradeCode, - [Parameter(Mandatory=$true)][string]$DependencyKeyName, - [Parameter(Mandatory=$true)][string]$Architecture, - [Parameter(Mandatory=$true)][string]$StableFileIdForApphostTransform -) - -$InstallFileswsx = ".\install-files.wxs" -$InstallFilesWixobj = "install-files.wixobj" - -function RunHeat -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running heat.." - - # -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as exception list 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 transform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time. - - $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -ag ` - -var var.DotnetSrc ` - -cg InstallFiles ` - -srd ` - -dr DOTNETHOME ` - -t $StableFileIdForApphostTransform ` - -out install-files.wxs - - Write-Information "Heat output: $heatOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Heat failed with exit code $LastExitCode." - } - - popd - Write-Information "RunHeat result: $result" - return $result -} - -function RunCandle -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running candle.." - - $candleOutput = .\candle.exe -nologo ` - -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` - -dProductMoniker="$ProductMoniker" ` - -dBuildVersion="$DotnetMSIVersion" ` - -dSdkFeatureBandVersion="$SdkFeatureBandVersion" ` - -dSDKBundleVersion="$SDKBundleVersion" ` - -dNugetVersion="$DotnetCLINugetVersion" ` - -dVersionMajor="$VersionMajor" ` - -dVersionMinor="$VersionMinor" ` - -dUpgradeCode="$UpgradeCode" ` - -dDependencyKeyName="$DependencyKeyName" ` - -arch "$Architecture" ` - -ext WixDependencyExtension.dll ` - "$PSScriptRoot\dotnet.wxs" ` - "$PSScriptRoot\dotnethome_x64.wxs" ` - "$PSScriptRoot\provider.wxs" ` - "$PSScriptRoot\registrykeys.wxs" ` - $InstallFileswsx - - Write-Information "Candle output: $candleOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Candle failed with exit code $LastExitCode." - } - - popd - return $result -} - -function RunLight -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running light.." - $CabCache = Join-Path $WixRoot "cabcache" - - $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension ` - -cultures:en-us ` - dotnet.wixobj ` - dotnethome_x64.wixobj ` - provider.wixobj ` - registrykeys.wixobj ` - $InstallFilesWixobj ` - -b "$inputDir" ` - -b "$PSScriptRoot" ` - -reusecab ` - -cc "$CabCache" ` - -out $DotnetMSIOutput - - Write-Information "Light output: $lightOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Light failed with exit code $LastExitCode." - } - - popd - return $result -} - -if(!(Test-Path $inputDir)) -{ - throw "$inputDir not found" -} - -Write-Information "Creating dotnet MSI at $DotnetMSIOutput" - -if([string]::IsNullOrEmpty($WixRoot)) -{ - Exit -1 -} - -if(-Not (RunHeat)) -{ - Write-Information "Heat failed" - Exit -1 -} - -if(-Not (RunCandle)) -{ - Write-Information "Candle failed" - Exit -1 -} - -if(-Not (RunLight)) -{ - Write-Information "Light failed" - Exit -1 -} - -if(!(Test-Path $DotnetMSIOutput)) -{ - throw "Unable to create the dotnet msi." - Exit -1 -} - -Write-Information "Successfully created dotnet MSI - $DotnetMSIOutput" - -exit $LastExitCode diff --git a/src/Layout/pkg/windows/generatetemplatesmsi.ps1 b/src/Layout/pkg/windows/generatetemplatesmsi.ps1 deleted file mode 100644 index 2858c591305c..000000000000 --- a/src/Layout/pkg/windows/generatetemplatesmsi.ps1 +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. - -param( - [Parameter(Mandatory=$true)][string]$inputDir, - [Parameter(Mandatory=$true)][string]$DotnetMSIOutput, - [Parameter(Mandatory=$true)][string]$WixRoot, - [Parameter(Mandatory=$true)][string]$ProductMoniker, - [Parameter(Mandatory=$true)][string]$DotnetMSIVersion, - [Parameter(Mandatory=$true)][string]$SDKBundleVersion, - [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion, - [Parameter(Mandatory=$true)][string]$VersionMajor, - [Parameter(Mandatory=$true)][string]$VersionMinor, - [Parameter(Mandatory=$true)][string]$UpgradeCode, - [Parameter(Mandatory=$true)][string]$DependencyKeyName, - [Parameter(Mandatory=$true)][string]$Architecture -) - -$InstallFileswsx = ".\template-install-files.wxs" -$InstallFilesWixobj = "template-install-files.wixobj" - -function RunHeat -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running heat.." - - $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` - -sreg -ag ` - -var var.DotnetSrc ` - -cg InstallFiles ` - -srd ` - -dr DOTNETHOME ` - -out template-install-files.wxs - - Write-Information "Heat output: $heatOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Heat failed with exit code $LastExitCode." - } - - popd - Write-Information "RunHeat result: $result" - return $result -} - -function RunCandle -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running candle.." - - $candleOutput = .\candle.exe -nologo ` - -dDotnetSrc="$inputDir" ` - -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" ` - -dProductMoniker="$ProductMoniker" ` - -dBuildVersion="$DotnetMSIVersion" ` - -dSDKBundleVersion="$SDKBundleVersion" ` - -dNugetVersion="$DotnetCLINugetVersion" ` - -dVersionMajor="$VersionMajor" ` - -dVersionMinor="$VersionMinor" ` - -dUpgradeCode="$UpgradeCode" ` - -dDependencyKeyName="$DependencyKeyName" ` - -arch "$Architecture" ` - -ext WixDependencyExtension.dll ` - "$PSScriptRoot\dotnethome_x64.wxs" ` - "$PSScriptRoot\templates.wxs" ` - "$PSScriptRoot\provider.wxs" ` - $InstallFileswsx - - Write-Information "Candle output: $candleOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Candle failed with exit code $LastExitCode." - } - - popd - return $result -} - -function RunLight -{ - $result = $true - pushd "$WixRoot" - - Write-Information "Running light.." - $CabCache = Join-Path $WixRoot "cabcache" - - $lightOutput = .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension ` - -cultures:en-us ` - dotnethome_x64.wixobj ` - templates.wixobj ` - provider.wixobj ` - $InstallFilesWixobj ` - -b "$inputDir" ` - -b "$PSScriptRoot" ` - -reusecab ` - -cc "$CabCache" ` - -out $DotnetMSIOutput - - Write-Information "Light output: $lightOutput" - - if($LastExitCode -ne 0) - { - $result = $false - Write-Information "Light failed with exit code $LastExitCode." - } - - popd - return $result -} - -if(!(Test-Path $inputDir)) -{ - throw "$inputDir not found" -} - -Write-Information "Creating templates MSI at $DotnetMSIOutput" - -if([string]::IsNullOrEmpty($WixRoot)) -{ - Exit -1 -} - -if(-Not (RunHeat)) -{ - Write-Information "Heat failed" - Exit -1 -} - -if(-Not (RunCandle)) -{ - Write-Information "Candle failed" - Exit -1 -} - -if(-Not (RunLight)) -{ - Write-Information "Light failed" - Exit -1 -} - -if(!(Test-Path $DotnetMSIOutput)) -{ - throw "Unable to create the templates MSI." - Exit -1 -} - -Write-Information "Successfully created templates MSI - $DotnetMSIOutput" - -exit $LastExitCode From 83e34dbe06ad72361a5977b3c8ac2bf1a9e0dfc3 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 27 May 2025 22:28:19 -0700 Subject: [PATCH 22/47] Fix local builds when alternating -pack option --- build.cmd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.cmd b/build.cmd index f170280060e8..aa77090a63b0 100644 --- a/build.cmd +++ b/build.cmd @@ -1,11 +1,15 @@ @echo off +setlocal + echo %* | findstr /C:"-pack" >nul if %errorlevel%==0 ( - set SkipBuildingInstallers= + set skipFlags="/p:SkipUsingCrossgen=false /p:SkipBuildingInstallers=false" ) else ( REM skip crossgen for inner-loop builds to save a ton of time set skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true" ) powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %skipFlags% %*" + +endlocal exit /b %ErrorLevel% From d8116cd040343347f7abd4472600ced7733aca19 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 27 May 2025 22:28:56 -0700 Subject: [PATCH 23/47] Clarify unconditional include --- src/Layout/pkg/windows/bundles/sdk/bundle.wixproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj index 76f2912f174b..841b84e4b206 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj @@ -19,7 +19,8 @@ + to chain external MSIs from runtime, ASP.NET, and Windows Desktop into the bundle. There is no conditional + check. If the file doesn't exist, there is likely a problem with the build. --> From 05bc7fc9f7164b2e881b62e519fa65d04de2f40f Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 28 May 2025 00:04:56 -0700 Subject: [PATCH 24/47] Add workload manifests to bundle --- .../pkg/windows/bundles/sdk/bundle.wixproj | 5 +++ src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 4 +- src/Layout/pkg/windows/manifests.wxs | 39 ------------------- .../redist/targets/GenerateMSIs.targets | 1 + 4 files changed, 9 insertions(+), 40 deletions(-) delete mode 100644 src/Layout/pkg/windows/manifests.wxs diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj index 841b84e4b206..35f465374b50 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj @@ -22,6 +22,9 @@ to chain external MSIs from runtime, ASP.NET, and Windows Desktop into the bundle. There is no conditional check. If the file doesn't exist, there is likely a problem with the build. --> + + + @@ -47,6 +50,8 @@ $(DefineConstants);FinalizerExeSourceFile=$(FinalizerExeSourceFile) $(DefineConstants);TemplatesMsiSourceFile=$(TemplatesMsiSourceFile) $(DefineConstants);SdkMsiSourceFile=$(SdkMsiSourceFile) + + $(DefineConstants);IncludeWorkloadManifests=true diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs index ad3622e89b07..7a6e8fd0b184 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -202,7 +202,9 @@ - + + + diff --git a/src/Layout/pkg/windows/manifests.wxs b/src/Layout/pkg/windows/manifests.wxs deleted file mode 100644 index 72155518064a..000000000000 --- a/src/Layout/pkg/windows/manifests.wxs +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Installed OR ALLOWMSIINSTALL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 1c37dde8ebc0..7639c95936c0 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -301,6 +301,7 @@ WinFormsAndWpfVersion=$(MicrosoftWindowsDesktopAppRuntimePackageVersion); MinimumVSVersion=$(MinimumVSVersion); DotNetPackageGroupWxsPath=$(DotNetPackageGroupWxsPath); + WorkloadManifestsWxsPath=$(WorkloadManifestsWxsPath); FinalizerExeSourceFile=$(FinalizerExe); TemplatesMsiSourceFile=$(LatestTemplateMsiInstallerFile); SdkMsiSourceFile=$(SdkMSIInstallerFile)" /> From 7f30869e8a6634de2690a2cde93c4dad10373731 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 12 Jun 2025 22:13:03 -0700 Subject: [PATCH 25/47] Update WiX package version --- eng/Versions.props | 3 +++ global.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 84d6d522a175..b3b433ef768a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -313,6 +313,9 @@ 10.0.0-beta.25265.101 10.0.0-beta.25265.101 + + 5.0.2-dotnet.2729052 + true diff --git a/global.json b/global.json index f7d2b82ee1b6..0f92e7119207 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25265.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2690783" + "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2729052" } } From 81a0bf6bf606aa8ba3965e5442f8829fa65f61b8 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 12 Jun 2025 22:13:41 -0700 Subject: [PATCH 26/47] Add theme files to editorconfig --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 051a0c71d565..bc17bbe69267 100644 --- a/.editorconfig +++ b/.editorconfig @@ -476,7 +476,7 @@ indent_brace_style = Allman indent_size = 2 # WiX files -[*.{wixproj,wxs,wxi,wxl}] +[*.{wixproj,wxs,wxi,wxl,thm}] indent_size = 2 [*.{csproj,vbproj,proj,nativeproj,locproj}] From 89bcde4bfe5dcef5eed31935f43002440b73eaba Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 12 Jun 2025 22:18:04 -0700 Subject: [PATCH 27/47] UI changes and authoring updates --- .../windows/bundles/sdk/DotNetLogo_124x.png | Bin 0 -> 1186 bytes .../windows/bundles/sdk/LCID/1033/bundle.wxl | 25 +++++- src/Layout/pkg/windows/bundles/sdk/bundle.thm | 81 +++++++++++++----- src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 8 +- src/Layout/pkg/windows/bundles/sdk/dotnet.ico | Bin 0 -> 45150 bytes src/Layout/pkg/windows/msi.ico | Bin 2238 -> 0 bytes 6 files changed, 85 insertions(+), 29 deletions(-) create mode 100644 src/Layout/pkg/windows/bundles/sdk/DotNetLogo_124x.png create mode 100644 src/Layout/pkg/windows/bundles/sdk/dotnet.ico delete mode 100644 src/Layout/pkg/windows/msi.ico diff --git a/src/Layout/pkg/windows/bundles/sdk/DotNetLogo_124x.png b/src/Layout/pkg/windows/bundles/sdk/DotNetLogo_124x.png new file mode 100644 index 0000000000000000000000000000000000000000..ab5c7288b32b4245693b8e5e2b8280253c205606 GIT binary patch literal 1186 zcmeAS@N?(olHy`uVBq!ia0vp^H6YBv1|(O@UD*euI14-?iy0WWg+Z8+Vb&Z8pde#$ zkh>GZx^prwfgF}}M_)$E)e-c@NTysws$B+ufw|9L#L=t6=f2{wemZ!aU!4&R= zrGj5p%`^TGGG)3=j_1Y=2Qx3SAX$6Lz@tFPp zn9l8UZ(f~yv)TCd`|ph_*f_tuw)<>z-e&gmUD1z@I~lBMSzurx!Nz|0L4t$~Pjho( zfdLO++rfjh6+FYL+5GKXRA$z`H#_!yeCZH2?c0&n^Zr>K-@0>U{yKT-&Uw?>_g+8R zf90Nh?Wn z_ue|WXVaa-{z3A)r_5_O+mr9T)As!@os&oMHLpGS5cVrvu{qiBcx~MK^OM&L2~D}6 zb6W1(y$Q#jWhriE;@-DyR#D7r>0O#BVF?HA_1-R4o!OgRZ0xjA zXZCC_t80h8-J0X2Eh4RN6suaJyU;KH-#D%fXIac1C%%8C2Ti+8Mj@W{w{*%?7y`3RkR$#o`BWaeQc3Q)-0=5K zvUlQUKYt~?OZAEGi~Ai9w!OV|B}UhO%|hF!A1jPEU0~n7J+}De1;3-KJGM)`ys+-| z)0|x?-37~-bM7KiPzmRqWyuRQncSL5q{o8yf4>d(!;J=O2{XWN=TN5dtns;!F~ z9Gst5&ssXMsQpmNqkuh^wpOlgzq>7n=lIbY=iRmUq+jn>@c`wbeSJkQYy;YF+^Nmy uQorBt{#ewm)A8{C$E - + @@ -19,11 +19,17 @@ + + + + + + @@ -41,7 +47,20 @@ - + @@ -61,4 +80,4 @@ - \ No newline at end of file + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.thm b/src/Layout/pkg/windows/bundles/sdk/bundle.thm index 1fbac2a52801..68f84508bd27 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.thm +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.thm @@ -1,21 +1,30 @@ - Segoe UI + + Segoe UI Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - + Segoe UI + Segoe UI + Segoe UI + + + + + + - #(loc.FailureHyperlinkLogText) - - - - + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs index 7a6e8fd0b184..a6e7c0355352 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -23,8 +23,8 @@ - - + + @@ -190,12 +190,12 @@ - + - + diff --git a/src/Layout/pkg/windows/bundles/sdk/dotnet.ico b/src/Layout/pkg/windows/bundles/sdk/dotnet.ico new file mode 100644 index 0000000000000000000000000000000000000000..16c9148e8609531b6bde8509f503ec29010985c6 GIT binary patch literal 45150 zcmeHQ3s}`f7M}~4kSme6E181jmtgLS=KF=$bTvzb(liT`G!a&jLLP|%x5p-CXr(L~ zA-bk$3R);CE)SoqXoZFg0*Yn`B3dAVf_Qh%#gpSS_kmmVCE0wi%hvy0TA8qT?r?$T38A9&7NQi?&ZQY|YA)DVJq+7SU{Z@on zE+@psrnVkxK}bR*Assu`*7rU_h|?xQtSBGo^DrZ%VjCgLTqccc|7hn&sp|IQUl{WW z^g=eL{KVB~i#s9aoyLzDHRZjpuAUv~@l|Elw9@Ep4(2tA$xnU$-{li}_I+XF#S{KT zn`d1-V*B$KfjzUoo@dgdYX_4bP8~U%am2!JX`si>t$R8wS`qcKNrdIVHbcf93=8!+ zFvZ-@VSMq?o9p7&?JvCMv?I&Gc0^Uzo9B`X7bX9=u-ZQ$pxtMe?I$`Cj}=7ON1<{v zAqULJ2NuN4nwa+>Ruf3KHGk}=IQVAptzUlrW~qhJ)M>`_>}hGiOH2$Lt5xX3-;tD2 zZc=qRrdPZ0JxOI34*6U!-q<_tQrqP_Catb?TIaq0?6D)KS5)L4yAu0Tai`d_Ymt@F zH>aP@%H9*ZWO$G=0`u_2u7^`p&Sl?L05=372KW z_rM!=T|5FUT$T+{^>6srdD=f5HzjWvm*8cHUN!`eZ zge5`o+k;Qu$@Mt#NJcx83=*#>Z>R7`t;$Il7kaXj+4`qmO#^$%Zp`uxBmK9OSsd6i z)89ck&0P86)N8w*4YT<1L|Cx;#;mxg$@U75*G~7nuxZfd;|E614jS}is++ayEVy1Y~K}Y{XynLQk7a5?G>JT{0*-?ks)(V%qP1$sGQ!V7H^8Nh;|w|*>l*I=SkI= zdGlgU4QjvAdBv`z2=WbOfpz)f?1L_y6h-~0NgFIj`wjc8z^eaNtt9TBtbDCXos5nv`5=Iwx<;b;;DYuS{ zeB|dlL>7>ccVHhDN!%UQG{Pl(1oN+nscBPOU91J@&az`Ivw^ zimce;HGN8sxR{+kzv0{TT+35YepyaA?|dH}*O{vLAt}4OL*lsR%wjt&|4p7-WncEOijRB@DH%804w-rG5Y?gJ$UJ}KUvoG`<4g3ZtY z9Tgs4S62t*|3`hod`b29llI-r4Y54@OlnNu9uo$Y`%!YIn)naT=s$Px?6>Hd0vZ4JNn_%kcl&^zo)9I?Dw^RuLneuUL_jwJ znY~_Cw}z|@h1TFZ_$d7sBOvEruK(5$1LEi>q&4_1_dmJ+%lH=~AlJV<{WpE&&GXWXp|b}3R6q>pN;$S)Lgeg30QJO$qkO?a$DUq!Sb{nr)4E!BS!#?86S z*z@0It)=wK`4=P5Qs!5m zA7bz2`qzhBOX-*MFGirH%&$H_#NNyGuMfAD(l6&A8swBU(UZa z1Z2BJpmiaj?YYwVS{T|&ssZAm$3fdX!|z1UpSB`yG|S(Kpdd8!^st?S@Ni1|8}}W1 ziGSnb&BwRIU*gZlL|y7Keq{XAC0=-589y?9_?W0my*0%Tysyl^vs@Rf8iLnQ{K0Na z=mXY8cCqj1V?Xlqlz*oa`*EBuYN-AA%>=wdteKg1g* z)QNTWU31a9+{lOHbWvm34|ZU}Z=$e{`mxSZ(fi=okK=SvW7rQ^W8A!ozp?omT81|z+j2pBE+qKoPou~XbzMrid z%YObC1UfLGKCJWm|HXx2_kB|);uEcNkZTP4wS5nRcJTINJJQ0?by(C&`ME`z^|2pi zG$obx%j=i=#Gi~G89y?9?yZ9QV9^v~?^#}3Y6=_bqf^>1_a7NQ_f|oDuxN_0_biwD zPjkSZpAT7Y90Y1FJPE0#FRN2Qt!Z7U`tCTS`C8;`;rLJwj!VAVAH-2tu8#dU4(mu! zt~N?Yt)D#A#;>m(?Lg{t*Is_yz2AvKyx~19$SyQL?C)tc#Xe$)P719i8N%BXJkq}U zol8pmBz{e?Zc(RRoLK|&j$%s+dDXEd15ZmhGEf7S(k zyeu5gQeE}|AKC_GkxYC>3w24}5n5c@5ER2oK29 zhac+X?ZbCEz&5}E67m|N+Yp}m*oW_G!2FBsL%X3*G>;8wAFc`1E3yytvk9?93Vk>p z+eEak^9$<%VjmJd9~RlCPdAL$#{>4()jnJc?0(Ul>;u2~cP2#k@%sy`Cw9L7JL?;ijpaYcVZZ(1 z^|SGpGsgY*|8WE3un+G$vo;!vKgeOn^ZKD5leTY+_}BnD4AIZpYwWVrUyFdTaWzz) z#9!hM2pAeK#^#gphX^zsh2w^b-Xds<47%Yyg$>Q{+l5VipTgMjjq<2#nuK*@Qz>8f z{ced*-SL6732}-P%J};U*skfMfAIX9}BofjVkz6EEQlv4J zB^M?|im;-Df}kgb;z{R=Y-r9>o|t?)XN*mFSu=OH^P4~4&7A>}2A_=$VYTGvmdF}c zpJE%>=U4;3t!90)V}oNdTOAR8q|>QS9J!R?a45q+hcfx&CuugD(rUG2Wo1QHS65|i zZB5qK*JX2aQ?|CYWN&Xzc6WDWXJ<#Yx3{J9mCD<(5 zbo6%=awIuXvGyDs3=RedgM-14U~n)v7#s`^2E&BG!QfzUFgO?t9R>%3gTcYzU~q~L z4hM%z9I7?}Je<=fU=hQgZW$I&b5A2rQ4foa0nu~eVezooSm5w*csM*99u6B793BP_ zgNGrF&coqh@GwMrDMuS2ed-T;8*iEpRP+u+*{JCqUFem^@|41<+Y@a#PtYPD00mrvwJ+27xn zgM$M(K0cPy(^I*)xR742C)d~4a(jC#cXxME6ouU1-^+A5mB~LUKXki%k2_2^eFxHs zdbUe-(^e&4UX*CJ+snS^T~UP4{jJ|yiYNy

U(Dtk#dt7fO`KgS^c1Vw@4s?e~t( z&ldvf{Hn}HV*)}q$qx_D1!nnGF=o-=2$eMtc*-vZ7LezNTs`Y`|Ed@ah)AGiSuX0v zUzNqTX(fF!A>zOJ4-e<({eGU0E1fLnGe*tHe?UDuIXN6xnNB7P`AIJcNb>jH!*L3j z%XvA=uZsTJ*-5v1NP#MAGpj5!+FGxws<3qQab@Y*n5jPHqvxX$<XWGLUYoqG?=Aj^?4tXrV- zXJ)>h^;tmDA8&4W?R%G(m(2yeuAKD0-aQ2@=`}~L&3E&FW!-Me@}B};*U6s+ysqEO z13se913so(0Jr(NKA%qWRee6&bTOar{F#kjtUTApOo!8k4!;x~Zpha|G5d@&_QlN7 gwb>ia4NP8Ir~YrEG3ERLd&Kw^)6nVv*avy@FS@;$H2?qr From 2a195d0c4d682901962ab464dd220e4e062a02a5 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 12 Jun 2025 22:19:09 -0700 Subject: [PATCH 28/47] Delete old copy of .NET bundle --- src/Layout/pkg/windows/bundle.wxs | 257 ------------------------------ 1 file changed, 257 deletions(-) delete mode 100644 src/Layout/pkg/windows/bundle.wxs diff --git a/src/Layout/pkg/windows/bundle.wxs b/src/Layout/pkg/windows/bundle.wxs deleted file mode 100644 index fb013a877567..000000000000 --- a/src/Layout/pkg/windows/bundle.wxs +++ /dev/null @@ -1,257 +0,0 @@ - - - - - - - WixBundleInstalled OR (NOT DOTNETHOME_X64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE - - - - WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X86) OR DOTNETHOMESIMILARITYCHECKOVERRIDE - - - - - WixBundleInstalled OR (NOT DOTNETHOME_ARM64 ~= DOTNETHOME_X64) OR (NOT NativeMachine="$(var.NativeMachine_arm64)") OR DOTNETHOMESIMILARITYCHECKOVERRIDE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - eula.rtf - - - - - From be170d30acf6f07b76d19e30a4cef5089d31d168 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 12 Jun 2025 22:50:02 -0700 Subject: [PATCH 29/47] Use dotnet.ico for MSIs --- src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 2 +- src/Layout/pkg/windows/{bundles/sdk => }/dotnet.ico | Bin src/Layout/pkg/windows/msis/placeholder/product.wxs | 2 +- src/Layout/pkg/windows/msis/templates/product.wxs | 2 +- src/Layout/pkg/windows/msis/toolset/product.wxs | 2 ++ 5 files changed, 5 insertions(+), 3 deletions(-) rename src/Layout/pkg/windows/{bundles/sdk => }/dotnet.ico (100%) diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs index a6e7c0355352..3ab09061a7c2 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -24,7 +24,7 @@ - + diff --git a/src/Layout/pkg/windows/bundles/sdk/dotnet.ico b/src/Layout/pkg/windows/dotnet.ico similarity index 100% rename from src/Layout/pkg/windows/bundles/sdk/dotnet.ico rename to src/Layout/pkg/windows/dotnet.ico diff --git a/src/Layout/pkg/windows/msis/placeholder/product.wxs b/src/Layout/pkg/windows/msis/placeholder/product.wxs index f153b94b3bd1..ae28abd0d476 100644 --- a/src/Layout/pkg/windows/msis/placeholder/product.wxs +++ b/src/Layout/pkg/windows/msis/placeholder/product.wxs @@ -19,7 +19,7 @@ - + diff --git a/src/Layout/pkg/windows/msis/templates/product.wxs b/src/Layout/pkg/windows/msis/templates/product.wxs index 9fbfe6d86eed..4073209f1265 100644 --- a/src/Layout/pkg/windows/msis/templates/product.wxs +++ b/src/Layout/pkg/windows/msis/templates/product.wxs @@ -20,7 +20,7 @@ - + diff --git a/src/Layout/pkg/windows/msis/toolset/product.wxs b/src/Layout/pkg/windows/msis/toolset/product.wxs index 4a51d0ea9cf3..f9cae93c356d 100644 --- a/src/Layout/pkg/windows/msis/toolset/product.wxs +++ b/src/Layout/pkg/windows/msis/toolset/product.wxs @@ -21,6 +21,8 @@ + + From f5187048c093ad29aac74974de67e1fa27b9a809 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 13 Jun 2025 09:51:51 -0700 Subject: [PATCH 30/47] Add .ico file for thmviewer --- src/Layout/pkg/windows/bundles/sdk/dotnet.ico | Bin 0 -> 45150 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Layout/pkg/windows/bundles/sdk/dotnet.ico diff --git a/src/Layout/pkg/windows/bundles/sdk/dotnet.ico b/src/Layout/pkg/windows/bundles/sdk/dotnet.ico new file mode 100644 index 0000000000000000000000000000000000000000..16c9148e8609531b6bde8509f503ec29010985c6 GIT binary patch literal 45150 zcmeHQ3s}`f7M}~4kSme6E181jmtgLS=KF=$bTvzb(liT`G!a&jLLP|%x5p-CXr(L~ zA-bk$3R);CE)SoqXoZFg0*Yn`B3dAVf_Qh%#gpSS_kmmVCE0wi%hvy0TA8qT?r?$T38A9&7NQi?&ZQY|YA)DVJq+7SU{Z@on zE+@psrnVkxK}bR*Assu`*7rU_h|?xQtSBGo^DrZ%VjCgLTqccc|7hn&sp|IQUl{WW z^g=eL{KVB~i#s9aoyLzDHRZjpuAUv~@l|Elw9@Ep4(2tA$xnU$-{li}_I+XF#S{KT zn`d1-V*B$KfjzUoo@dgdYX_4bP8~U%am2!JX`si>t$R8wS`qcKNrdIVHbcf93=8!+ zFvZ-@VSMq?o9p7&?JvCMv?I&Gc0^Uzo9B`X7bX9=u-ZQ$pxtMe?I$`Cj}=7ON1<{v zAqULJ2NuN4nwa+>Ruf3KHGk}=IQVAptzUlrW~qhJ)M>`_>}hGiOH2$Lt5xX3-;tD2 zZc=qRrdPZ0JxOI34*6U!-q<_tQrqP_Catb?TIaq0?6D)KS5)L4yAu0Tai`d_Ymt@F zH>aP@%H9*ZWO$G=0`u_2u7^`p&Sl?L05=372KW z_rM!=T|5FUT$T+{^>6srdD=f5HzjWvm*8cHUN!`eZ zge5`o+k;Qu$@Mt#NJcx83=*#>Z>R7`t;$Il7kaXj+4`qmO#^$%Zp`uxBmK9OSsd6i z)89ck&0P86)N8w*4YT<1L|Cx;#;mxg$@U75*G~7nuxZfd;|E614jS}is++ayEVy1Y~K}Y{XynLQk7a5?G>JT{0*-?ks)(V%qP1$sGQ!V7H^8Nh;|w|*>l*I=SkI= zdGlgU4QjvAdBv`z2=WbOfpz)f?1L_y6h-~0NgFIj`wjc8z^eaNtt9TBtbDCXos5nv`5=Iwx<;b;;DYuS{ zeB|dlL>7>ccVHhDN!%UQG{Pl(1oN+nscBPOU91J@&az`Ivw^ zimce;HGN8sxR{+kzv0{TT+35YepyaA?|dH}*O{vLAt}4OL*lsR%wjt&|4p7-WncEOijRB@DH%804w-rG5Y?gJ$UJ}KUvoG`<4g3ZtY z9Tgs4S62t*|3`hod`b29llI-r4Y54@OlnNu9uo$Y`%!YIn)naT=s$Px?6>Hd0vZ4JNn_%kcl&^zo)9I?Dw^RuLneuUL_jwJ znY~_Cw}z|@h1TFZ_$d7sBOvEruK(5$1LEi>q&4_1_dmJ+%lH=~AlJV<{WpE&&GXWXp|b}3R6q>pN;$S)Lgeg30QJO$qkO?a$DUq!Sb{nr)4E!BS!#?86S z*z@0It)=wK`4=P5Qs!5m zA7bz2`qzhBOX-*MFGirH%&$H_#NNyGuMfAD(l6&A8swBU(UZa z1Z2BJpmiaj?YYwVS{T|&ssZAm$3fdX!|z1UpSB`yG|S(Kpdd8!^st?S@Ni1|8}}W1 ziGSnb&BwRIU*gZlL|y7Keq{XAC0=-589y?9_?W0my*0%Tysyl^vs@Rf8iLnQ{K0Na z=mXY8cCqj1V?Xlqlz*oa`*EBuYN-AA%>=wdteKg1g* z)QNTWU31a9+{lOHbWvm34|ZU}Z=$e{`mxSZ(fi=okK=SvW7rQ^W8A!ozp?omT81|z+j2pBE+qKoPou~XbzMrid z%YObC1UfLGKCJWm|HXx2_kB|);uEcNkZTP4wS5nRcJTINJJQ0?by(C&`ME`z^|2pi zG$obx%j=i=#Gi~G89y?9?yZ9QV9^v~?^#}3Y6=_bqf^>1_a7NQ_f|oDuxN_0_biwD zPjkSZpAT7Y90Y1FJPE0#FRN2Qt!Z7U`tCTS`C8;`;rLJwj!VAVAH-2tu8#dU4(mu! zt~N?Yt)D#A#;>m(?Lg{t*Is_yz2AvKyx~19$SyQL?C)tc#Xe$)P719i8N%BXJkq}U zol8pmBz{e?Zc(RRoLK|&j$%s+dDXEd15ZmhGEf7S(k zyeu5gQeE}|AKC_GkxYC>3w24}5n5c@5ER2oK29 zhac+X?ZbCEz&5}E67m|N+Yp}m*oW_G!2FBsL%X3*G>;8wAFc`1E3yytvk9?93Vk>p z+eEak^9$<%VjmJd9~RlCPdAL$#{>4()jnJc?0(Ul>;u2~cP2#k@%sy`Cw9L7JL?;ijpaYcVZZ(1 z^|SGpGsgY*|8WE3un+G$vo;!vKgeOn^ZKD5leTY+_}BnD4AIZpYwWVrUyFdTaWzz) z#9!hM2pAeK#^#gphX^zsh2w^b-Xds<47%Yyg$>Q{+l5VipTgMjjq<2#nuK*@Qz>8f z{ced*-SL6732}-P%J};U*skfMfAIX9 Date: Mon, 16 Jun 2025 17:28:32 -0700 Subject: [PATCH 31/47] UI changes --- .../windows/bundles/sdk/LCID/1033/bundle.wxl | 21 +-- src/Layout/pkg/windows/bundles/sdk/bundle.thm | 149 ++++++++++-------- 2 files changed, 93 insertions(+), 77 deletions(-) diff --git a/src/Layout/pkg/windows/bundles/sdk/LCID/1033/bundle.wxl b/src/Layout/pkg/windows/bundles/sdk/LCID/1033/bundle.wxl index 7a25b3efeebf..de1559e4f6bd 100644 --- a/src/Layout/pkg/windows/bundles/sdk/LCID/1033/bundle.wxl +++ b/src/Layout/pkg/windows/bundles/sdk/LCID/1033/bundle.wxl @@ -5,7 +5,7 @@ - + @@ -16,6 +16,7 @@ + @@ -54,17 +55,17 @@ • .NET Windows Desktop Runtime [WINFORMSANDWPFVERSION] This product collects usage data - • More information and opt-out https://aka.ms/dotnet-cli-telemetry - -Resources - • .NET Documentation https://aka.ms/dotnet-docs - • SDK Documentation https://aka.ms/dotnet-sdk-docs - • Release Notes https://aka.ms/dotnet[VERSIONMAJOR]-release-notes - • Tutorials https://aka.ms/dotnet-tutorials" /> + • <A HREF="https://aka.ms/dotnet-cli-telemetry">More information and opt-out</A>"/> + + + + - + - + + + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.thm b/src/Layout/pkg/windows/bundles/sdk/bundle.thm index 68f84508bd27..90ed5b9aca69 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.thm +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.thm @@ -1,71 +1,86 @@ - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - -