From 46fcb7f54bac41483581c1ae7dd58d96146431a6 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 23 Jul 2025 10:18:08 -0700 Subject: [PATCH 001/102] Initial commit for wix5 update --- eng/targets/Wix.Common.props | 15 +- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 4 +- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 760 +++++++----------- .../ANCMV2/AncmV2.wixproj | 2 +- .../ANCMV2/aspnetcoremodulev2.wxs | 377 ++++----- .../IIS-Setup/appsearch/appsearch.wxi | 40 +- .../IIS-Setup/iisca/wix/iisca.wxs | 218 +++-- .../IIS-Setup/iisca/wix3/ElevatedShortcut.wxi | 25 - .../IIS-Setup/iisca/wix3/HttpListener.wxi | 44 - .../IIS-Setup/iisca/wix3/WindowsHotfix.wxi | 41 - .../IIS-Setup/iisca/wix3/iisca.wxs | 99 --- .../IIS-Setup/iisca/wix5/ElevatedShortcut.wxi | 23 + .../{wix3 => wix5}/FixPatchingBehavior.wxi | 20 +- .../IIS-Setup/iisca/wix5/HttpListener.wxi | 42 + .../ShortcutConsoleProperties.wxi | 26 +- .../IIS-Setup/iisca/wix5/WindowsHotfix.wxi | 39 + .../IIS-Setup/iisca/wix5/iisca.wxs | 97 +++ .../IIS-Setup/include.wxi | 7 +- .../AspNetCoreModule-Setup/setupstrings.wxl | 83 +- .../Windows/HostOptions/Product.wxs | 28 +- .../Windows/WindowsHostingBundle/1028/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1029/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1031/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1033/thm.wxl | 117 +-- .../Windows/WindowsHostingBundle/1036/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1040/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1041/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1042/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1045/thm.wxl | 107 ++- .../Windows/WindowsHostingBundle/1046/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1049/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/1055/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/2052/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/3082/thm.wxl | 106 ++- .../Windows/WindowsHostingBundle/ANCM.wxs | 99 +-- .../Windows/WindowsHostingBundle/Bundle.wxs | 94 +-- .../WindowsHostingBundle/DotNetCore.wxs | 59 +- .../WindowsHostingBundle/SharedFramework.wxs | 23 +- .../Windows/WindowsHostingBundle/thm.xml | 7 +- 39 files changed, 1638 insertions(+), 2130 deletions(-) delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi delete mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/iisca.wxs create mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ElevatedShortcut.wxi rename src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/{wix3 => wix5}/FixPatchingBehavior.wxi (68%) create mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi rename src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/{wix3 => wix5}/ShortcutConsoleProperties.wxi (58%) create mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi create mode 100644 src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index 7ee8b7902e7c..c4b9c48c2d00 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -5,6 +5,8 @@ 2.0 3.14 $(MicrosoftSignedWixVersion) + $(MicrosoftWixToolsetVersion) + true @@ -19,10 +21,21 @@ - + + + + + + + + + + + + false $(WixExtDir)dark.exe diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index c6aae9163e88..2e1e98a5e41b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -1,4 +1,4 @@ - +5?xml version="1.0" encoding="utf-8"?> @@ -34,7 +34,7 @@ - + iisca.wxs diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index bc87990340b7..cb0e5a0a578e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -1,6 +1,4 @@ - - - @@ -40,28 +38,14 @@ - - - - - - - - - - Microsoft Corporation + + + + + + + + @@ -72,15 +56,15 @@ - (NOT NEWERVERSIONFOUND) OR Installed + - Privileged + - 1 + - + @@ -107,24 +91,20 @@ - + - + - - - - + + - - - - + + @@ -151,117 +131,66 @@ - + - - - - - + - + - - - - + + + + - - + + - - + + - - - + + + - + - - + + - - + + - + - - - - + + + + - - - - + + + + - + - - + + @@ -269,29 +198,21 @@ - + - - + + - - + + - - - + + + @@ -299,12 +220,8 @@ - - + + @@ -315,377 +232,292 @@ - - + + - - + + - - - - + + + + - - + + - + - !(loc.Error30001) - !(loc.Error30002) + + - !(loc.WebServicesRunning) + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + - - - + + + + - - + - + \ No newline at end of file diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index f51cf66196e7..72ba68c62f76 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -31,7 +31,7 @@ - + iisca.wxs diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index ef4e4a1216e7..422fe9b2153c 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -1,6 +1,4 @@ - - - @@ -27,39 +25,25 @@ - + - - - - - - - - + + + + + + - + - + - Microsoft Corporation + - + @@ -71,48 +55,120 @@ - (NOT NEWERVERSIONFOUND) OR Installed + - Privileged + - - - - + + - - - - + + - 1 + - - = 601)]]> - + - - ((IISCOREWEBENGINEINSTALLED = "#1") AND (IISW3SVCINSTALLED = "#1")) OR (Installed) - + - - NOT ( (VersionNT = 600) AND (ServicePackLevel = 1) AND (WINDOWSUPDATE_START_TYPE = "#4") ) - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -126,12 +182,8 @@ - - + + @@ -144,89 +196,57 @@ - + - - - - + + + + - - + + - - + + - - - - + + + + - - + + - - + + - + - - + + - - + + - - + + - - + + - + @@ -234,7 +254,7 @@ - + @@ -246,27 +266,19 @@ - - - + + + - - + + - - + + @@ -274,107 +286,22 @@ - - + + - - - - - - - - - - - - - - - - - + + - - - - - - - - - !(loc.Error30001) - !(loc.Error30002) - - !(loc.WebServicesRunning) - - - - - - AspNetCoreModuleV2 - AspNetCoreModuleV2Dll - - - - - - system.webServer/aspNetCore - AspNetCoreSchemaV2File - Allow - - - - - - - WWW Server - {3a2a4e84-4c21-4981-ae10-3fda0d9b0f83} - ANCM - 65536 - AncmMofFile - AspNetCoreModuleV2 - - - - - - - - - - - - - - - - (NOT OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK="" OR OPT_NO_SHARED_CONFIG_CHECK="0") AND NOT Installed AND NOT REMOVE="ALL" - - - - - - - - - - - - - - + + - - + - - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi index 820cc86f4ed9..b8564e6f4bef 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi @@ -1,6 +1,4 @@ - - - @@ -11,7 +9,7 @@ --> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs index 5bf076f74d20..1d2a0e7aca98 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs @@ -1,191 +1,189 @@ - - - - + - - + + - - - - + + + + - NOT SKIPINSTALLCA AND NOT( REMOVE="ALL" ) - NOT SKIPUNINSTALLCA + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - + + + - + - - - - - - + + + + + + - NOT SKIPINSTALLWINDOWSHOTFIX - NOT SKIPREBOOTIFREQUIRED + + - + - + - + - NOT SKIPMAKESHORTCUTELEVATED + - + - + - + - - - - - + + + + + - NOT SKIPSETCONSOLEPROPERTIES + - - + + - - + + - - - - - + + + + + - NOT SKIPINSTALLHTTPLISTENER - NOT SKIPUNINSTALLHTTPLISTENER + + @@ -195,14 +193,14 @@ we decided that it is confusing to see a remove button when the intention was to patch the product. --> - - - + + + - Installed And PATCH - Installed And PATCH - Installed And PATCH + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi deleted file mode 100644 index ee5e988a1bf3..000000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ElevatedShortcut.wxi +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - NOT SKIPMAKESHORTCUTELEVATED - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi deleted file mode 100644 index 68db6852d11a..000000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/HttpListener.wxi +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT SKIPINSTALLHTTPLISTENER - NOT SKIPUNINSTALLHTTPLISTENER - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi deleted file mode 100644 index 78b26d6404c7..000000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/WindowsHotfix.wxi +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT SKIPINSTALLWINDOWSHOTFIX - NOT SKIPREBOOTIFREQUIRED - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/iisca.wxs deleted file mode 100644 index 68324e148430..000000000000 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/iisca.wxs +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - NOT SKIPINSTALLCA - (NOT SKIPUNINSTALLCA) AND (IISCOREWEBENGINEINSTALLED = "#1") AND (IISW3SVCINSTALLED = "#1") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ElevatedShortcut.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ElevatedShortcut.wxi new file mode 100644 index 000000000000..199f602e1988 --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ElevatedShortcut.wxi @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi similarity index 68% rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi rename to src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi index ae6e3b76d55e..7d157dd29628 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/FixPatchingBehavior.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi @@ -1,11 +1,9 @@ - - - - + @@ -23,14 +21,14 @@ To add this to your wxs file, add: we decided that it is confusing to see a remove button when the intention was to patch the product. --> - - - + + + - Installed And PATCH - Installed And PATCH - Installed And PATCH + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi new file mode 100644 index 000000000000..68969964ee73 --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi similarity index 58% rename from src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi rename to src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi index 236e0f51ef96..5d0d27984e90 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix3/ShortcutConsoleProperties.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi @@ -1,11 +1,9 @@ - - - - + - + - + - + - - - - - + + + + + - NOT SKIPSETCONSOLEPROPERTIES + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi new file mode 100644 index 000000000000..3ddb726d83cb --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs new file mode 100644 index 000000000000..3e8c41778b6b --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index 449acd06a346..f925a8cc639f 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -1,6 +1,4 @@ - - - + - Microsoft ASP.NET Core Module - Microsoft ASP.NET Core Module V2 - ASP.NET Core IIS Runtime - Adds the support of asp.net core application to IIS. - Microsoft ASP.NET Core Module for IIS Express - Microsoft ASP.NET Core Module V2 for IIS Express - IIS Express 8.0 or higher is not installed. + + + + + + + - Microsoft Corporation - An incompatible product, [CONFLICTING_PRODUCT_NAME], is on this computer. Installation of [ProductName] cannot continue. To install this product, use Add/Remove Programs on the Control Panel to remove [CONFLICTING_PRODUCT_NAME]. - Administrator privilege is required to install [ProductName]. - IIS Version 7.0 is required to use [ProductName]. - IIS Version 7.0 or greater is required to install [ProductName]. - IIS Version 7.5 or greater is required to install [ProductName]. - IIS Version 7 or 7.5 is required to install [ProductName]. - IIS Version 8.0 or greater is required to install [ProductName]. - The beta version of [ProductName] was found on this machine. - A newer version of [ProductName] was found on this machine. - Setup cannot continue because another instance of [ProductName] is already installed on this computer. Please uninstall it first and then re-launch this installation. - The IIS 7.0 CoreWebEngine and W3SVC features must be installed to use [ProductName]. - The IIS Management Console must be installed to use [ProductName]. - Please stop both services Windows Process Activation Service (WAS) and Web Management Service (WMSvc) before installing [ProductName]. You will need to start the services after installing [ProductName]. - IIS Metabase is required to install [ProductName]. - The 64-bit version of [ProductName] cannot be installed on a 32-bit edition of Microsoft Windows. - The 32-bit version of [ProductName] cannot be installed on a 64-bit edition of Microsoft Windows. - Microsoft .NET Framework Version 2.0 or greater is required to install [ProductName]. - Microsoft .NET Framework Version 3.5 or greater is required to install [ProductName]. Use 'Add Features' under the Server Manager to install Microsoft .Net Version 3.5. - Microsoft .NET Framework Version 4.0 or greater is required to install [ProductName]. - Please install Microsoft .NET Framework Version 2.0 Service Pack 1 (or a later service pack), before installing [ProductName]. - The Windows Update (wuauserv) service cannot be disabled, it is required to install [ProductName]. - The PowerShell snap-in is part of Windows Operating System. Please install it via 'Programs and Features' or 'Server Manager'. - Microsoft Web Platform Installer Version 3.0 or greater is required to install [ProductName]. + + + + + + + + + + + + + + + + + + + + + + + + - Setup failed to detect shared configuration. - Shared configuration is enabled for IIS. Installing [ProductName] is not supported when using shared configuration. Please disable shared configuration before installing this feature. + + - Please stop World Wide Web Publishing Service (W3SVC) before installing [ProductName]. You will need to start the service after installation. - IIS PowerShell Management Console - IIS PowerShell snap-in - IIS PowerShell snap-in requires PowerShell v1.0 or v2.0 installed - IIS PowerShell snap-in requires WAS and configuration installed - This is a bogus string. + + + + + + diff --git a/src/Installers/Windows/HostOptions/Product.wxs b/src/Installers/Windows/HostOptions/Product.wxs index 127ce886b0f0..74db545ca475 100644 --- a/src/Installers/Windows/HostOptions/Product.wxs +++ b/src/Installers/Windows/HostOptions/Product.wxs @@ -1,9 +1,7 @@ - - - - - + + + + @@ -20,27 +18,25 @@ - NOT OPT_NO_ANCM OR OPT_NO_ANCM="" - NOT OPT_NO_SHAREDFX OR OPT_NO_SHAREDFX="" - NOT OPT_NO_RUNTIME OR OPT_NO_RUNTIME="" - NOT OPT_NO_X86 OR OPT_NO_X86="" - NOT OPT_NO_SHARED_CONFIG_CHECK OR OPT_NO_SHARED_CONFIG_CHECK="" + + + + + - + - - - + @@ -51,7 +47,7 @@ - + diff --git a/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl index 46f5e7b30c2b..53eedb4bd849 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl @@ -1,60 +1,52 @@ - - - [WixBundleName]安裝程式 - [BundleNameShort] - [BundleNameSub] - 版本 [WixBundleVersion] - 您確定要取消嗎? - 前一版 - 安裝說明 - /install | /repair | /uninstall | /layout [\[]目錄[\]] - 在目錄中安裝、修復、解除安裝或 - 建立搭售方案的完整本機複本。預設為安裝。 - -/passive | /quiet - 顯示最少 UI 且不含提示，或者不顯示 UI，也 - 不顯示提示。預設會顯示 UI 和所有提示。 - -/norestart - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。 -/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。 - 關閉(&C) - 我同意授權條款及條件(&A) - 安裝(&I) - 關閉(&C) - 安裝進度 - 處理中: - 正在初始化... - 取消(&C) - 修改安裝 - 修復(&R) - 解除安裝(&U) - 關閉(&C) - 修復已成功完成 - 解除安裝已成功完成 - 安裝已成功完成 - 設定成功 - 啟動(&L) - 必須重新啟動電腦，才能使用此軟體。 - 重新啟動(&R) - 關閉(&C) - 安裝失敗 - 設定失敗 - 解除安裝失敗 - 修復失敗 - 有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱<a href="#">記錄檔</a>。 - 必須重新啟動電腦，才能完成軟體的復原。 - 重新啟動(&R) - 關閉(&C) - 使用中的檔案 - 以下應用程式正在使用需要進行更新的檔案: - 關閉應用程式並嘗試重新啟動(&A) - 不關閉應用程式，需要重新啟動(&D) - 確定(&O) - 取消(&C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 歡迎使用 [WixBundleName] 安裝程式。 - 請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此處</a>. - 這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此處</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">授權條款</a>和<a href="https://go.microsoft.com/fwlink/?LinkId=786378">隱私權聲明</a>。 - 請在安裝完成後重新啟動 IIS。如需其他資訊，請參閱<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此處</a>. - 這部電腦上未啟用 IIS。如果您要使用 IIS 執行 ASP.NET Core 應用程式，就必須先安裝 IIS 才能執行此安裝程式。如需其他資訊，請參閱<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此處</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl index 5006b351d62f..78470067bb14 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl @@ -1,60 +1,52 @@ - - - Instalační program [WixBundleName] - [BundleNameShort] - [BundleNameSub] - Verze [WixBundleVersion] - 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 svazku v adresáři. Výchozí možností je instalace. - -/passive | /quiet – Zobrazí minimální uživatelské rozhraní bez výzev nebo nezobrazí žádné uživatelské rozhraní a - žádné výzvy. Výchozí možností je zobrazení uživatelského rozhraní a všech výzev. - -/norestart – potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní před restartováním zobrazí výzvu. -/log log.txt – Uloží protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%. - &Zavřít - Souhl&asím s licenčními podmínkami - &Instalovat - &Zavřít - Průběh instalace - Probíhá zpracování: - Inicializace... - &Storno - Změnit instalaci - Op&ravit - O&dinstalovat - &Zavřít - Oprava byla úspěšně dokončena - Odinstalace se úspěšně dokončila - Instalace se úspěšně dokončila - Instalace byla úspěšná. - &Spustit - Před použitím tohoto softwaru musíte restartovat počítač. - &Restartovat - &Zavřít - Instalace se nepovedla - Instalace se nepovedla - Odinstalace se nepovedla - Oprava se nepovedla - Jeden nebo více problémů způsobilo selhání instalace. Opravte tyto problémy a znovu spusťte instalaci. Pro více informací se podívejte do <a href="#">souboru protokolu</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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Vítá vás instalační program produktu [WixBundleName] - Po dokončení instalace restartujte službu IIS. Další informace najdete na <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">zde</a>. - Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete na <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">zde</a>. - [WixBundleName] – <a href="https://go.microsoft.com/fwlink/?LinkId=329770">licenční podmínky</a> a <a href="https://go.microsoft.com/fwlink/?LinkId=786378">prohlášení o zásadách ochrany osobních údajů</a> - Po dokončení instalace restartujte službu IIS. Další informace najdete na <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">zde</a>. - Služba IIS není na tomto počítači povolená. Pokud máte v úmyslu spouštět aplikace ASP.NET Core se službou IIS, je nutné před spuštěním tohoto instalačního programu nainstalovat službu IIS. Další informace najdete na <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">zde</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl index 96a72e0b8895..c2e88122270f 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl @@ -1,60 +1,52 @@ - - - [WixBundleName] - Setup - [BundleNameShort] - [BundleNameSub] - Version von [WixBundleVersion] - Möchten Sie den Vorgang wirklich abbrechen? - Vorherige Version - Setup-Hilfe - /install | /repair | /uninstall | /layout [\[]Verzeichnis[\]] – installiert, repariert, deinstalliert oder - erstellt eine vollständige lokale Kopie des Bundles im Verzeichnis. Installieren ist die Standardeinstellung. - -/passive | /quiet – zeigt eine minimale Benutzeroberfläche ohne Eingabeaufforderungen oder keine Benutzeroberfläche - und keine Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und alle Eingabeaufforderungen angezeigt. - -/norestart – unterdrückt alle Neustartversuche. Standardmäßig fordert die Benutzeroberfläche zum Bestätigen eines Neustarts auf. -/log log.txt – protokolliert in eine bestimmte Datei. Standardmäßig wird eine Protokolldatei in %TEMP% erstellt. - S&chließen - Ich &stimme den Bedingungen des Lizenzvertrags zu - &Installieren - S&chließen - Setupstatus - Wird verarbeitet: - Initialisierung... - &Abbrechen - Setup ändern - &Reparieren - &Deinstallieren - S&chließen - Reparatur erfolgreich abgeschlossen - Deinstallation erfolgreich abgeschlossen - Installation erfolgreich abgeschlossen - Setup wurde erfolgreich abgeschlossen - &Starten - Sie müssen den Computer neu starten, bevor Sie die Software verwenden können. - &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 - &Schließ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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Willkommen beim Setup von [WixBundleName]. - Starten Sie IIS nach Abschluss der Installation neu. Zusätzliche Informationen finden Sie <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">hier</a>. - IIS ist auf diesem Computer nicht aktiviert. Wenn Sie ASP.NET Core-Anwendungen mit IIS ausführen möchten, müssen Sie IIS installieren, bevor Sie diesen Installer ausführen. Zusätzliche Informationen finden Sie <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">hier</a>. - <a href="https://go.microsoft.com/fwlink/?LinkId=329770">Lizenzbedingungen</a> und <a href="https://go.microsoft.com/fwlink/?LinkId=786378">Datenschutzerklärung</a> für [WixBundleName]. - Starten Sie IIS nach Abschluss der Installation neu. Zusätzliche Informationen finden Sie <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">hier</a>. - IIS ist auf diesem Computer nicht aktiviert. Wenn Sie ASP.NET Core-Anwendungen mit IIS ausführen möchten, müssen Sie IIS installieren, bevor Sie diesen Installer ausführen. Zusätzliche Informationen finden Sie <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">hier</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl index 4be96ea21e5f..0a771f0956ca 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl @@ -1,60 +1,63 @@ - - - [WixBundleName] Setup - [BundleNameShort] - [BundleNameSub] - Version [WixBundleVersion] - 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 - &Install - &Close - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Close - Repair Successfully Completed - Uninstall Successfully Completed - Installation Successfully Completed - Setup Successful - &Launch - You must restart your computer before you can use 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Welcome to the [WixBundleName] Setup. - Please restart IIS after the installation completes. You can find additional information <a href="https://aka.ms/aspnet/host-and-deploy-with-iis">here</a>. - IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">here</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">license terms</a> and <a href="https://go.microsoft.com/fwlink/?LinkId=786378">privacy statement</a>. - Please restart IIS after the installation completes. You can find additional information <a href="https://aka.ms/aspnet/host-and-deploy-with-iis">here</a>. - IIS is not enabled on this machine. If you intend to run ASP.NET Core applications with IIS, you must install IIS before running this installer. You can find additional information <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">here</a>. + + + + + + + + + + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl index fd344b47184d..ac905f04749b 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl @@ -1,60 +1,52 @@ - - - Installation de [WixBundleName] - [BundleNameShort] - [BundleNameSub] - Version [WixBundleVersion] - Êtes-vous sûr de vouloir annuler ? - Version précédente - Aide du programme d'installation - /install | /repair | /uninstall | /layout [\[]répertoire[\]] - installe, répare, désinstalle ou - crée une copie locale complète du bundle dans le répertoire. Install est l'option par défaut. - -/passive | /quiet - affiche une interface utilisateur minimale, sans invite, ou n'affiche - ni interface utilisateur, ni 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 affiche une invite avant le redémarrage. -/log log.txt - enregistre les informations dans 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 - &Installer - &Fermer - Progression de l’opération - 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 - Installation terminée avec succès - Opération réussie - &Démarrer - Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel. - &Redémarrer - &Fermer - Échec de l’opération - É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 plus d’informations, 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Bienvenue dans le programme d'installation de [WixBundleName]. - Veuillez redémarrer IIS une fois l'installation terminée. Vous trouverez des informations supplémentaires <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">ici</a>. - IIS n'est pas activé sur cette machine. Si vous avez l'intention d'exécuter des applications ASP.NET Core avec IIS, vous devez installer IIS avant d'exécuter ce programme d'installation. Vous trouverez des informations supplémentaires <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">ici</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">termes du contrat de licence</a> et <a href="https://go.microsoft.com/fwlink/?LinkId=786378">déclaration de confidentialité</a>. - Veuillez redémarrer IIS une fois l'installation terminée. Vous trouverez des informations supplémentaires <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">ici</a>. - IIS n'est pas activé sur cette machine. Si vous avez l'intention d'exécuter des applications ASP.NET Core avec IIS, vous devez installer IIS avant d'exécuter ce programme d'installation. Vous trouverez des informations supplémentaires <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">ici</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl index 849900259104..7e5cbc351586 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl @@ -1,60 +1,52 @@ - - - Installazione di [WixBundleName] - [BundleNameShort] - [BundleNameSub] - Versione [WixBundleVersion] - Annullare? - Versione precedente - Guida all'installazione - /install | /repair | /uninstall | /layout [\[]directory[\]] - installa, ripara, disinstalla o - crea una copia locale completa del bundle nella directory. L'opzione predefinita è install. - -/passive | /quiet - visualizza un'interfaccia utente minima senza prompt oppure non visualizza alcuna interfaccia utente - né prompt. Per impostazione predefinita, viene visualizzata l'intera interfaccia utente e tutti i prompt. - -/norestart - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio. -/log log.txt - registra il log in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%. - &Chiudi - &Accetto i termini e le condizioni di licenza - &Installa - &Chiudi - Stato installazione - Elaborazione di: - Inizializzazione in corso... - &Annulla - Modifica installazione - &Ripristina - &Disinstalla - &Chiudi - Riparazione completata correttamente - Disinstallazione completata correttamente - Installazione completata correttamente - Installazione completata - &Avvia - È necessario riavviare il computer prima di utilizzare il software. - &Riavvia - &Chiudi - Installazione non riuscita - Installazione non riuscita - Disinstallazione non riuscita - Riparazione non riuscita - Installazione non riuscita a causa di uno o più problemi. Risolvere i problemi e ritentare l'installazione. Per ulteriori informazioni, vedere il <a href="#">file di log</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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Installazione di [WixBundleName]. - Al termine dell'installazione, riavviare IIS. È possibile trovare altre informazioni <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">qui</a>. - IIS non è abilitato su questo computer. Se si intende eseguire applicazioni ASP.NET Core con IIS, è necessario installare IIS prima di eseguire questo programma di installazione. Altre informazioni <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">qui</a>. - <a href="https://go.microsoft.com/fwlink/?LinkId=329770">Condizioni di licenza</a> e <a href="https://go.microsoft.com/fwlink/?LinkId=786378">informativa sulla privacy</a> di [WixBundleName]. - Al termine dell'installazione, riavviare IIS. È possibile trovare altre informazioni <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">qui</a>. - IIS non è abilitato su questo computer. Se si intende eseguire applicazioni ASP.NET Core con IIS, è necessario installare IIS prima di eseguire questo programma di installazione. Altre informazioni <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">qui</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl index 4e78b735ae8d..ee7c2698257e 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl @@ -1,60 +1,52 @@ - - - [WixBundleName]のセットアップ - [BundleNameShort] - [BundleNameSub] - バージョン [WixBundleVersion] - 取り消しますか? - 以前のバージョン - セットアップのヘルプ - /install | /repair | /uninstall | /layout [\[]ディレクトリ[\]] - バンドルの完全なローカル コピーに対する - ディレクトリへのインストール、修復、ディレクトリからのアンインストール、またはディレクトリ内への作成を行います。既定の設定はインストールです。 - -/passive | /quiet - 最小限の UI だけを表示しプロンプトは表示しない、または UI もプロンプトも - 表示しません。既定では UI とすべてのプロンプトが表示されます。 - -/norestart - 再起動を抑制します。既定では再起動前に確認メッセージが表示されます。 -/log log.txt - 特定のファイルに記録します。ログ ファイルは既定では %TEMP% に作成されます。 - 閉じる(&C) - ライセンス条項および使用条件に同意する(&A) - インストール(&I) - 閉じる(&C) - セットアップの進行状況 - 処理中: - 初期化しています... - キャンセル(&C) - セットアップの変更 - 修復(&R) - アンインストール(&U) - 閉じる(&C) - 修復が正常に完了しました - アンインストールが正常に完了しました - インストールが正常に完了しました - セットアップ完了 - 起動(&L) - ソフトウェアを使用する前にコンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - セットアップに失敗しました - セットアップに失敗しました - アンインストールに失敗しました - 修復に失敗しました - 1 つまたは複数の問題により、セットアップが失敗しました。問題を解決してからセットアップを再試行してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 - ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - ファイルが使用中 - 次のアプリケーションは、更新の必要があるファイルを使用しています: - アプリケーションを閉じて再起動を試みる。(&A) - アプリケーションを終了させない (コンピューターの再起動が必要になります)(&D) - OK(&O) - キャンセル(&C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - [WixBundleName] のセットアップへようこそ。 - インストールが完了したら、IIS を再起動してください。追加情報については、<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">こちら</a>をご覧ください。 - このコンピューターでは IIS が有効になっていません。IIS ASP.NET Core アプリケーションを実行する場合は、このインストーラーを実行する前に IIS をインストールする必要があります。追加情報については、<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">こちら</a>を参照してください。 - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">ライセンス条項</a>および<a href="https://go.microsoft.com/fwlink/?LinkId=786378">プライバシーに関する声明</a>。 - インストールが完了したら、IIS を再起動してください。追加情報については、<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">こちら</a>をご覧ください。 - このコンピューターでは IIS が有効になっていません。IIS ASP.NET Core アプリケーションを実行する場合は、このインストーラーを実行する前に IIS をインストールする必要があります。追加情報については、<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">こちら</a>を参照してください。 + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl index 18bda1fc3960..de822954d705 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl @@ -1,60 +1,52 @@ - - - [WixBundleName] 설치 프로그램 - [BundleNameShort] - [BundleNameSub] - 버전 [WixBundleVersion] - 취소하시겠습니까? - 이전 버전 - 설치 도움말 - /install | /repair | /uninstall | /layout [\[]디렉터리[\]] - 디렉터리에 번들의 전체 로컬 복사본을 - 설치, 복구, 제거 또는 작성합니다. 설치가 기본값입니다. - -/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 - 프롬프트를 표시하지 않습니다. 기본값으로 UI와 모든 프롬프트가 표시됩니다. - -/norestart - 다시 시작하지 않게 합니다. 기본값으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다. -/log log.txt - 특정 파일에 기록합니다. 기본값으로 로그 파일은 %TEMP%에 만들어집니다. - 닫기(&C) - 동의함(&A) - 설치(&I) - 닫기(&C) - 설치 진행률 - 처리 중: - 초기화 중... - 취소(&C) - 설치 수정 - 복구(&R) - 제거(&U) - 닫기(&C) - 복구 완료됨 - 제거 완료됨 - 설치 완료됨 - 설치 완료 - 시작(&L) - 소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 설치 실패 - 설치 실패 - 제거 실패 - 복구 실패 - 하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. - 소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 사용 중인 파일 - 다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다. - 응용 프로그램을 닫고 다시 시작합니다(&A). - 응용 프로그램을 닫지 않습니다(&D). 다시 부팅해야 합니다. - 확인(&O) - 취소(&C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - [WixBundleName] 설치를 시작합니다. - 설치가 완료된 후 IIS를 다시 시작하세요. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">여기</a>에서 자세한 내용을 확인할 수 있습니다. - 이 컴퓨터에서 IIS를 사용하도록 설정되어 있지 않습니다. IIS에서 ASP.NET Core 애플리케이션을 실행하려면 이 설치 관리자를 실행하기 전에 IIS를 설치해야 합니다. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">여기</a>에서 자세한 내용을 확인할 수 있습니다. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">사용 조건</a> 및 <a href="https://go.microsoft.com/fwlink/?LinkId=786378">개인정보처리방침</a>. - 설치가 완료된 후 IIS를 다시 시작하세요. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">여기</a>에서 자세한 내용을 확인할 수 있습니다. - 이 컴퓨터에서 IIS를 사용하도록 설정되어 있지 않습니다. IIS에서 ASP.NET Core 애플리케이션을 실행하려면 이 설치 관리자를 실행하기 전에 IIS를 설치해야 합니다. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">여기</a>에서 자세한 내용을 확인할 수 있습니다. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl index 9add93d65004..74e4580ee815 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl @@ -1,61 +1,52 @@ - - - Instalator [WixBundleName] - [BundleNameShort] - [BundleNameSub] - Wersja [WixBundleVersion] - Czy na pewno chcesz anulować? - Poprzednia wersja - Instalator — Pomoc - /install | /repair | /uninstall | /layout [\[]katalog[\]] — instaluje, naprawia, odinstalowuje lub - tworzy pełną lokalną kopię pakietu w katalogu. Instalacja jest domyślna. - -/passive | /quiet — wyświetla minimalny interfejs użytkownika bez monitów albo nie wyświetla żadnego interfejsu użytkownika ani monitów -. - Domyślnie jest wyświetlany interfejs użytkownika oraz wszystkie monity. - -/norestart — pomija próby ponownego uruchomienia. Domyślnie interfejs użytkownika wyświetla monit przed ponownym uruchomieniem. -/log log.txt — tworzy dziennik w określonym pliku. Domyślnie plik dziennika jest tworzony w katalogu %TEMP%. - &Zamknij - &Zgadzam się na warunki licencji - &Zainstaluj - &Zamknij - Postęp instalacji - Przetwarzanie: - Trwa inicjowanie... - &Anuluj - Zmodyfikuj instalatora - &Napraw - &Odinstaluj - &Zamknij - Pomyślnie ukończono naprawę - Pomyślnie ukończono operację odinstalowania - Pomyślnie ukończono instalację - Instalacja przebiegła pomyślnie - &Uruchom - Aby korzystać z 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ł niepowodzenie instalacji. Napraw błędy, a następnie uruchom ponownie 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Witamy w instalatorze produktu [WixBundleName]. - Uruchom ponownie usługi IIS po zakończeniu instalacji. Dodatkowe informacje można znaleźć <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">tutaj</a>. - Usługi IIS nie są włączone na tym komputerze. Jeśli zamierzasz uruchamiać aplikacje ASP.NET Core z usługami IIS, musisz zainstalować usługi IIS przed uruchomieniem tego instalatora. Dodatkowe informacje można znaleźć <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">tutaj</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">postanowienia licencyjne</a> i <a href="https://go.microsoft.com/fwlink/?LinkId=786378">oświadczenie o ochronie prywatności</a>. - Uruchom ponownie usługi IIS po zakończeniu instalacji. Dodatkowe informacje można znaleźć <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">tutaj</a>. - Usługi IIS nie są włączone na tym komputerze. Jeśli zamierzasz uruchamiać aplikacje ASP.NET Core z usługami IIS, musisz zainstalować usługi IIS przed uruchomieniem tego instalatora. Dodatkowe informacje można znaleźć <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">tutaj</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl index afee27c6b4fc..f16b8534fb8f 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl @@ -1,60 +1,52 @@ - - - [WixBundleName] Instalação - [BundleNameShort] - [BundleNameSub] - Versão [WixBundleVersion] - Tem certeza de que deseja cancelar? - Versão anterior - Ajuda da Instalação - /install | /repair | /uninstall | /layout [\[]diretório[\]] - 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 nenhum prompt 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 qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar. -/log log.txt - registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. - &Fechar - Eu &concordo com os termos e condições da licença - &Instalar - &Fechar - Progresso da Instalação - Processando: - Inicializando... - &Cancelar - Modificar Instalação - &Reparar - &Desinstalar - &Fechar - Reparo Concluído com Êxito - Desinstalação Concluída com Êxito - Instalação Concluída com Êxito - Instalação com Êxito - &Iniciar - Reinicie o computador para poder usar o software. - &Reiniciar - &Fechar - Falha na Instalação - Falha na Instalação - Falha na Desinstalação - Falha ao Reparar - Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Bem-vindo à Instalação do [WixBundleName]. - Reinicie o IIS após a conclusão da instalação. Você pode encontrar informações adicionais <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aqui</a>. - O IIS não está habilitado neste computador. Se pretende executar aplicativos ASP.NET Core com o IIS, você deve instalar o IIS antes de executar este instalador. Você pode encontrar informações adicionais <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aqui</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">termos de licença</a> e <a href="https://go.microsoft.com/fwlink/?LinkId=786378">política de privacidade</a>. - Reinicie o IIS após a conclusão da instalação. Você pode encontrar informações adicionais <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aqui</a>. - O IIS não está habilitado neste computador. Se pretende executar aplicativos ASP.NET Core com o IIS, você deve instalar o IIS antes de executar este instalador. Você pode encontrar informações adicionais <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aqui</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl index e522fb2b8de7..17f1a980f216 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl @@ -1,60 +1,52 @@ - - - Программа установки [WixBundleName] - [BundleNameShort] - [BundleNameSub] - Версия [WixBundleVersion] - Отменить? - Предыдущая версия - Справка по установке - /install | /repair | /uninstall | /layout [\[]каталог[\]] — установка, восстановление, удаление или - создание полной локальной копии пакета в каталоге. По умолчанию — установка. - -/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и - без запросов. По умолчанию отображаются пользовательский интерфейс и все запросы. - -/norestart — отключение всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос. -/log log.txt — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%. - &Закрыть - Я &принимаю условия лицензии - &Установить - &Закрыть - Ход установки - Обработка: - Инициализация... - Отм&ена - Изменение установки - &Исправить - &Удалить - &Закрыть - Исправление успешно завершено - Удаление успешно завершено - Установка успешно завершена - Установка успешно завершена - &Запустить - Перед использованием программного обеспечения необходимо перезапустить компьютер. - &Перезапустить - &Закрыть - Сбой установки - Сбой установки - Сбой удаления - Сбой восстановления - Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в <a href="#">файле журнала</a>. - Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. - &Перезапустить - З&акрыть - Используемые файлы - Следующие приложения используют файлы, которые нуждаются в обновлении: - Закройте &приложения и попробуйте перезапустить их. - &Не закрывайте приложения. Потребуется перезагрузка компьютера. - О&К - &Отменить + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Вас приветствует мастер установки [WixBundleName]. - Перезапустите службы IIS после завершения установки. Дополнительные сведения см. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">здесь</a>. - Службы IIS не включены на этом компьютере. Если вы планируете запускать приложения ASP.NET Core с IIS, перед запуском этого установщика необходимо установить службы IIS. Дополнительные сведения см. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">здесь</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">условия лицензии</a> и <a href="https://go.microsoft.com/fwlink/?LinkId=786378">заявление о конфиденциальности</a>. - Перезапустите службы IIS после завершения установки. Дополнительные сведения см. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">здесь</a>. - Службы IIS не включены на этом компьютере. Если вы планируете запускать приложения ASP.NET Core с IIS, перед запуском этого установщика необходимо установить службы IIS. Дополнительные сведения см. <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">здесь</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl index 0d383b14fb4f..358d4ef3fac3 100644 --- a/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl @@ -1,60 +1,52 @@ - - - [WixBundleName] Kurulumu - [BundleNameShort] - [BundleNameSub] - [WixBundleVersion] Sürümü - İptal etmek istediğinizden emin misiniz? - Önceki sürüm - Kurulum Yardımı - /install | /repair | /uninstall | /layout [\[]dizin[\]] - yükler, onarır, kaldırır ya da - dizindeki paketin tam bir yerel kopyasını oluşturur. Varsayılan install değeridir. - -/passive | /quiet - en az düzeyde istemsiz UI gösterir ya da hiç UI göstermez ve - istem yoktur. Varsayılan olarak UI ve tüm istemler görüntülenir. - -/norestart - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar. -/log log.txt - belirli bir günlük dosyası tutar. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur. - &Kapat - Lisans &hüküm ve koşullarını kabul ediyorum - &Yükle - &Kapat - Kurulum İlerleme Durumu - İşleniyor: - Başlatılıyor... - &İptal - Kurulumu değiştir - &Onar - K&aldır - &Kapat - Onarım Başarıyla Tamamlandı - Kaldırma Başarıyla Tamamlandı - Yükleme Başarıyla Tamamlandı - Kurulum Başarılı - &Başlat - Yazılımı kullanabilmeniz için bilgisayarınızı yeniden başlatmanız gerekiyor. - 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - [WixBundleName] Kurulumu'na Hoş Geldiniz. - Yükleme tamamlandıktan sonra lütfen IIS'yi yeniden başlatın. Daha fazla bilgiyi <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">bu sayfada</a> bulabilirsiniz. - IIS bu makinede etkin değil. ASP.NET Core uygulamalarını IIS ile çalıştırmak istiyorsanız, bu yükleyiciyi çalıştırmadan önce IIS'yi yüklemeniz gerekir. Daha fazla bilgiyi <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">bu sayfada</a> bulabilirsiniz. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">lisans koşulları</a> ve <a href="https://go.microsoft.com/fwlink/?LinkId=786378">gizlilik bildirimi</a>. - Yükleme tamamlandıktan sonra lütfen IIS'yi yeniden başlatın. Daha fazla bilgiyi <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">bu sayfada</a> bulabilirsiniz. - IIS bu makinede etkin değil. ASP.NET Core uygulamalarını IIS ile çalıştırmak istiyorsanız, bu yükleyiciyi çalıştırmadan önce IIS'yi yüklemeniz gerekir. Daha fazla bilgiyi <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">bu sayfada</a> bulabilirsiniz. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl index 2609681be5c6..b0b1262d69f6 100644 --- a/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl @@ -1,60 +1,52 @@ - - - [WixBundleName]安装程序 - [BundleNameShort] - [BundleNameSub] - 版本 [WixBundleVersion] - 是否确实要取消? - 上一版本 - 安装程序帮助 - /install | /repair | /uninstall | /layout [\[]目录[\]] - 安装、修复、卸载 - 目录中的捆绑包或创建其完整本地副本。Install 为默认选择。 - -/passive | /quiet - 显示最少的 UI 且无提示，或不显示 UI 且 - 无提示。默认情况下，显示 UI 及全部提示。 - -/norestart - 禁止任何重启尝试。默认情况下将在重启前显示提示 UI。 -/log log.txt - 向特定文件写入日志。默认情况下在 %TEMP% 中创建日志文件。 - 关闭(&C) - 我同意许可条款和条件(&A) - 安装(&I) - 关闭(&C) - 安装进度 - 正在处理: - 正在初始化... - 取消(&C) - 修改安装程序 - 修复(&R) - 卸载(&U) - 关闭(&C) - 成功完成了修复 - 成功完成了卸载 - 成功完成了安装 - 设置成功 - 启动(&L) - 您必须先重新启动计算机，然后才能使用该软件。 - 重新启动(&R) - 关闭(&C) - 安装失败 - 安装失败 - 卸载失败 - 修复失败 - 一个或多个问题导致了安装失败。请修复这些问题，然后重试安装。有关详细信息，请参阅<a href="#">日志文件</a>。 - 必须重新启动计算机才能完成软件回退。 - 重新启动(&R) - 关闭(&C) - 文件正在使用 - 以下应用程序正在使用的文件需要更新: - 关闭应用程序并尝试重启(&A)。 - 不关闭应用程序(&D)。需要重启。 - 确定(&O) - 取消(&C) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 欢迎使用 [WixBundleName] 安装程序。 - 请在安装完成后重启 IIS。可在<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此处</a>找到其他信息。 - 此计算机上未启用 IIS。如果打算通过 IIS 运行 ASP.NET Core 应用程序，必须先安装 IIS，然后再运行此安装程序。可在<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此处</a>找到其他信息。 - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">许可条款</a>和<a href="https://go.microsoft.com/fwlink/?LinkId=786378">隐私声明</a>。 - 请在安装完成后重启 IIS。可在<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此处</a>找到其他信息。 - 此计算机上未启用 IIS。如果打算通过 IIS 运行 ASP.NET Core 应用程序，必须先安装 IIS，然后再运行此安装程序。可在<a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">此处</a>找到其他信息。 + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl index f43bb07bd8f7..8a892f44a811 100644 --- a/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl @@ -1,60 +1,52 @@ - - - Instalación de [WixBundleName] - [BundleNameShort] - [BundleNameSub] - Versión [WixBundleVersion] - ¿Está seguro de que desea cancelar la operación? - Versión anterior - Ayuda del programa de instalación - /install | /repair | /uninstall | /layout [\[]directorio[\]] - instala, repara, desinstala o - crea una copia local completa del paquete en el directorio. Install es la opción predeterminada. - -/passive | /quiet - muestra una IU mínima sin peticiones, o bien no muestra la IU - ni las peticiones. De forma predeterminada, se muestran la IU y todas las peticiones. - -/norestart - suprime los intentos de reiniciar. De forma predeterminada, la IU preguntará antes de reiniciar. -/log log.txt - se 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 - &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 se completó correctamente - La instalación o desinstalación se realizó correctamente - &Iniciar - Debe reiniciar el equipo para poder usar el software. - &Reiniciar - &Cerrar - Error de instalación - Error de instalación - No se pudo desinstalar - No se pudo reparar - Error de instalación debido a uno o varios problemas. Corrija los problemas e intente de nuevo la instalación. Para obtener más información, consulte el <a href="#">archivo de registro</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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Programa de instalación de [WixBundleName]. - Reinicie IIS una vez completada la instalación. Puede encontrar información adicional <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aquí</a>. - IIS no está habilitado en esta máquina. Si pretende ejecutar aplicaciones ASP.NET Core con IIS, debe instalar IIS antes de ejecutar este instalador. Puede encontrar información adicional <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aquí</a>. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">Términos de licencia</a> y <a href="https://go.microsoft.com/fwlink/?LinkId=786378">declaración de privacidad</a>. - Reinicie IIS una vez completada la instalación. Puede encontrar información adicional <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aquí</a>. - IIS no está habilitado en esta máquina. Si pretende ejecutar aplicaciones ASP.NET Core con IIS, debe instalar IIS antes de ejecutar este instalador. Puede encontrar información adicional <a href="https://aka.ms/aspnet/8.0/host-and-deploy-with-iis">aquí</a>. + + + + + + \ No newline at end of file diff --git a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs index fe2e19b3024e..a9b16af70dd8 100644 --- a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs @@ -1,116 +1,43 @@ - - - + + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index dd23ad4ee5d4..8820a4d12974 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -1,56 +1,49 @@ - - + - - - - + + + + - - - + + + - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -59,12 +52,12 @@ - - - - - - + + + + + + @@ -73,36 +66,25 @@ - + - + - - - - + + + + - - - - - + + + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs b/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs index 932d6bab74de..0e04a86d7f45 100644 --- a/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/DotNetCore.wxs @@ -1,80 +1,43 @@ - - - + + - + - + - + - + - + - + - + - + - + diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs index d17bf0d524be..e5c13a26cee0 100644 --- a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs @@ -1,32 +1,19 @@ - - - + + - + - + - + diff --git a/src/Installers/Windows/WindowsHostingBundle/thm.xml b/src/Installers/Windows/WindowsHostingBundle/thm.xml index 0fe7443e7f92..58272a54a35e 100644 --- a/src/Installers/Windows/WindowsHostingBundle/thm.xml +++ b/src/Installers/Windows/WindowsHostingBundle/thm.xml @@ -1,5 +1,4 @@ - - + #(loc.Caption) Segoe UI Segoe UI @@ -7,7 +6,7 @@ Segoe UI Segoe UI - + #(loc.Title) #(loc.SubTitle) @@ -28,7 +27,7 @@ #(loc.FilesInUseHeader) #(loc.FilesInUseLabel) - + From 8ba1613bf8477e67137e150d26071af1e688f1c4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 23 Jul 2025 11:10:36 -0700 Subject: [PATCH 002/102] Syntax error --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 2e1e98a5e41b..39838c6166d7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -1,4 +1,4 @@ -5?xml version="1.0" encoding="utf-8"?> + From 61a709f3141c78e8d2d53078250dcbec5fdb2664 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 23 Jul 2025 12:14:05 -0700 Subject: [PATCH 003/102] Update wixproj's --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 4 ++-- .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 4 ++-- src/Installers/Windows/HostOptions/HostOptions.wixproj | 4 ++-- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 39838c6166d7..265c5277edcc 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -1,5 +1,5 @@ - - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 72ba68c62f76..197585d95044 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -1,5 +1,5 @@ - - + + diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index 79e671455dfb..479ae19390e6 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -1,5 +1,5 @@ - - + + diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index c4923404be73..c1aae10ca46e 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -1,5 +1,5 @@ - - + + From 3e19f3f29458258214a0ffbcbd8b9cd4f2258e7b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 23 Jul 2025 13:17:03 -0700 Subject: [PATCH 004/102] Acquire wix sdk --- global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/global.json b/global.json index 3afb76cdfacb..205ff33be5c4 100644 --- a/global.json +++ b/global.json @@ -31,6 +31,7 @@ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25372.103", "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25372.103", "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.2737382" } } From 68871e0d4bd42fabbfe77ae3154a03826a77a435 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 23 Jul 2025 14:26:54 -0700 Subject: [PATCH 005/102] Fix d.b.p/t --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 4 ++-- .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 4 ++-- src/Installers/Windows/HostOptions/HostOptions.wixproj | 4 ++-- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 265c5277edcc..2ba8f2c2119b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -1,7 +1,5 @@ - - AspNetCoreModuleV2IISExpress true @@ -15,6 +13,8 @@ Win32 ARM64 $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec + + false diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 197585d95044..0adb7c5832d3 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -1,7 +1,5 @@ - - AspNetCoreModuleV2 true @@ -12,6 +10,8 @@ 2.0 true $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec + + false diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index 479ae19390e6..4a6a3cb2e968 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -1,7 +1,5 @@ - - $(HostOptionsName) $(HostOptionsName) @@ -12,6 +10,8 @@ 20248cd1-c5aa-4f42-ad88-bc260d64deea true 2.0 + + false $(HostingBundleNamespaceGuid) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index c1aae10ca46e..2f2ffb7ab734 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -1,7 +1,5 @@  - - WindowsServerHostingBundle WindowsServerHostingBundle @@ -10,6 +8,8 @@ Bundle x86 2.0 + + false $(HostingBundleNamespaceGuid) From c6351d2f91cd12b4270a25dc6ec03084a7f4db85 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 23 Jul 2025 15:19:40 -0700 Subject: [PATCH 006/102] More ordering stuff --- eng/targets/BeforeWix.Common.targets | 53 ++++++++++++++++++++++++++++ eng/targets/Wix.Common.props | 1 + eng/targets/Wix.Common.targets | 53 ---------------------------- 3 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 eng/targets/BeforeWix.Common.targets diff --git a/eng/targets/BeforeWix.Common.targets b/eng/targets/BeforeWix.Common.targets new file mode 100644 index 000000000000..21e4a44d1897 --- /dev/null +++ b/eng/targets/BeforeWix.Common.targets @@ -0,0 +1,53 @@ + + + + + + Microsoft400 + + + Microsoft400 + + + Microsoft400 + + + Microsoft400 + + + + + + + <_GeneratedPackageVersion>$(PackageVersion) + <_GeneratedPackageVersion + Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) + + $(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix) + + yes + $(ProductName) + + $(DefineConstants);Debug + $(DefineConstants);EmbedCab=$(EmbedCab) + + + + $(OutputName.Replace('-', '_')).cab + $(OutputName.Replace('_win', '')).cab + + + + en-US + $(Culture) + $(Platform) + $(OutputPath) + + $(DefineConstants);Cabinet=$(Cabinet) + $(DefineConstants);BinPath=$(OutputPath)$(Culture)\ + $(WixVariables);$(DefineConstants) + + + + + \ No newline at end of file diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index c4b9c48c2d00..9f87c65a2a78 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -10,6 +10,7 @@ + $(MSBuildThisFileDirectory)BeforeWix.Common.targets Native,Version=v0.0 $(BaseIntermediateOutputPath) diff --git a/eng/targets/Wix.Common.targets b/eng/targets/Wix.Common.targets index 72cec114582b..f4e4866c5f33 100644 --- a/eng/targets/Wix.Common.targets +++ b/eng/targets/Wix.Common.targets @@ -1,57 +1,4 @@ - - - - - - Microsoft400 - - - Microsoft400 - - - Microsoft400 - - - Microsoft400 - - - - - - - <_GeneratedPackageVersion>$(PackageVersion) - <_GeneratedPackageVersion - Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) - - $(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix) - - yes - $(ProductName) - - $(DefineConstants);Debug - $(DefineConstants);EmbedCab=$(EmbedCab) - - - - $(OutputName.Replace('-', '_')).cab - $(OutputName.Replace('_win', '')).cab - - - - en-US - $(Culture) - $(Platform) - $(OutputPath) - - $(DefineConstants);Cabinet=$(Cabinet) - $(DefineConstants);BinPath=$(OutputPath)$(Culture)\ - $(WixVariables);$(DefineConstants) - - - - - From 7b55a21336fecb4a22a5ab6332a30e08e207e7b8 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 23 Jul 2025 16:26:35 -0700 Subject: [PATCH 007/102] Get rid of superfluous import --- eng/targets/BeforeWix.Common.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/targets/BeforeWix.Common.targets b/eng/targets/BeforeWix.Common.targets index 21e4a44d1897..13220a06e971 100644 --- a/eng/targets/BeforeWix.Common.targets +++ b/eng/targets/BeforeWix.Common.targets @@ -48,6 +48,5 @@ $(WixVariables);$(DefineConstants) - \ No newline at end of file From 699e3249ec8eec0ccc73017a8821ab1ef4cdb2ce Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 23 Jul 2025 18:41:40 -0700 Subject: [PATCH 008/102] Another import removed --- eng/targets/BeforeWix.Common.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/targets/BeforeWix.Common.targets b/eng/targets/BeforeWix.Common.targets index 13220a06e971..d00478fadfdb 100644 --- a/eng/targets/BeforeWix.Common.targets +++ b/eng/targets/BeforeWix.Common.targets @@ -47,6 +47,4 @@ $(DefineConstants);BinPath=$(OutputPath)$(Culture)\ $(WixVariables);$(DefineConstants) - - \ No newline at end of file From 381647dea52709cfd727b167206867873fc84180 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 24 Jul 2025 09:14:30 -0700 Subject: [PATCH 009/102] Custom SDK import --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 4 +++- .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 4 +++- src/Installers/Windows/HostOptions/HostOptions.wixproj | 4 +++- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 2ba8f2c2119b..99d5ffd5eb79 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -1,5 +1,6 @@ - + + AspNetCoreModuleV2IISExpress true @@ -66,6 +67,7 @@ + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 0adb7c5832d3..4937f92ff959 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -1,5 +1,6 @@ - + + AspNetCoreModuleV2 true @@ -53,6 +54,7 @@ + diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index 4a6a3cb2e968..a7904818a40d 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -1,5 +1,6 @@ - + + $(HostOptionsName) $(HostOptionsName) @@ -21,6 +22,7 @@ + diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 2f2ffb7ab734..82db4003e13c 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -1,5 +1,6 @@  - + + WindowsServerHostingBundle WindowsServerHostingBundle @@ -94,6 +95,7 @@ + From 69ddc010ff280a8f5daee36fdcd7c73808dcf773 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 24 Jul 2025 10:12:39 -0700 Subject: [PATCH 010/102] Another double import --- eng/targets/Wix.Common.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index 9f87c65a2a78..fd5901787847 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -20,8 +20,6 @@ $(MSBuildToolsPath)\NuGet.targets - - From 045f46374559651f05aa95b0a3804d24c30827b1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 24 Jul 2025 12:07:26 -0700 Subject: [PATCH 011/102] Fix hint paths --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 10 +++++----- .../AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 10 +++++----- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 99d5ffd5eb79..28f8e5cea85a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -20,16 +20,16 @@ - $(WixExtDir)\WixUtilExtension.dll + $(PkgMicrosoft_WixToolset_Util_wixext)\wixext5\WixUtilExtension.dll WixUtilExtension - $(WixExtDir)\WixDependencyExtension.dll + $(PkgMicrosoft_WixToolset_Dependency_wixext)\wixext5\WixDependencyExtension.dll WixDependencyExtension - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension + + $(PkgMicrosoft_WixToolset_Bal_wixext)\wixext5\WixBalExtension.dll + WixBalExtension diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 4937f92ff959..cb353e947c44 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -17,16 +17,16 @@ - $(WixExtDir)\WixUtilExtension.dll + $(PkgMicrosoft_WixToolset_Util_wixext)\wixext5\WixUtilExtension.dll WixUtilExtension - $(WixExtDir)\WixDependencyExtension.dll + $(PkgMicrosoft_WixToolset_Dependency_wixext)\wixext5\WixDependencyExtension.dll WixDependencyExtension - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension + + $(PkgMicrosoft_WixToolset_Bal_wixext)\wixext5\WixBalExtension.dll + WixBalExtension diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 82db4003e13c..dd9b3f16dde3 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -18,15 +18,15 @@ - $(WixExtDir)\WixUtilExtension.dll + $(PkgMicrosoft_WixToolset_Util_wixext)\wixext5\WixUtilExtension.dll WixUtilExtension - $(WixExtDir)\WixDependencyExtension.dll + $(PkgMicrosoft_WixToolset_Dependency_wixext)\wixext5\WixDependencyExtension.dll WixDependencyExtension - $(WixExtDir)\WixBalExtension.dll + $(PkgMicrosoft_WixToolset_Bal_wixext)\wixext5\WixBalExtension.dll WixBalExtension From 21e8c196771a48b0503fe6d982eb6e1d0bc543e2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 24 Jul 2025 13:18:50 -0700 Subject: [PATCH 012/102] Who needs extensions? --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 15 --------------- .../AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 15 --------------- .../WindowsHostingBundle.wixproj | 15 --------------- 3 files changed, 45 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 28f8e5cea85a..d5cb846e8114 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -18,21 +18,6 @@ false - - - $(PkgMicrosoft_WixToolset_Util_wixext)\wixext5\WixUtilExtension.dll - WixUtilExtension - - - $(PkgMicrosoft_WixToolset_Dependency_wixext)\wixext5\WixDependencyExtension.dll - WixDependencyExtension - - - $(PkgMicrosoft_WixToolset_Bal_wixext)\wixext5\WixBalExtension.dll - WixBalExtension - - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index cb353e947c44..bbf5a014e7a9 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -15,21 +15,6 @@ false - - - $(PkgMicrosoft_WixToolset_Util_wixext)\wixext5\WixUtilExtension.dll - WixUtilExtension - - - $(PkgMicrosoft_WixToolset_Dependency_wixext)\wixext5\WixDependencyExtension.dll - WixDependencyExtension - - - $(PkgMicrosoft_WixToolset_Bal_wixext)\wixext5\WixBalExtension.dll - WixBalExtension - - - diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index dd9b3f16dde3..2a90482df785 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -16,21 +16,6 @@ $(HostingBundleNamespaceGuid) - - - $(PkgMicrosoft_WixToolset_Util_wixext)\wixext5\WixUtilExtension.dll - WixUtilExtension - - - $(PkgMicrosoft_WixToolset_Dependency_wixext)\wixext5\WixDependencyExtension.dll - WixDependencyExtension - - - $(PkgMicrosoft_WixToolset_Bal_wixext)\wixext5\WixBalExtension.dll - WixBalExtension - - - From f22d06fe61a8eae7279c53ae885e6009c7206207 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 24 Jul 2025 14:24:59 -0700 Subject: [PATCH 013/102] Switch target --- src/Installers/Windows/Wix.props | 2 ++ src/Installers/Windows/Wix.targets | 44 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index a95545808fc9..a9e25fa9d4e1 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -12,6 +12,8 @@ -fv ICE61 1033 + + full diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 47a17c955f7c..be1020b7ca66 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -96,28 +96,28 @@ - - - - - - - - - + + + $(IntermediateOutputPath)wixpack + $(ArtifactsNonShippingPackagesDir) + + + + + From 7f377c4733edd8af4e02748543b3743aed183bfd Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 24 Jul 2025 15:20:24 -0700 Subject: [PATCH 014/102] Remove dead switch --- src/Installers/Windows/Wix.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index a9e25fa9d4e1..b333410d883c 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -9,7 +9,6 @@ - -fv ICE61 1033 From 55ab66b206b5a7a200cff483d9c71ea4028a9853 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 25 Jul 2025 08:11:33 -0700 Subject: [PATCH 015/102] A couple StandardDirectory fixes --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 8 ++++---- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index cb0e5a0a578e..c0facc9f3079 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -197,7 +197,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -500,9 +500,9 @@ - + - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 422fe9b2153c..3273ef523fcb 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -178,7 +178,7 @@ - + @@ -189,10 +189,10 @@ - + - + @@ -250,7 +250,7 @@ - + From 343e522f148d8729d74fd2663ba8128dbd01584b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 25 Jul 2025 09:10:21 -0700 Subject: [PATCH 016/102] Small fix --- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 3273ef523fcb..cb9247fdab88 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -263,7 +263,7 @@ - + @@ -285,7 +285,7 @@ - + From f740bbd0c16ed7fef47386dd572ac75b6a7cc289 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 25 Jul 2025 10:19:41 -0700 Subject: [PATCH 017/102] Back to dir --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index c0facc9f3079..831ec7fb147b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -197,7 +197,7 @@ - + From fee654b282baf519f322893a03891f28b6a8fe17 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 25 Jul 2025 11:05:42 -0700 Subject: [PATCH 018/102] Typo --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 831ec7fb147b..779445f562c7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -226,7 +226,7 @@ - + From 7deda65493ab94f874185fdca5df84aab1e031c0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 09:44:08 -0700 Subject: [PATCH 019/102] Formatting --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 779445f562c7..2459d2f8ee19 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -500,21 +500,20 @@ - - - - + + + + - + + - - - - - - + + + + From cfa8ab72ec78ce80e947b2cd833ffba992e70fcf Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 09:50:54 -0700 Subject: [PATCH 020/102] More formatting --- .../ANCMV2/aspnetcoremodulev2.wxs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index cb9247fdab88..17f04225070e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -289,16 +289,15 @@ - + + - - - - - - + + + + From 1f28613932c4b66cc069d86d50a510ff4d6c18a6 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 10:16:26 -0700 Subject: [PATCH 021/102] No var. --- .../Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index f925a8cc639f..2f9e21eedb48 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + From b8fc724686e03e30486cda5b9261b97140dc08f0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 10:50:52 -0700 Subject: [PATCH 022/102] Platform -> InstallerPlatform --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 32 +++++++++---------- .../ANCMV2/aspnetcoremodulev2.wxs | 26 +++++++-------- .../IIS-Setup/include.wxi | 6 ++-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 2459d2f8ee19..44753619db8e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -29,15 +29,15 @@ - + - - + + @@ -92,21 +92,21 @@ - + - + - + - + @@ -141,7 +141,7 @@ - + @@ -153,14 +153,14 @@ - + - + @@ -169,7 +169,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -234,14 +234,14 @@ - + - + @@ -334,7 +334,7 @@ - + @@ -451,7 +451,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 17f04225070e..264fe7cdef8c 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -22,12 +22,12 @@ - + - - + + @@ -62,12 +62,12 @@ - + - + @@ -91,13 +91,13 @@ - + - + @@ -134,7 +134,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -210,13 +210,13 @@ - + - + @@ -227,7 +227,7 @@ - + @@ -253,7 +253,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index 2f9e21eedb48..1079f8b23116 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + From f43f04d93ba43692f864dbe342037e882b10e3e8 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 11:41:05 -0700 Subject: [PATCH 023/102] No StandardDirectory --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 44753619db8e..3dd95d607f62 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -197,7 +197,7 @@ - + From 484247b1477a959fc210731abdcb2e357d8958cc Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 12:41:20 -0700 Subject: [PATCH 024/102] Fixups --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 3 ++- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 3 ++- .../Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 3dd95d607f62..e5b9172b272b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -41,7 +41,8 @@ - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 264fe7cdef8c..b9bc72fab247 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -31,7 +31,8 @@ - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index 1079f8b23116..68413cffbba3 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + From f2d61eb52e232e758d07a4b0164d84e63f105bb8 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 13:46:14 -0700 Subject: [PATCH 025/102] Remove unneeded compiles --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 1 - .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 1 - src/Installers/Windows/HostOptions/HostOptions.wixproj | 4 ---- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 ---- 4 files changed, 10 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index d5cb846e8114..2112d40c147d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -19,7 +19,6 @@ - iisca.wxs diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index bbf5a014e7a9..369aed319d8e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -16,7 +16,6 @@ - iisca.wxs diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index a7904818a40d..ba5ccb0e2423 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -18,10 +18,6 @@ $(HostingBundleNamespaceGuid) - - - - diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 2a90482df785..51f96f10fbc1 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -18,10 +18,6 @@ - - - - From 34a1c5b1e6bd0df9db9f7130c816095a563eb0ad Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 14:41:16 -0700 Subject: [PATCH 026/102] Set Scope --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 4 +--- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index e5b9172b272b..6816e8158599 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -41,7 +41,7 @@ - + @@ -62,8 +62,6 @@ - - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index b9bc72fab247..0a81ca562836 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -31,7 +31,7 @@ - + @@ -72,8 +72,6 @@ - - From 382e24cbb2ece6ff02056b085c72620612d11d67 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 16:09:43 -0700 Subject: [PATCH 027/102] Ref --- .../ANCMV2/aspnetcoremodulev2.wxs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 0a81ca562836..9fb5bd9c1fab 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -118,23 +118,23 @@ - + - + - + - + - + @@ -143,7 +143,7 @@ - + From c1bd15934b9ce5a0c3d0ded08d3e47e80d114f53 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 17:19:01 -0700 Subject: [PATCH 028/102] Modularize it --- .../IIS-Setup/iisca/wix/iisca.wxs | 32 +++++++++---------- .../IIS-Setup/iisca/wix5/iisca.wxs | 24 +++++++------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs index 1d2a0e7aca98..d2941576dad0 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs @@ -24,7 +24,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -49,13 +49,13 @@ - - + + - + @@ -65,21 +65,21 @@ - - + + - - + + - - + + @@ -87,7 +87,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -176,7 +176,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs index 3e8c41778b6b..208a5375d894 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs @@ -23,7 +23,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -48,13 +48,13 @@ - - + + - + @@ -64,21 +64,21 @@ - - + + - - + + - - + + @@ -86,7 +86,7 @@ - + From bf6489d975b24bd5c5206bf579e91ed9754c17bc Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 19:59:23 -0700 Subject: [PATCH 029/102] Casing --- .../IIS-Setup/iisca/wix/iisca.wxs | 32 +++++++++---------- .../IIS-Setup/iisca/wix5/iisca.wxs | 24 +++++++------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs index d2941576dad0..8c52809043d0 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix/iisca.wxs @@ -24,7 +24,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -49,13 +49,13 @@ - - + + - + @@ -65,21 +65,21 @@ - - + + - - + + - - + + @@ -87,7 +87,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -176,7 +176,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs index 208a5375d894..557b3cd44c2a 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/iisca.wxs @@ -23,7 +23,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -48,13 +48,13 @@ - - + + - + @@ -64,21 +64,21 @@ - - + + - - + + - - + + @@ -86,7 +86,7 @@ - + From fd65c7d6bb7e0c8dc85fc7d1eb314b3ad424a07c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 20:47:49 -0700 Subject: [PATCH 030/102] No Var for artifactsdir --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 20 +++++++++---------- .../ANCMV2/aspnetcoremodulev2.wxs | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 6816e8158599..0e667e0e8ec2 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -31,13 +31,13 @@ - - + + - - + + @@ -141,7 +141,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -211,7 +211,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 9fb5bd9c1fab..0f67e4d5d093 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -23,11 +23,11 @@ - - + + - - + + @@ -197,7 +197,7 @@ - + @@ -210,14 +210,14 @@ - + - + @@ -228,7 +228,7 @@ - + @@ -267,7 +267,7 @@ - + @@ -277,7 +277,7 @@ - + From 058cec6251f808dd8853e66130f36b09a9a06a12 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 5 Aug 2025 21:39:07 -0700 Subject: [PATCH 031/102] Set GUID --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 0e667e0e8ec2..570704fae7fa 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -509,7 +509,7 @@ - + From ba57e4e070a6a4603b906d400c6f92b4616f8563 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 6 Aug 2025 08:35:14 -0700 Subject: [PATCH 032/102] Move the component into the feature --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 570704fae7fa..c2ceb639efc0 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -506,12 +506,10 @@ - + + + - - - - From 93beadb90524882f6a6059e59654f7684ce2e347 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 6 Aug 2025 12:54:41 -0700 Subject: [PATCH 033/102] Generate GUIDs for ANCM DepProviders --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 6 ++++++ .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 6 ++---- .../AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 6 ++++++ .../ANCMV2/aspnetcoremodulev2.wxs | 6 ++---- src/Installers/Windows/Wix.props | 1 + src/Installers/Windows/Wix.targets | 10 ++++++++++ 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 2112d40c147d..12af62430013 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -18,6 +18,12 @@ false + + IISExpress_AspNetCore_Module_V2,x86 + IISExpress_AspNetCore_Module_V2,x64 + $(DefineConstants);ANCMDepProviderKey=$(ANCMDepProviderKey) + + iisca.wxs diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index c2ceb639efc0..c4c8ed7e3722 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -8,10 +8,8 @@ - - @@ -506,8 +504,8 @@ - - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 369aed319d8e..accdeb9b4e95 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -15,6 +15,12 @@ false + + IIS_AspNetCore_Module_V2,x86 + IIS_AspNetCore_Module_V2,x64 + $(DefineConstants);ANCMDepProviderKey=$(ANCMDepProviderKey) + + iisca.wxs diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 0f67e4d5d093..682e26d3eb5d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -8,10 +8,8 @@ - - @@ -293,8 +291,8 @@ - - + + diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index b333410d883c..a78c6e27883b 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -22,6 +22,7 @@ E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E C43D5520-11B3-4D62-B6FE-5D6840B04101 + EC59D6F5-B7E6-4E46-A617-EC8329960614 diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index be1020b7ca66..8f7c8a9f21c1 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -82,6 +82,16 @@ + + + + + + + $(DefineConstants);DepProviderGuid=$(DepProviderGuid) + + + From 0e8e279d43e07797416002ea77d95af0769d9a51 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 6 Aug 2025 15:42:01 -0700 Subject: [PATCH 034/102] Cheeky workaround --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 2 +- .../Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index c4c8ed7e3722..303cbfbccdbf 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -194,7 +194,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index 68413cffbba3..68248343d959 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -13,6 +13,7 @@ + @@ -31,6 +32,7 @@ + From d3fd491f8b73ef06e4ff266623252cc463327b3e Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 7 Aug 2025 08:14:49 -0700 Subject: [PATCH 035/102] Revert "Cheeky workaround" This reverts commit 0e8e279d43e07797416002ea77d95af0769d9a51. --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 2 +- .../Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 303cbfbccdbf..c4c8ed7e3722 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -194,7 +194,7 @@ - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index 68248343d959..68413cffbba3 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -13,7 +13,6 @@ - @@ -32,7 +31,6 @@ - From 4479321252a32e9e6e7f46c6e292012ea111614f Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 11 Aug 2025 15:52:10 -0700 Subject: [PATCH 036/102] Some formatting --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 156 +++++++++--------- 1 file changed, 77 insertions(+), 79 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index c4c8ed7e3722..4077a24530c6 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -131,101 +131,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + + + + + + - + + + + + - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - + + From e78c655d5a96a31c073f59d8175ca196b560bc72 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 11 Aug 2025 15:55:35 -0700 Subject: [PATCH 037/102] NoWarn --- .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index accdeb9b4e95..9761e32b4d1c 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -13,6 +13,8 @@ $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec false + + $(NoWarn);WIX5437 From d5342d28c4ba004c4237cd888381b964f0f918d7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 11 Aug 2025 16:47:35 -0700 Subject: [PATCH 038/102] Fix nowarn --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 ++ .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 12af62430013..827f342e9e5d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -16,6 +16,8 @@ $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec false + + $(NoWarn);WIX5437 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 9761e32b4d1c..accdeb9b4e95 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -13,8 +13,6 @@ $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec false - - $(NoWarn);WIX5437 From f2974412a9d0bd0398df3e3641e3ab91ecc1071a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Aug 2025 09:22:08 -0700 Subject: [PATCH 039/102] Suppress StandardDirectory warning --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 827f342e9e5d..ae23d6347d9e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -17,7 +17,7 @@ false - $(NoWarn);WIX5437 + 5437 From 254ae863098e50837109d190d00aa9c52d4e492c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Aug 2025 10:13:05 -0700 Subject: [PATCH 040/102] Temporarily disable wixpack generation, see what explodes --- src/Installers/Windows/Wix.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 8f7c8a9f21c1..cfa568098e64 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -106,7 +106,7 @@ - + $(IntermediateOutputPath)wixpack $(ArtifactsNonShippingPackagesDir) From 39ac32a05e90c5bf11c3242be3ac0459d60e0bd7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Aug 2025 11:50:08 -0700 Subject: [PATCH 041/102] Cleanup for nupkg script --- eng/targets/BeforeWix.Common.targets | 8 -------- .../ANCMIISExpressV2/AncmIISExpressV2.nuspec | 1 - .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 1 - .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.nuspec | 1 - .../Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 1 - src/Installers/Windows/GenerateNugetPackageWithMsi.ps1 | 3 +-- src/Installers/Windows/Wix.targets | 6 +++++- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/eng/targets/BeforeWix.Common.targets b/eng/targets/BeforeWix.Common.targets index d00478fadfdb..5145e2ae943b 100644 --- a/eng/targets/BeforeWix.Common.targets +++ b/eng/targets/BeforeWix.Common.targets @@ -17,14 +17,6 @@ - - - <_GeneratedPackageVersion>$(PackageVersion) - <_GeneratedPackageVersion - Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) - - $(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix) - yes $(ProductName) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec index fada190bc386..2ca3afbd2458 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.nuspec @@ -16,7 +16,6 @@ - \ No newline at end of file diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index ae23d6347d9e..b12339bf63fa 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -76,7 +76,6 @@ - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index accdeb9b4e95..15805dc5d15b 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -61,7 +61,6 @@ $(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels) @@ -106,7 +110,7 @@ - + $(IntermediateOutputPath)wixpack $(ArtifactsNonShippingPackagesDir) From 295818e75a04b7fa5e22afdd773b3fce44f6310a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Aug 2025 11:50:44 -0700 Subject: [PATCH 042/102] Disable wixpack for testing --- src/Installers/Windows/Wix.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index e67c1c64caae..ecc1328f2d0f 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -110,7 +110,7 @@ - + $(IntermediateOutputPath)wixpack $(ArtifactsNonShippingPackagesDir) From a38d854704e1365f9deed96b2e9359dd5e8f801a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Aug 2025 12:43:47 -0700 Subject: [PATCH 043/102] StandardDir --- src/Installers/Windows/HostOptions/Product.wxs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Installers/Windows/HostOptions/Product.wxs b/src/Installers/Windows/HostOptions/Product.wxs index 74db545ca475..2ce507b46a7d 100644 --- a/src/Installers/Windows/HostOptions/Product.wxs +++ b/src/Installers/Windows/HostOptions/Product.wxs @@ -31,12 +31,12 @@ - - - - + + + - + + From 9979d196502433eb6bfa0d750e43fd9e71d6c7de Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Aug 2025 13:28:09 -0700 Subject: [PATCH 044/102] Wixpack again --- src/Installers/Windows/HostOptions/Product.wxs | 1 - src/Installers/Windows/Wix.targets | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Installers/Windows/HostOptions/Product.wxs b/src/Installers/Windows/HostOptions/Product.wxs index 2ce507b46a7d..2fd1f74729a5 100644 --- a/src/Installers/Windows/HostOptions/Product.wxs +++ b/src/Installers/Windows/HostOptions/Product.wxs @@ -2,7 +2,6 @@ - diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index ecc1328f2d0f..e67c1c64caae 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -110,7 +110,7 @@ - + $(IntermediateOutputPath)wixpack $(ArtifactsNonShippingPackagesDir) From aea3ead60b04dd6ea6dda0ce047c735142122b5d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 12 Aug 2025 13:33:33 -0700 Subject: [PATCH 045/102] Fix upgrade policy --- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 51f96f10fbc1..b4c5b610a31a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -18,7 +18,7 @@ - + From 3e7a5cfe6199e6d30ecef8a6998d6caad2d15627 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 13 Aug 2025 11:44:08 -0700 Subject: [PATCH 046/102] Temporarily update Arcade --- eng/Version.Details.props | 14 +++++++------- eng/Version.Details.xml | 14 +++++++------- global.json | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index dec8cb2c5379..d336130d7fea 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -10,13 +10,13 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25377.103 10.0.0-preview.7.25377.103 10.0.0-preview.7.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 - 10.0.0-beta.25377.103 + 10.0.0-beta.25413.1 + 10.0.0-beta.25413.1 + 10.0.0-beta.25413.1 + 10.0.0-beta.25413.1 + 10.0.0-beta.25413.1 + 10.0.0-beta.25413.1 + 10.0.0-beta.25413.1 10.0.0-rc.1.25377.103 10.0.0-rc.1.25377.103 10.0.0-rc.1.25377.103 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b432d69f2ed..59f43e6e4ae6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -362,31 +362,31 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 diff --git a/global.json b/global.json index 2f96e12e9a81..3ff1c4af6e88 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25377.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25413.1", "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25377.103", "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25377.103", "Microsoft.Build.NoTargets": "3.7.0", From ce6b30bbfe0afdd70dab2c2983df1d53c12d0e08 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 13 Aug 2025 12:38:34 -0700 Subject: [PATCH 047/102] Fix prop name --- eng/targets/Wix.Common.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index fd5901787847..ec91b845e808 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -5,7 +5,7 @@ 2.0 3.14 $(MicrosoftSignedWixVersion) - $(MicrosoftWixToolsetVersion) + $(MicrosoftWixToolsetSdkVersion) true @@ -26,13 +26,13 @@ - + - - - - - + + + + + From ef9531e32b30ee1e135531043f70236f1ace2b9a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 13 Aug 2025 13:18:05 -0700 Subject: [PATCH 048/102] New params --- src/Installers/Windows/Wix.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index e67c1c64caae..9e0833871ac5 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -129,6 +129,8 @@ PdbFile="$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" PdbType="$(DebugType)" SourceFiles="@(Compile)" + LocalizationFiles="@(_WixLocalizationFile)" + BindPaths="@(BindPath)" WixpackWorkingDir="$(WixpackWorkingDir)"> From e058292b97c9c96e380190ffa71756111cab1d86 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 13 Aug 2025 14:00:03 -0700 Subject: [PATCH 049/102] Remove dupes --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 8820a4d12974..8ab8609d2f88 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -2,7 +2,6 @@ - @@ -41,12 +40,6 @@ - - - - - - From 1cd8b46b8e1e956567631932474fbe276122128c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 13 Aug 2025 14:46:55 -0700 Subject: [PATCH 050/102] Exclude wxl's --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 2 +- .../Windows/WindowsHostingBundle/{ => LCID}/1028/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1029/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1031/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1033/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1036/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1040/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1041/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1042/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1045/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1046/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1049/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/1055/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/2052/thm.wxl | 0 .../Windows/WindowsHostingBundle/{ => LCID}/3082/thm.wxl | 0 .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 5 +++++ 16 files changed, 6 insertions(+), 1 deletion(-) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1028/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1029/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1031/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1033/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1036/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1040/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1041/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1042/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1045/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1046/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1049/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/1055/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/2052/thm.wxl (100%) rename src/Installers/Windows/WindowsHostingBundle/{ => LCID}/3082/thm.wxl (100%) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 8ab8609d2f88..e0ffe08e9001 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -1,7 +1,7 @@  - + diff --git a/src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1028/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1028/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1029/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1029/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1031/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1031/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1033/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1036/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1036/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1040/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1040/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1041/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1041/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1042/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1042/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1045/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1045/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1046/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1046/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1049/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1049/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/1055/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/1055/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/2052/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/2052/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/3082/thm.wxl rename to src/Installers/Windows/WindowsHostingBundle/LCID/3082/thm.wxl diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b4c5b610a31a..11c5db2063e2 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -14,6 +14,11 @@ $(HostingBundleNamespaceGuid) + + + $(DefaultItemExcludes);LCID\**\* From d91a20249a6e5e72f91c7d167540c2a4becfe768 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 13 Aug 2025 15:34:12 -0700 Subject: [PATCH 051/102] No var. --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index e0ffe08e9001..8e3be2b98792 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -11,13 +11,13 @@ - + - + @@ -59,7 +59,7 @@ - + From 3c4c0fa979d284e3d6972aae403cbe8de82b6d8d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 13 Aug 2025 15:39:52 -0700 Subject: [PATCH 052/102] Split ifs --- .../Windows/WindowsHostingBundle/Bundle.wxs | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 8e3be2b98792..6b3147e6bf21 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -17,27 +17,29 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + From d523d45bb36cf68ea1f47298fb9f0abd6e47353f Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 14 Aug 2025 10:14:10 -0700 Subject: [PATCH 053/102] Set BindName --- .../Windows/WindowsHostingBundle/Bundle.wxs | 33 ------------------- .../WindowsHostingBundle.wixproj | 7 ++++ 2 files changed, 7 insertions(+), 33 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 6b3147e6bf21..f345ca85b607 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -9,39 +9,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 11c5db2063e2..f0bd7592893d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -30,6 +30,7 @@ Platform=x86 AspNetCoreModuleV2_x86 + AspNetCoreModuleV2_x86 f9bacb48-3bd7-4ec2-ae31-664e8703ec12 True true @@ -37,6 +38,7 @@ Platform=x64 AspNetCoreModuleV2_x64 + AspNetCoreModuleV2_x64 f9bacb48-3bd7-4ec2-ae31-664e8703ec12 True true @@ -44,12 +46,14 @@ Platform=arm64 AspNetCoreModuleV2_arm64 + AspNetCoreModuleV2_arm64 f9bacb48-3bd7-4ec2-ae31-664e8703ec12 True true HostOptions + HostOptions 20248cd1-c5aa-4f42-ad88-bc260d64deea True True @@ -62,18 +66,21 @@ Platform=x86 AspNetCoreModuleV2IISExpress_x86 + AspNetCoreModuleV2IISExpress_x86 True true Platform=x64 AspNetCoreModuleV2IISExpress_x64 + AspNetCoreModuleV2IISExpress_x64 True true Platform=arm64 AspNetCoreModuleV2IISExpress_arm64 + AspNetCoreModuleV2IISExpress_arm64 True true From d17879f56d74d298879baaab4bee18a24d96057d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 15 Aug 2025 08:56:40 -0700 Subject: [PATCH 054/102] Manual arcade bump --- eng/Version.Details.props | 14 +++++++------- eng/Version.Details.xml | 14 +++++++------- global.json | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1b7b6f3dcebb..048b0b6f31b2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -10,13 +10,13 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25414.101 10.0.0-rc.1.25414.101 10.0.0-rc.1.25414.101 - 10.0.0-beta.25414.101 - 10.0.0-beta.25414.101 - 10.0.0-beta.25414.101 - 10.0.0-beta.25414.101 - 10.0.0-beta.25414.101 - 10.0.0-beta.25414.101 - 10.0.0-beta.25414.101 + 10.0.0-beta.25414.2 + 10.0.0-beta.25414.2 + 10.0.0-beta.25414.2 + 10.0.0-beta.25414.2 + 10.0.0-beta.25414.2 + 10.0.0-beta.25414.2 + 10.0.0-beta.25414.2 10.0.0-rc.1.25414.101 10.0.0-rc.1.25414.101 10.0.0-rc.1.25414.101 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e4982828625..9ce37583d71e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -362,31 +362,31 @@ https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e - + https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e - + https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e - + https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e - + https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e - + https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e - + https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e - + https://github.com/dotnet/dotnet 992b076e9bc005baa97d3de57dccfa739b50f82e diff --git a/global.json b/global.json index ca02a2551379..ca5dda9eadb5 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.2", "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25414.101", "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25414.101", "Microsoft.Build.NoTargets": "3.7.0", From 416fcedd451738d869d357406f6850457989f591 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 15 Aug 2025 12:48:55 -0700 Subject: [PATCH 055/102] Add payloads --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index f345ca85b607..8989c2523b25 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -1,7 +1,11 @@  - + + + + + From ef60e85a6fda716625f4368eb844c95157261df6 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Sat, 23 Aug 2025 08:27:26 -0700 Subject: [PATCH 056/102] Rename file --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 4 ++-- .../Windows/WindowsHostingBundle/{thm.xml => bundle.thm} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename src/Installers/Windows/WindowsHostingBundle/{thm.xml => bundle.thm} (100%) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 8989c2523b25..a8cf294b09ed 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -1,9 +1,9 @@  - + - + diff --git a/src/Installers/Windows/WindowsHostingBundle/thm.xml b/src/Installers/Windows/WindowsHostingBundle/bundle.thm similarity index 100% rename from src/Installers/Windows/WindowsHostingBundle/thm.xml rename to src/Installers/Windows/WindowsHostingBundle/bundle.thm From b04bc070187148fef9cd95cf7afa7ebfb81544bc Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Sun, 24 Aug 2025 09:06:48 -0700 Subject: [PATCH 057/102] Update ref --- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index f0bd7592893d..b3dc5c5878b2 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -22,7 +22,7 @@ - + From fc5a2efaae7b7680e6f19667d07346541293bed9 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 26 Aug 2025 08:42:20 -0700 Subject: [PATCH 058/102] Update theme --- .../Windows/WindowsHostingBundle/Bundle.wxs | 2 +- .../WindowsHostingBundle/DotNetLogo.bmp | Bin 12342 -> 0 bytes .../Windows/WindowsHostingBundle/bundle.thm | 143 +++++++++--------- 3 files changed, 76 insertions(+), 69 deletions(-) delete mode 100644 src/Installers/Windows/WindowsHostingBundle/DotNetLogo.bmp diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index a8cf294b09ed..a291fc9033bc 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/Installers/Windows/WindowsHostingBundle/DotNetLogo.bmp b/src/Installers/Windows/WindowsHostingBundle/DotNetLogo.bmp deleted file mode 100644 index 6299d4e8cd3632811705969c0253f7f6f0388c23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12342 zcmeI0e@qi+7{}S4W{a8GoPY>apkSHFmKa=&qF`GJ9HkJ`E%8U33(*ny*f2*D^SQE|e=chB8h&bzlz2_e-b@8!A6 z-SfWh^M3C8{jEz0^JMn1COngQpU(D_D8EZo5X<=5uo6FXvJgv=6ZQ~|00Re&l$ z6`%@G1*ig40jdC1fGR*0pbAh0UYP<0n}ALEk0RWo6yclj3W_KEhG+|qxK6l#1|A5N z#;}QIZjo6ED+l){TYL#dUSAaQ5MlLzg*BWWEW|L?JG8S-5Bb=dCz0p zBfSDNNht`F)pqvY?c{HE34Mxn2W|z#e&R}TUE&MK(z1R>x1r2;WD(__{k8EjmVrKjeMSWwQ(VgmobA0CN+-98P! z!RAje2CL6N(ZdlyL(b1?75=`8Z^3hA+i~vAEO!2C#kd7)BzQbCWjx@2GB*AQ_%mmN zA7TQS&Vu2w{*&^wle^-=Y~`ZSYscFD>d_(hRxd65MmL?wz~*KjP;ztiD7uthnb0wPuvS zlpdOb-?8JQIDeIpWL8YQ^Wbrb{`}$IUeVVc1i{5Gf8Z00+(P42{OoT{ZHF7$zy1ZA z_q+3+4?iJZA=>;&d2O3(0DhqNc1LUuEXD}@P>nbmZIyvE%_ba8enDqxPhrNMqkj={ zFW)4{BoX*qf4t-HvH}RGVj%*ROx>N4<^BAZf7f0w0%yCvXIQ$L_j7 zT#lGhpcnxkO@5Bq0jUMRkKDO0&76sEeFT1a|9@Tf&$hhsN5hYS-&?wem-B>|>i=5t zyBl2q-*@p(-vVjbVtBYl(BHB1d-1(&AvsSm5ob`42TnM-ImHGV;8_3~+M5`&*NNj)+_`T<@w0u$Ltf~*$fwRu_2gM|_*SfpqPy=>0 zZ9g$OHa><>%l@C7m8T`=fwQhnhlN>s1>nE!PKk%q~c zS~v+j4hZvkalSgM7t*a#lQ0wIoLopR3NO-laJ8Ay(pFRfssL4hDnJ#W3Qz^80#pI2 S09Al0Koy`0Pz7c~f&TzpGBKV2 diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index 58272a54a35e..5e61f6357059 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -1,74 +1,81 @@  - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + #(loc.Title) + #(loc.SubTitle) - - #(loc.HelpHeader) - #(loc.HelpText) - - - - #(loc.Welcome) - #(loc.InstallResetIIS) - #(loc.InstallNoIIS) - #(loc.EulaPrivacy) - #(loc.InstallAcceptCheckbox) - - - - - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - + + #(loc.HelpHeader) + #(loc.HelpText) + + + + #(loc.Welcome) + #(loc.InstallResetIIS) + #(loc.InstallNoIIS) + #(loc.EulaPrivacy) + #(loc.InstallAcceptCheckbox) + + + + + #(loc.FilesInUseHeader) + #(loc.FilesInUseLabel) + - - + + - - - - - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - - - #(loc.ModifyHeader) - #(loc.ModifyResetIIS) - #(loc.ModifyNoIIS) - - - - - - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - - - - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - - + + + + + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + + + + #(loc.ModifyHeader) + #(loc.ModifyResetIIS) + #(loc.ModifyNoIIS) + + + + + + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) + + #(loc.SuccessRestartText) + + + + + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + + + From d9515b33e5cdd8922a33b1c1965e65221d40b9cc Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 26 Aug 2025 08:42:36 -0700 Subject: [PATCH 059/102] Add files --- .../WindowsHostingBundle/DotNetLogo_256x.png | Bin 0 -> 2154 bytes .../Windows/WindowsHostingBundle/dotnet.ico | Bin 0 -> 45150 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Installers/Windows/WindowsHostingBundle/DotNetLogo_256x.png create mode 100644 src/Installers/Windows/WindowsHostingBundle/dotnet.ico diff --git a/src/Installers/Windows/WindowsHostingBundle/DotNetLogo_256x.png b/src/Installers/Windows/WindowsHostingBundle/DotNetLogo_256x.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff052f8302a4b7f87cd646c4534d7559e282574 GIT binary patch literal 2154 zcmeHJ>pL4*8b66hgl465N~FZO1uiLq z5s%!A(qL)#>XOdO_GgD#HYQlQRjDrDV@MNSoYQ*ZSpf)RbP%vB0p1u0iwp%K82B0q zVCKNc0ic8bNc>KTHsv*&(^QzWU6_BKA>j&j+9%mBpRYNPR`c0X!XrEqSfXmERz!}+*5Y^>L&&8P~qpc2t;rhxNkat zL%8#--ne!@iyp^Z3HZEg?H)7`Ca*k|o4fa_Y~(b7E^aDn+a z*(y#QUw6ZslDy2$zqV?~x{2Yg$8&?Rrh& z`VL;$I7J1U^RlM0v)BsM)FE7lU4Ur`tf$^aXCa-V>aKGj8#lmgJ=1QHiy|N?Se6%> zTTPJZX%>H9>}{UDsIkiN2`MzADsf5;S_^P?XUe(M7~X(6prUUIW3#) z{9CcJwe})APa>KzR*OIG^P0JXoa6v~&07HPBRFs_o1+n%3RZd96vY2Kp zxKfm+Z`O=;Q%Ut6b5-amM-@Y9EYLoBHF$~&)S=*fLt_6X>S5S(NPD}x6{c&UcU-Qh z&cw?9WnmijKAcq3<<|8wqgi1|vx+*l=6R?B?5n}}&s>Cb!W6D8|>w$RC22TwIY zqzdDMH5o`uUMH!5jUvY(`|c|1yvOG9BydbCj2zG`&b##Ip(AFj{q2X$TSx`dI9B#i zaFmy>8qo{x1hEV+a~^yS$E3l?`(|z<={=TeUocdA2Z=k&MRV+a#-mxTsr2JyEGyd% zB#!?#aA0c$?(zPxB@SYFR8Pe>;C6JGt72{%SS7nTLNSm_l^!uJhVw2ME4`zUw`z^B z;TEtr&BPKzNXgw3_OmoBNcIB`4U&TwFedJE=vVUo8zTFuh$Q_R&y7$RoU9+nTq@x? zN)`*b!^z^bq7^B;{IksVK7463PgjmxN~^A#7A<(3x>Ku&E*l>pvcn?cVUM{zN zbA)Lh264q!^&QvR{ATL%;H5s{^WjO?1kz>qutzqmmFB(so!GPuO5|=o38&Wsrw=AX zZcI+99tcykwFxD)jfjVmP~KV3B;f=nY`A0EXP-l=!{31>*DWM+@XZS6`mVCE0wi%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: Tue, 26 Aug 2025 10:40:38 -0700 Subject: [PATCH 060/102] Fixup --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index a291fc9033bc..17c4d847807d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -1,11 +1,12 @@  - + + From da62b97ffc4a27b33e1d882e400740ae62fafc6c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 27 Aug 2025 10:03:10 -0700 Subject: [PATCH 061/102] Shorter name --- src/Installers/Windows/Wix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index a78c6e27883b..4e5d17aecedf 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -17,7 +17,7 @@ false - WindowsServerHostingBundleOptions + Options E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E From 67761f36f14b7b503a6fef3b929ea14c0fb3a807 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 28 Aug 2025 13:23:56 -0700 Subject: [PATCH 062/102] Try no options --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 17c4d847807d..b086ae4328ab 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -46,13 +46,6 @@ - - - - - - - From acc5a6e0f8766f3dc60f7ef22791de8e468a146b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 10:59:37 -0700 Subject: [PATCH 063/102] Upload unsigned bundle --- .azure/pipelines/ci.yml | 2 ++ .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 7c968f353eef..0d0e58dd64ba 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -277,6 +277,8 @@ extends: path: artifacts/bin/ANCMv2 - name: Windows_ANCMIISExpress_Msi path: artifacts/bin/AncmIISExpressV2 + - name: Windows_Unsigned_Bundle + path: artifacts/DontSignMe/ # Build MacOS arm64 - template: .azure/pipelines/jobs/default-build.yml@self diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b3dc5c5878b2..d4654bbff389 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -93,6 +93,7 @@ dotnet-hosting-$(PackageVersion)-win$(TargetExt) + dotnet-hosting-unsigned-$(PackageVersion)-win$(TargetExt) Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) @@ -167,4 +168,9 @@ $(DefineConstants);SharedFxRedistInstallerarm64=$(SharedFxRedistInstallerarm64) + + + + From 924f19fd8cb506b086e632e0b50f15f39fa57c00 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 14:13:27 -0700 Subject: [PATCH 064/102] Revert "Upload unsigned bundle" This reverts commit acc5a6e0f8766f3dc60f7ef22791de8e468a146b. --- .azure/pipelines/ci.yml | 2 -- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 6 ------ 2 files changed, 8 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 0d0e58dd64ba..7c968f353eef 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -277,8 +277,6 @@ extends: path: artifacts/bin/ANCMv2 - name: Windows_ANCMIISExpress_Msi path: artifacts/bin/AncmIISExpressV2 - - name: Windows_Unsigned_Bundle - path: artifacts/DontSignMe/ # Build MacOS arm64 - template: .azure/pipelines/jobs/default-build.yml@self diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index d4654bbff389..b3dc5c5878b2 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -93,7 +93,6 @@ dotnet-hosting-$(PackageVersion)-win$(TargetExt) - dotnet-hosting-unsigned-$(PackageVersion)-win$(TargetExt) Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) @@ -168,9 +167,4 @@ $(DefineConstants);SharedFxRedistInstallerarm64=$(SharedFxRedistInstallerarm64) - - - - From d330209836d31fe502ebc378adcf5dc42694008a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 14:13:40 -0700 Subject: [PATCH 065/102] Revert "Try no options" This reverts commit 67761f36f14b7b503a6fef3b929ea14c0fb3a807. --- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index b086ae4328ab..17c4d847807d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -46,6 +46,13 @@ + + + + + + + From 1670598be0f8affd0398116353fdd15bc2c14ff9 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 14:14:39 -0700 Subject: [PATCH 066/102] Revert "Shorter name" This reverts commit da62b97ffc4a27b33e1d882e400740ae62fafc6c. --- src/Installers/Windows/Wix.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index 4e5d17aecedf..a78c6e27883b 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -17,7 +17,7 @@ false - Options + WindowsServerHostingBundleOptions E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E From fcf1b51ef24c5482229eb5c7538848a2694b4a81 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 14:33:26 -0700 Subject: [PATCH 067/102] Don't rename it --- src/Installers/Windows/HostOptions/HostOptions.wixproj | 6 +++--- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 ++-- src/Installers/Windows/Wix.props | 2 +- src/Installers/Windows/Wix.targets | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index ba5ccb0e2423..57c68ce5fdab 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -2,11 +2,9 @@ - $(HostOptionsName) - $(HostOptionsName) Package Microsoft ASP.NET Core Hosting Bundle Options - AspNetCore.HostOptions + $(HostOptionsNameProductNameShort) x86 20248cd1-c5aa-4f42-ad88-bc260d64deea true @@ -23,6 +21,8 @@ dotnet-hosting-options-$(PackageVersion)-win$(TargetExt) + $(PackageFileName) + $(PackageFileName) Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b3dc5c5878b2..b583538317eb 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -2,8 +2,6 @@ - WindowsServerHostingBundle - WindowsServerHostingBundle true 6F1B115C-1903-40CB-837D-7961AB610F4E Bundle @@ -93,6 +91,8 @@ dotnet-hosting-$(PackageVersion)-win$(TargetExt) + $(PackageFileName) + $(PackageFileName) Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index a78c6e27883b..8d0bdb65342b 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -17,7 +17,7 @@ false - WindowsServerHostingBundleOptions + AspNetCore.HostOptions E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index a22c37cc7617..04dc3a599d3d 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -48,17 +48,17 @@ - + - + - + - + From da99fb6db21e47eaccc7ad746cd5134951ea47bf Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 16:13:41 -0700 Subject: [PATCH 068/102] Try this --- src/Installers/Windows/HostOptions/HostOptions.wixproj | 5 ++++- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index 57c68ce5fdab..f6da458666fb 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -20,9 +20,12 @@ - dotnet-hosting-options-$(PackageVersion)-win$(TargetExt) + dotnet-hosting-options-$(PackageVersion)-win + $(TargetName)$(TargetExt) $(PackageFileName) $(PackageFileName) + $(PackageFileName) + $(TargetName).wixpdb Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b583538317eb..ecfb0150e53f 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -90,9 +90,12 @@ - dotnet-hosting-$(PackageVersion)-win$(TargetExt) + dotnet-hosting-$(PackageVersion)-win + $(TargetName)$(TargetExt) $(PackageFileName) $(PackageFileName) + $(PackageFileName) + $(TargetName).wixpdb Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) From c5206c7609bc6996515f76b42db09fbd4332d86e Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 16:55:28 -0700 Subject: [PATCH 069/102] More --- src/Installers/Windows/HostOptions/HostOptions.wixproj | 1 + .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index f6da458666fb..e598bb7b44a7 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -25,6 +25,7 @@ $(PackageFileName) $(PackageFileName) $(PackageFileName) + $(PackageFileName) $(TargetName).wixpdb Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index ecfb0150e53f..d39a61b34cb3 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -95,6 +95,7 @@ $(PackageFileName) $(PackageFileName) $(PackageFileName) + $(PackageFileName) $(TargetName).wixpdb Microsoft .NET $(PackageBrandingVersion) From 41db66d06cbacecac8dce1169c09686a10333c6d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 17:38:02 -0700 Subject: [PATCH 070/102] Revert "More" This reverts commit c5206c7609bc6996515f76b42db09fbd4332d86e. --- src/Installers/Windows/HostOptions/HostOptions.wixproj | 1 - .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index e598bb7b44a7..f6da458666fb 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -25,7 +25,6 @@ $(PackageFileName) $(PackageFileName) $(PackageFileName) - $(PackageFileName) $(TargetName).wixpdb Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index d39a61b34cb3..ecfb0150e53f 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -95,7 +95,6 @@ $(PackageFileName) $(PackageFileName) $(PackageFileName) - $(PackageFileName) $(TargetName).wixpdb Microsoft .NET $(PackageBrandingVersion) From 4b6984ec4a22448be3af402ce1b1a6b5e1af54cf Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 17:38:13 -0700 Subject: [PATCH 071/102] Revert "Try this" This reverts commit da99fb6db21e47eaccc7ad746cd5134951ea47bf. --- src/Installers/Windows/HostOptions/HostOptions.wixproj | 5 +---- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index f6da458666fb..57c68ce5fdab 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -20,12 +20,9 @@ - dotnet-hosting-options-$(PackageVersion)-win - $(TargetName)$(TargetExt) + dotnet-hosting-options-$(PackageVersion)-win$(TargetExt) $(PackageFileName) $(PackageFileName) - $(PackageFileName) - $(TargetName).wixpdb Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index ecfb0150e53f..b583538317eb 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -90,12 +90,9 @@ - dotnet-hosting-$(PackageVersion)-win - $(TargetName)$(TargetExt) + dotnet-hosting-$(PackageVersion)-win$(TargetExt) $(PackageFileName) $(PackageFileName) - $(PackageFileName) - $(TargetName).wixpdb Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) From d6c0584a822dfd577b43cac58028fb334a7591c1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 17:38:23 -0700 Subject: [PATCH 072/102] Revert "Don't rename it" This reverts commit fcf1b51ef24c5482229eb5c7538848a2694b4a81. --- src/Installers/Windows/HostOptions/HostOptions.wixproj | 6 +++--- .../WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 ++-- src/Installers/Windows/Wix.props | 2 +- src/Installers/Windows/Wix.targets | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index 57c68ce5fdab..ba5ccb0e2423 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -2,9 +2,11 @@ + $(HostOptionsName) + $(HostOptionsName) Package Microsoft ASP.NET Core Hosting Bundle Options - $(HostOptionsNameProductNameShort) + AspNetCore.HostOptions x86 20248cd1-c5aa-4f42-ad88-bc260d64deea true @@ -21,8 +23,6 @@ dotnet-hosting-options-$(PackageVersion)-win$(TargetExt) - $(PackageFileName) - $(PackageFileName) Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b583538317eb..b3dc5c5878b2 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -2,6 +2,8 @@ + WindowsServerHostingBundle + WindowsServerHostingBundle true 6F1B115C-1903-40CB-837D-7961AB610F4E Bundle @@ -91,8 +93,6 @@ dotnet-hosting-$(PackageVersion)-win$(TargetExt) - $(PackageFileName) - $(PackageFileName) Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index 8d0bdb65342b..a78c6e27883b 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -17,7 +17,7 @@ false - AspNetCore.HostOptions + WindowsServerHostingBundleOptions E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 04dc3a599d3d..a22c37cc7617 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -48,17 +48,17 @@ - + - + - + - + From 52e5920ad03831d5f93ec5df678eaccee4fc2964 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 19:10:27 -0700 Subject: [PATCH 073/102] Try something --- eng/Build.props | 20 +++++++++++++++++-- .../Windows/HostOptions/HostOptions.wixproj | 6 +++--- .../WindowsHostingBundle.wixproj | 7 +++---- src/Installers/Windows/Wix.props | 2 +- src/Installers/Windows/Wix.targets | 8 ++++---- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index 33d09a7a1017..dd8e616825a4 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -11,6 +11,22 @@ --> + + 42.42 + + + + + + + + + %(_ResolvedPackageVersionInfo.PackageVersion) + + + @@ -88,7 +104,7 @@ - Platform=x86 + Platform=x86;_ShippingProductVersion=$(ShippingProductVersion) $(DotNetBuildPass) @@ -313,7 +329,7 @@ - + diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index ba5ccb0e2423..f2e0861782e9 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -2,8 +2,9 @@ - $(HostOptionsName) - $(HostOptionsName) + dotnet-hosting-options-$(_ShippingProductVersion)-win.msi + $(Name) + $(Name) Package Microsoft ASP.NET Core Hosting Bundle Options AspNetCore.HostOptions @@ -22,7 +23,6 @@ - dotnet-hosting-options-$(PackageVersion)-win$(TargetExt) Microsoft ASP.NET Core $(PackageBrandingVersion) Hosting Bundle Options $(DefineConstants);ProductName=$(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index b3dc5c5878b2..2435289a2f3c 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -2,8 +2,9 @@ - WindowsServerHostingBundle - WindowsServerHostingBundle + dotnet-hosting-$(_ShippingProductVersion)-win.exe + $(Name) + $(Name) true 6F1B115C-1903-40CB-837D-7961AB610F4E Bundle @@ -92,8 +93,6 @@ - dotnet-hosting-$(PackageVersion)-win$(TargetExt) - Microsoft .NET $(PackageBrandingVersion) $(PackageVersion) $(PackageVersion) diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props index a78c6e27883b..0b629899a1bc 100644 --- a/src/Installers/Windows/Wix.props +++ b/src/Installers/Windows/Wix.props @@ -17,7 +17,7 @@ false - WindowsServerHostingBundleOptions + AspNetCore.HostOptions E1FD1271-E0F0-4B8B-B4BE-01F2EBA58F4E diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index a22c37cc7617..8da2f35858c0 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -48,17 +48,17 @@ - + - + - + - + From 20a5fb6e1fe6880e4c879964b2d7aa26f7c9c943 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 19:51:19 -0700 Subject: [PATCH 074/102] Remove default --- eng/Build.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index dd8e616825a4..709c644376f1 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -11,10 +11,6 @@ --> - - 42.42 - - Date: Fri, 29 Aug 2025 20:42:51 -0700 Subject: [PATCH 075/102] Use GenerateFiles --- eng/Build.props | 16 ++-------------- eng/tools/GenerateFiles/Directory.Build.props.in | 1 + .../Windows/HostOptions/HostOptions.wixproj | 2 +- .../WindowsHostingBundle.wixproj | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index 709c644376f1..33d09a7a1017 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -11,18 +11,6 @@ --> - - - - - - - %(_ResolvedPackageVersionInfo.PackageVersion) - - - @@ -100,7 +88,7 @@ - Platform=x86;_ShippingProductVersion=$(ShippingProductVersion) + Platform=x86 $(DotNetBuildPass) @@ -325,7 +313,7 @@ - + diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in index 13205d2f4961..7cba8320b19d 100644 --- a/eng/tools/GenerateFiles/Directory.Build.props.in +++ b/eng/tools/GenerateFiles/Directory.Build.props.in @@ -4,5 +4,6 @@ ${ArtifactsShippingPackagesDir} true ${LibNetHostAppPackVersion} + <_ProductVersionForInstallers>${SharedFxVersion} diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index f2e0861782e9..209cb3cba9b6 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -2,7 +2,7 @@ - dotnet-hosting-options-$(_ShippingProductVersion)-win.msi + dotnet-hosting-options-$(_ProductVersionForInstallers)-win.msi $(Name) $(Name) Package diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 2435289a2f3c..189d4fae397c 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -2,7 +2,7 @@ - dotnet-hosting-$(_ShippingProductVersion)-win.exe + dotnet-hosting-$(_ProductVersionForInstallers)-win.exe $(Name) $(Name) true From 298e31fdbb256c674161fb19ea982859d36d8cd8 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 20:44:34 -0700 Subject: [PATCH 076/102] Fixup --- eng/tools/GenerateFiles/Directory.Build.props.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/GenerateFiles/Directory.Build.props.in b/eng/tools/GenerateFiles/Directory.Build.props.in index 7cba8320b19d..49747cadbe74 100644 --- a/eng/tools/GenerateFiles/Directory.Build.props.in +++ b/eng/tools/GenerateFiles/Directory.Build.props.in @@ -4,6 +4,6 @@ ${ArtifactsShippingPackagesDir} true ${LibNetHostAppPackVersion} - <_ProductVersionForInstallers>${SharedFxVersion} + <_ProductVersionForInstallers>${MicrosoftAspNetCoreAppRuntimeVersion} From bf1f717d9259f2ca7771ae8cb90a0c8495562ff7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 29 Aug 2025 21:30:05 -0700 Subject: [PATCH 077/102] Fix extensions --- src/Installers/Windows/HostOptions/HostOptions.wixproj | 4 ++-- .../Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Installers/Windows/HostOptions/HostOptions.wixproj b/src/Installers/Windows/HostOptions/HostOptions.wixproj index 209cb3cba9b6..82ffd6654dad 100644 --- a/src/Installers/Windows/HostOptions/HostOptions.wixproj +++ b/src/Installers/Windows/HostOptions/HostOptions.wixproj @@ -2,9 +2,9 @@ - dotnet-hosting-options-$(_ProductVersionForInstallers)-win.msi + dotnet-hosting-options-$(_ProductVersionForInstallers)-win $(Name) - $(Name) + $(Name).msi Package Microsoft ASP.NET Core Hosting Bundle Options AspNetCore.HostOptions diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index 189d4fae397c..fbbe261ac48d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -2,9 +2,9 @@ - dotnet-hosting-$(_ProductVersionForInstallers)-win.exe + dotnet-hosting-$(_ProductVersionForInstallers)-win $(Name) - $(Name) + $(Name).exe true 6F1B115C-1903-40CB-837D-7961AB610F4E Bundle From 64bf2a9f8555fb5a90e70647d6790a53a6f834ea Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 4 Sep 2025 13:13:21 -0700 Subject: [PATCH 078/102] UI Improvements --- .../Windows/WindowsHostingBundle/bundle.thm | 118 ++++++++++-------- 1 file changed, 68 insertions(+), 50 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index 5e61f6357059..eccb23627c98 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -1,4 +1,4 @@ - + Segoe UI - Segoe UI - Segoe UI + Segoe UI + Segoe UI Segoe UI - #(loc.Title) - #(loc.SubTitle) + #(loc.Title) + #(loc.SubTitle) - #(loc.HelpHeader) - #(loc.HelpText) - + #(loc.HelpHeader) + #(loc.HelpText) + - #(loc.Welcome) - #(loc.InstallResetIIS) - #(loc.InstallNoIIS) - #(loc.EulaPrivacy) - #(loc.InstallAcceptCheckbox) - - + #(loc.Welcome) + #(loc.InstallResetIIS) + #(loc.InstallNoIIS) + #(loc.EulaPrivacy) + #(loc.InstallAcceptCheckbox) + + - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - + #(loc.FilesInUseHeader) + #(loc.FilesInUseLabel) + - - + + - - + + - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - + #(loc.ProgressHeader) + #(loc.ProgressLabel) + #(loc.OverallProgressPackageText) + + - #(loc.ModifyHeader) - #(loc.ModifyResetIIS) - #(loc.ModifyNoIIS) - - - + #(loc.ModifyHeader) + #(loc.ModifyResetIIS) + #(loc.ModifyNoIIS) + + + - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - + #(loc.SuccessHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) + + #(loc.SuccessRestartText) + + - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - + #(loc.FailureHeader) + #(loc.FailureInstallHeader) + #(loc.FailureUninstallHeader) + #(loc.FailureRepairHeader) + #(loc.FailureHyperlinkLogText) + + #(loc.FailureRestartText) + + From 0067a3b76984ef5989a8b75e2987aa88941f8dfb Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 4 Sep 2025 13:18:30 -0700 Subject: [PATCH 079/102] More alignment --- src/Installers/Windows/WindowsHostingBundle/bundle.thm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index eccb23627c98..107359bd9d88 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -26,8 +26,8 @@ #(loc.Welcome) - #(loc.InstallResetIIS) - #(loc.InstallNoIIS) + #(loc.InstallResetIIS) + #(loc.InstallNoIIS) #(loc.EulaPrivacy) #(loc.InstallAcceptCheckbox) From d9e176c1b3ce5f4fe94e5c9d5e83528cc314673c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 4 Sep 2025 13:22:54 -0700 Subject: [PATCH 080/102] A few more --- src/Installers/Windows/WindowsHostingBundle/bundle.thm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index 107359bd9d88..40cf02641824 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -30,7 +30,7 @@ #(loc.InstallNoIIS) #(loc.EulaPrivacy) #(loc.InstallAcceptCheckbox) - + From 71246f7fcb5f963dd49e5b990ccfc00257aed992 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 5 Sep 2025 07:39:46 -0700 Subject: [PATCH 081/102] Fixup --- src/Installers/Windows/WindowsHostingBundle/bundle.thm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index 40cf02641824..6e4572e5d278 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -31,7 +31,7 @@ #(loc.EulaPrivacy) #(loc.InstallAcceptCheckbox) - @@ -93,7 +93,10 @@ #(loc.FailureRestartText) - + From 7165a286893333b29d79a89337c49805a25cf0ca Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 5 Sep 2025 10:38:02 -0700 Subject: [PATCH 082/102] UI fixes --- .../WindowsHostingBundle/LCID/1033/thm.wxl | 10 ++ .../Windows/WindowsHostingBundle/bundle.thm | 128 +++++++++++------- 2 files changed, 86 insertions(+), 52 deletions(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl index 0a771f0956ca..0956af2ab86a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl @@ -24,16 +24,25 @@ + + + + + + + + + @@ -46,6 +55,7 @@ + diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index 6e4572e5d278..284ecf187466 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -17,83 +17,107 @@ #(loc.SubTitle) - #(loc.HelpHeader) - #(loc.HelpText) - - #(loc.Welcome) - #(loc.InstallResetIIS) - #(loc.InstallNoIIS) - #(loc.EulaPrivacy) - #(loc.InstallAcceptCheckbox) - - - - - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - + - - + #(loc.InstallResetIIS) + #(loc.InstallNoIIS) - - + - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - #(loc.ModifyHeader) - #(loc.ModifyResetIIS) - #(loc.ModifyNoIIS) - - - + + - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - + - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - + From 4e41b197cb6262be22c443d04d74ca23cd5fc1aa Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 5 Sep 2025 13:29:52 -0700 Subject: [PATCH 083/102] Update aspnetcore runtime bundle --- eng/targets/Wix.Common.props | 7 +- .../App.Runtime/bundle/DotNetLogo_256x.png | Bin 0 -> 2154 bytes src/Framework/App.Runtime/bundle/bundle.thm | 179 +++++++++++------- src/Framework/App.Runtime/bundle/dotnet.ico | Bin 0 -> 45150 bytes .../App.Runtime/bundle/theme/1033/bundle.wxl | 110 ++++++----- 5 files changed, 177 insertions(+), 119 deletions(-) create mode 100644 src/Framework/App.Runtime/bundle/DotNetLogo_256x.png create mode 100644 src/Framework/App.Runtime/bundle/dotnet.ico diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index ec91b845e808..38343979e2fb 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -6,7 +6,6 @@ 3.14 $(MicrosoftSignedWixVersion) $(MicrosoftWixToolsetSdkVersion) - true @@ -20,11 +19,7 @@ $(MSBuildToolsPath)\NuGet.targets - - - - - + diff --git a/src/Framework/App.Runtime/bundle/DotNetLogo_256x.png b/src/Framework/App.Runtime/bundle/DotNetLogo_256x.png new file mode 100644 index 0000000000000000000000000000000000000000..3ff052f8302a4b7f87cd646c4534d7559e282574 GIT binary patch literal 2154 zcmeHJ>pL4*8b66hgl465N~FZO1uiLq z5s%!A(qL)#>XOdO_GgD#HYQlQRjDrDV@MNSoYQ*ZSpf)RbP%vB0p1u0iwp%K82B0q zVCKNc0ic8bNc>KTHsv*&(^QzWU6_BKA>j&j+9%mBpRYNPR`c0X!XrEqSfXmERz!}+*5Y^>L&&8P~qpc2t;rhxNkat zL%8#--ne!@iyp^Z3HZEg?H)7`Ca*k|o4fa_Y~(b7E^aDn+a z*(y#QUw6ZslDy2$zqV?~x{2Yg$8&?Rrh& z`VL;$I7J1U^RlM0v)BsM)FE7lU4Ur`tf$^aXCa-V>aKGj8#lmgJ=1QHiy|N?Se6%> zTTPJZX%>H9>}{UDsIkiN2`MzADsf5;S_^P?XUe(M7~X(6prUUIW3#) z{9CcJwe})APa>KzR*OIG^P0JXoa6v~&07HPBRFs_o1+n%3RZd96vY2Kp zxKfm+Z`O=;Q%Ut6b5-amM-@Y9EYLoBHF$~&)S=*fLt_6X>S5S(NPD}x6{c&UcU-Qh z&cw?9WnmijKAcq3<<|8wqgi1|vx+*l=6R?B?5n}}&s>Cb!W6D8|>w$RC22TwIY zqzdDMH5o`uUMH!5jUvY(`|c|1yvOG9BydbCj2zG`&b##Ip(AFj{q2X$TSx`dI9B#i zaFmy>8qo{x1hEV+a~^yS$E3l?`(|z<={=TeUocdA2Z=k&MRV+a#-mxTsr2JyEGyd% zB#!?#aA0c$?(zPxB@SYFR8Pe>;C6JGt72{%SS7nTLNSm_l^!uJhVw2ME4`zUw`z^B z;TEtr&BPKzNXgw3_OmoBNcIB`4U&TwFedJE=vVUo8zTFuh$Q_R&y7$RoU9+nTq@x? zN)`*b!^z^bq7^B;{IksVK7463PgjmxN~^A#7A<(3x>Ku&E*l>pvcn?cVUM{zN zbA)Lh264q!^&QvR{ATL%;H5s{^WjO?1kz>qutzqmmFB(so!GPuO5|=o38&Wsrw=AX zZcI+99tcykwFxD)jfjVmP~KV3B;f=nY`A0EXP-l=!{31>*DWM+@XZS6`m - - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + #(loc.Title) + #(loc.SubTitle) + + + - - #(loc.HelpHeader) - #(loc.HelpText) - - - - #(loc.Welcome) - #(loc.EulaPrivacy) - #(loc.InstallAcceptCheckbox) - - - - - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - + + + + - - + + - - - - - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - - - #(loc.ModifyHeader) - - - - - - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - - - - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - - + + <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> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + + + + diff --git a/src/Framework/App.Runtime/bundle/dotnet.ico b/src/Framework/App.Runtime/bundle/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 - - [BundleNameFull] Setup - [BundleNameShort] - [BundleNameSub] - Version [WixBundleVersion] - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [\[]directory[\]] - installs, repairs, uninstalls or + + + + + + + + + + + + + + &Close - I &agree to the license terms and conditions - &Install - &Close - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Close - Repair Successfully Completed - Uninstall Successfully Completed - Installation Successfully Completed - Setup Successful - &Launch - You must restart your computer before you can use 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 +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%." /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - Welcome to the [WixBundleName] Setup. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">license terms</a> and <a href="https://go.microsoft.com/fwlink/?LinkId=786378">privacy statement</a>. + + + + \ No newline at end of file From 6c56d81cbaaf0071423df54a4dccbe297096889c Mon Sep 17 00:00:00 2001 From: William Godbe Date: Sun, 7 Sep 2025 16:38:35 -0700 Subject: [PATCH 084/102] Update src/Installers/Windows/Wix.targets Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/Installers/Windows/Wix.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 8da2f35858c0..43323e6b49dd 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -93,7 +93,7 @@ $(DefineConstants);DepProviderGuid=$(DepProviderGuid) - + From e135d86dcc3cc71fc1e3a8feaec213915f0ee6c0 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 8 Sep 2025 08:58:46 -0700 Subject: [PATCH 085/102] No iswin64 --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 6 +++--- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 6 +++--- .../Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index 4077a24530c6..e4d3a7f5238e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -6,10 +6,10 @@ - - - + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 682e26d3eb5d..db8ae845f33e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -6,10 +6,10 @@ - - - + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index 68413cffbba3..dd27aeffe026 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -8,7 +8,6 @@ - @@ -18,7 +17,6 @@ - @@ -26,7 +24,6 @@ - From 2191f2a55be518b34b78369d5b0656be57e1ac36 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 8 Sep 2025 09:30:43 -0700 Subject: [PATCH 086/102] Some feedback --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 +- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 146 +++++++++--------- .../ANCMV2/aspnetcoremodulev2.wxs | 94 +++++------ .../IIS-Setup/appsearch/appsearch.wxi | 36 ++--- .../iisca/wix5/FixPatchingBehavior.wxi | 2 +- .../IIS-Setup/iisca/wix5/HttpListener.wxi | 2 +- .../iisca/wix5/ShortcutConsoleProperties.wxi | 2 +- .../IIS-Setup/iisca/wix5/WindowsHotfix.wxi | 2 +- .../Windows/HostOptions/Product.wxs | 8 +- .../Windows/WindowsHostingBundle/ANCM.wxs | 6 +- .../Windows/WindowsHostingBundle/Bundle.wxs | 18 +-- .../WindowsHostingBundle/DotNetCore.wxs | 18 +-- .../WindowsHostingBundle/SharedFramework.wxs | 6 +- 13 files changed, 171 insertions(+), 171 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index b12339bf63fa..65f5dac503d6 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -16,7 +16,7 @@ $(MSBuildProjectDirectory)\$(MSBuildProjectName).nuspec false - + 5437 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index e4d3a7f5238e..be0b76ef08bc 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -17,7 +17,7 @@ - + @@ -29,17 +29,17 @@ - - + + - - + + - + @@ -50,9 +50,9 @@ - - - + + + @@ -61,11 +61,11 @@ - + - + @@ -73,7 +73,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -133,48 +133,48 @@ - - - + + + - + - + - - + + - + - - + + - - + + - - - + + + - - - + + + @@ -184,8 +184,8 @@ - - + + @@ -194,20 +194,20 @@ - - + + - + - + - + - + @@ -215,8 +215,8 @@ - - + + @@ -268,47 +268,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -337,47 +337,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -493,7 +493,7 @@ - + @@ -501,15 +501,15 @@ - - + + - + \ No newline at end of file diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index db8ae845f33e..58eec69e56c9 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -15,21 +15,21 @@ - + - - + + - - + + - + @@ -48,10 +48,10 @@ - - - - + + + + @@ -161,15 +161,15 @@ - + - - - + + + - + @@ -179,8 +179,8 @@ - - + + @@ -192,53 +192,53 @@ - - + + - + - + - - + + - + - - + + - - + + - - + + - + - - + + - + @@ -252,10 +252,10 @@ - - + + - + @@ -263,19 +263,19 @@ - + - + - + - + - + @@ -287,17 +287,17 @@ - - + + - + - - + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi index b8564e6f4bef..6e64b5657d85 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/appsearch/appsearch.wxi @@ -5,7 +5,7 @@ @@ -21,36 +21,36 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi index 7d157dd29628..8f2f608b1356 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/FixPatchingBehavior.wxi @@ -11,7 +11,7 @@ To add this to your wxs file, add: - + --> diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi index 68969964ee73..75842735605e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/HttpListener.wxi @@ -11,7 +11,7 @@ To add this to your wxs file, add: - + --> diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi index 5d0d27984e90..47b37015336e 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/ShortcutConsoleProperties.wxi @@ -11,7 +11,7 @@ To add this to your wxs file, add: - + --> diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi index 3ddb726d83cb..bb6e0973bba7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/wix5/WindowsHotfix.wxi @@ -11,7 +11,7 @@ To add this to your wxs file, add: - + --> diff --git a/src/Installers/Windows/HostOptions/Product.wxs b/src/Installers/Windows/HostOptions/Product.wxs index 2fd1f74729a5..21ce26559710 100644 --- a/src/Installers/Windows/HostOptions/Product.wxs +++ b/src/Installers/Windows/HostOptions/Product.wxs @@ -1,6 +1,6 @@  - + @@ -32,7 +32,7 @@ - + @@ -44,10 +44,10 @@ - + - + diff --git a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs index a9b16af70dd8..ca8b7fa39a8c 100644 --- a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs @@ -5,17 +5,17 @@ - + - + - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 17c4d847807d..813278b143ec 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -1,5 +1,5 @@  - + @@ -15,12 +15,12 @@ - - + + - - + + @@ -32,10 +32,10 @@ - - + + - + - + - + - + - + - + - + - + - + - + diff --git a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs index e5c13a26cee0..bb00b6ef2ee4 100644 --- a/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/SharedFramework.wxs @@ -5,15 +5,15 @@ - + - + - + From b254e410df5eb9570e59cb9eea94f7f7e352132a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 8 Sep 2025 15:31:42 -0700 Subject: [PATCH 087/102] Feedback, KeyPath --- eng/targets/Wix.Common.props | 2 -- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 8 ++++---- .../AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index 38343979e2fb..e641f0392397 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -4,8 +4,6 @@ 2.0 3.14 - $(MicrosoftSignedWixVersion) - $(MicrosoftWixToolsetSdkVersion) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index be0b76ef08bc..d3fa439a10ed 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -137,9 +137,9 @@ - + - + @@ -166,14 +166,14 @@ - + - + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 58eec69e56c9..deec6789d766 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -195,9 +195,9 @@ - + - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + From e179a7da46d23363fcd2b8246986cbd32ea4b0bf Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 8 Sep 2025 15:48:19 -0700 Subject: [PATCH 088/102] Fixup --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs index d3fa439a10ed..37ba74970ff7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -173,7 +173,7 @@ - + From fb627d34bc65af4842a5121c93a266c120055db4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 8 Sep 2025 15:49:51 -0700 Subject: [PATCH 089/102] No need for ProductVersion --- eng/targets/Wix.Common.props | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props index e641f0392397..1b0b1dff407b 100644 --- a/eng/targets/Wix.Common.props +++ b/eng/targets/Wix.Common.props @@ -3,7 +3,6 @@ 2.0 - 3.14 From 73b3644b08b1d956b4b09c4f7f506a05648baad0 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 9 Sep 2025 07:38:28 -0700 Subject: [PATCH 090/102] Update non-english theme files --- .../App.Runtime/bundle/theme/1028/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1029/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1031/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1036/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1040/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1041/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1042/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1045/bundle.wxl | 99 +++++++++---------- .../App.Runtime/bundle/theme/1046/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1049/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/1055/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/2052/bundle.wxl | 98 +++++++++--------- .../App.Runtime/bundle/theme/3082/bundle.wxl | 98 +++++++++--------- 13 files changed, 585 insertions(+), 690 deletions(-) diff --git a/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl index 04d9933dd9fb..392e90c10f53 100644 --- a/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl @@ -1,55 +1,47 @@ - - - [BundleNameFull] 安裝程式 - [BundleNameShort] - [BundleNameSub] - 版本 [WixBundleVersion] - 您確定要取消嗎? - 前一版 - 安裝說明 - /install | /repair | /uninstall | /layout [\[]目錄[\]] - 在目錄中安裝、修復、解除安裝或 - 建立搭售方案的完整本機複本。預設為安裝。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - 顯示最少 UI 且不含提示，或者不顯示 UI，也 - 不顯示提示。預設會顯示 UI 和所有提示。 - -/norestart - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。 -/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。 - 關閉(&C) - 我同意授權條款及條件(&A) - 安裝(&I) - 關閉(&C) - 安裝進度 - 處理中: - 正在初始化... - 取消(&C) - 修改安裝 - 修復(&R) - 解除安裝(&U) - 關閉(&C) - 修復已成功完成 - 解除安裝已成功完成 - 安裝已成功完成 - 設定成功 - 啟動(&L) - 必須重新啟動電腦，才能使用此軟體。 - 重新啟動(&R) - 關閉(&C) - 安裝失敗 - 設定失敗 - 解除安裝失敗 - 修復失敗 - 有一個或多個問題導致安裝程式失敗。請解決問題，然後重試一次安裝。如需詳細資訊，請參閱<a href="#">記錄檔</a>。 - 必須重新啟動電腦，才能完成軟體的復原。 - 重新啟動(&R) - 關閉(&C) - 使用中的檔案 - 以下應用程式正在使用需要進行更新的檔案: - 關閉應用程式並嘗試重新啟動(&A) - 不關閉應用程式，需要重新啟動(&D) - 確定(&O) - 取消(&C) - - 歡迎使用 [WixBundleName] 安裝程式。 - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">授權條款</a>和<a href="https://go.microsoft.com/fwlink/?LinkId=786378">隱私權聲明</a>。 + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl index e6d2354063a8..0dd1e2dfc763 100644 --- a/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl @@ -1,55 +1,47 @@ - - - Instalační program pro [BundleNameFull] - [BundleNameShort] - [BundleNameSub] - Verze [WixBundleVersion] - 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 svazku v adresáři. Výchozí možností je instalace. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet – Zobrazí minimální uživatelské rozhraní bez výzev nebo nezobrazí žádné uživatelské rozhraní a - žádné výzvy. Výchozí možností je zobrazení uživatelského rozhraní a všech výzev. - -/norestart – potlačí všechny pokusy o restartování. Ve výchozím nastavení uživatelské rozhraní před restartováním zobrazí výzvu. -/log log.txt – Uloží protokol do konkrétního souboru. Ve výchozím nastavení bude soubor protokolu vytvořen v adresáři %TEMP%. - &Zavřít - Souhl&asím s licenčními podmínkami - &Instalovat - &Zavřít - Průběh instalace - Probíhá zpracování: - Inicializace... - &Storno - Změnit instalaci - Op&ravit - O&dinstalovat - &Zavřít - Oprava byla úspěšně dokončena - Odinstalace se úspěšně dokončila - Instalace se úspěšně dokončila - Instalace byla úspěšná. - &Spustit - Před použitím tohoto softwaru musíte restartovat počítač. - &Restartovat - &Zavřít - Instalace se nepovedla - Instalace se nepovedla - Odinstalace se nepovedla - Oprava se nepovedla - Jeden nebo více problémů způsobilo selhání instalace. Opravte tyto problémy a znovu spusťte instalaci. Pro více informací se podívejte do <a href="#">souboru protokolu</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 - - Vítá vás instalační program produktu [WixBundleName] - [WixBundleName] – <a href="https://go.microsoft.com/fwlink/?LinkId=329770">licenční podmínky</a> a <a href="https://go.microsoft.com/fwlink/?LinkId=786378">prohlášení o zásadách ochrany osobních údajů</a> + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl index 47d56196cb5a..af90409d939c 100644 --- a/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl @@ -1,55 +1,47 @@ - - - [BundleNameFull]-Setup - [BundleNameShort] - [BundleNameSub] - Version von [WixBundleVersion] - Möchten Sie den Vorgang wirklich abbrechen? - Vorherige Version - Setup-Hilfe - /install | /repair | /uninstall | /layout [\[]Verzeichnis[\]] – installiert, repariert, deinstalliert oder - erstellt eine vollständige lokale Kopie des Bundles im Verzeichnis. Installieren ist die Standardeinstellung. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet – zeigt eine minimale Benutzeroberfläche ohne Eingabeaufforderungen oder keine Benutzeroberfläche - und keine Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und alle Eingabeaufforderungen angezeigt. - -/norestart – unterdrückt alle Neustartversuche. Standardmäßig fordert die Benutzeroberfläche zum Bestätigen eines Neustarts auf. -/log log.txt – protokolliert in eine bestimmte Datei. Standardmäßig wird eine Protokolldatei in %TEMP% erstellt. - S&chließen - Ich &stimme den Bedingungen des Lizenzvertrags zu - &Installieren - S&chließen - Setupstatus - Wird verarbeitet: - Initialisierung... - &Abbrechen - Setup ändern - &Reparieren - &Deinstallieren - S&chließen - Reparatur erfolgreich abgeschlossen - Deinstallation erfolgreich abgeschlossen - Installation erfolgreich abgeschlossen - Setup wurde erfolgreich abgeschlossen - &Starten - Sie müssen den Computer neu starten, bevor Sie die Software verwenden können. - &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 - &Schließ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 - - Willkommen beim Setup von [WixBundleName]. - <a href="https://go.microsoft.com/fwlink/?LinkId=329770">Lizenzbedingungen</a> und <a href="https://go.microsoft.com/fwlink/?LinkId=786378">Datenschutzerklärung</a> für [WixBundleName]. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl index 2c22783f0417..27dd51ccb733 100644 --- a/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl @@ -1,55 +1,47 @@ - - - Installation de [BundleNameFull] - [BundleNameShort] - [BundleNameSub] - Version [WixBundleVersion] - Êtes-vous sûr de vouloir annuler ? - Version précédente - Aide du programme d'installation - /install | /repair | /uninstall | /layout [\[]répertoire[\]] - installe, répare, désinstalle ou - crée une copie locale complète du bundle dans le répertoire. Install est l'option par défaut. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - affiche une interface utilisateur minimale, sans invite, ou n'affiche - ni interface utilisateur, ni 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 affiche une invite avant le redémarrage. -/log log.txt - enregistre les informations dans 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 - &Installer - &Fermer - Progression de l’opération - 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 - Installation terminée avec succès - Opération réussie - &Démarrer - Vous devez redémarrer votre ordinateur avant de pouvoir utiliser le logiciel. - &Redémarrer - &Fermer - Échec de l’opération - É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 plus d’informations, 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 - - Bienvenue dans le programme d'installation de [WixBundleName]. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">termes du contrat de licence</a> et <a href="https://go.microsoft.com/fwlink/?LinkId=786378">déclaration de confidentialité</a>. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl index 884ffc574eb7..fb2c2ebb384a 100644 --- a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl @@ -1,55 +1,47 @@ - - - Installazione di [BundleNameFull] - [BundleNameShort] - [BundleNameSub] - Versione [WixBundleVersion] - Annullare? - Versione precedente - Guida all'installazione - /install | /repair | /uninstall | /layout [\[]directory[\]] - installa, ripara, disinstalla o - crea una copia locale completa del bundle nella directory. L'opzione predefinita è install. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - visualizza un'interfaccia utente minima senza prompt oppure non visualizza alcuna interfaccia utente - né prompt. Per impostazione predefinita, vengono visualizzati l'intera interfaccia utente e tutti i prompt. - -/norestart - annulla qualsiasi tentativo di riavvio. Per impostazione predefinita, l'interfaccia utente visualizza una richiesta prima del riavvio. -/log log.txt - registra il log in un file specifico. Per impostazione predefinita, viene creato un file di log in %TEMP%. - &Chiudi - &Accetto i termini e le condizioni di licenza - &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 - Installazione completata - &Avvia - È necessario riavviare il computer prima di utilizzare il software. - &Riavvia - &Chiudi - Installazione non riuscita - L'installazione non è riuscita - La 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 il <a href="#">file di log</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 - - Installazione di [WixBundleName]. - <a href="https://go.microsoft.com/fwlink/?LinkId=329770">Condizioni di licenza</a> e <a href="https://go.microsoft.com/fwlink/?LinkId=786378">informativa sulla privacy</a> di [WixBundleName]. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl index 3b3bde413dc0..2d3cdab2827d 100644 --- a/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl @@ -1,55 +1,47 @@ - - - [BundleNameFull] のセットアップ - [BundleNameShort] - [BundleNameSub] - バージョン [WixBundleVersion] - 取り消しますか? - 以前のバージョン - セットアップのヘルプ - /install | /repair | /uninstall | /layout [\[]ディレクトリ[\]] - バンドルの完全なローカル コピーに対する - ディレクトリへのインストール、修復、ディレクトリからのアンインストール、またはディレクトリ内への作成を行います。既定の設定はインストールです。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - 最小限の UI だけを表示しプロンプトは表示しない、または UI もプロンプトも - 表示しません。既定では UI とすべてのプロンプトが表示されます。 - -/norestart - 再起動を抑制します。既定では再起動前に確認メッセージが表示されます。 -/log log.txt - 特定のファイルに記録します。ログ ファイルは既定では %TEMP% に作成されます。 - 閉じる(&C) - ライセンス条項および使用条件に同意する(&A) - インストール(&I) - 閉じる(&C) - セットアップの進行状況 - 処理中: - 初期化しています... - キャンセル(&C) - セットアップの変更 - 修復(&R) - アンインストール(&U) - 閉じる(&C) - 修復が正常に完了しました - アンインストールが正常に完了しました - インストールが正常に完了しました - セットアップ完了 - 起動(&L) - ソフトウェアを使用する前にコンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - セットアップに失敗しました - セットアップに失敗しました - アンインストールに失敗しました - 修復に失敗しました - 1 つまたは複数の問題により、セットアップが失敗しました。問題を解決してからセットアップを再試行してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 - ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - ファイルが使用中 - 次のアプリケーションは、更新の必要があるファイルを使用しています: - アプリケーションを閉じて再起動を試みる。(&A) - アプリケーションを終了させない (コンピューターの再起動が必要になります)(&D) - OK(&O) - キャンセル(&C) - - [WixBundleName] のセットアップへようこそ。 - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">ライセンス条項</a>および<a href="https://go.microsoft.com/fwlink/?LinkId=786378">プライバシーに関する声明</a>。 + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl index c937e2bfc1f9..ef7d8360302b 100644 --- a/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl @@ -1,55 +1,47 @@ - - - [BundleNameFull] 설치 - [BundleNameShort] - [BundleNameSub] - 버전 [WixBundleVersion] - 취소하시겠습니까? - 이전 버전 - 설치 도움말 - /install | /repair | /uninstall | /layout [\[]디렉터리[\]] - 디렉터리에 번들의 전체 로컬 복사본을 - 설치, 복구, 제거 또는 작성합니다. 설치가 기본값입니다. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - 프롬프트 없이 최소 UI를 표시하거나 UI 및 - 프롬프트를 표시하지 않습니다. 기본값으로 UI와 모든 프롬프트가 표시됩니다. - -/norestart - 다시 시작하지 않게 합니다. 기본값으로 UI에서는 다시 시작하기 전에 묻는 메시지를 표시합니다. -/log log.txt - 특정 파일에 기록합니다. 기본값으로 로그 파일은 %TEMP%에 만들어집니다. - 닫기(&C) - 동의함(&A) - 설치(&I) - 닫기(&C) - 설치 진행률 - 처리 중: - 초기화 중... - 취소(&C) - 설치 수정 - 복구(&R) - 제거(&U) - 닫기(&C) - 복구 완료됨 - 제거 완료됨 - 설치 완료됨 - 설치 완료 - 시작(&L) - 소프트웨어를 사용하려면 먼저 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 설치 실패 - 설치 실패 - 제거 실패 - 복구 실패 - 하나 이상의 문제가 발생하여 설치하지 못했습니다. 문제를 해결한 다음 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. - 소프트웨어 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - 사용 중인 파일 - 다음의 응용 프로그램이 업데이트해야 할 파일을 사용 중입니다. - 응용 프로그램을 닫고 다시 시작합니다(&A). - 응용 프로그램을 닫지 않습니다(&D). 다시 부팅해야 합니다. - 확인(&O) - 취소(&C) - - [WixBundleName] 설치를 시작합니다. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">사용 조건</a> 및 <a href="https://go.microsoft.com/fwlink/?LinkId=786378">개인정보처리방침</a>. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl index c3deae827aa6..c1dff403edfd 100644 --- a/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl @@ -1,56 +1,47 @@ - - - Konfiguracja pakietu [BundleNameFull] - [BundleNameShort] - [BundleNameSub] - Wersja [WixBundleVersion] - Czy na pewno chcesz anulować? - Poprzednia wersja - Instalator — Pomoc - /install | /repair | /uninstall | /layout [\[]katalog[\]] — instaluje, naprawia, odinstalowuje lub - tworzy pełną lokalną kopię pakietu w katalogu. Instalacja jest domyślna. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet — wyświetla minimalny interfejs użytkownika bez monitów albo nie wyświetla żadnego interfejsu użytkownika ani monitów -. - Domyślnie jest wyświetlany interfejs użytkownika oraz wszystkie monity. - -/norestart — pomija próby ponownego uruchomienia. Domyślnie interfejs użytkownika wyświetla monit przed ponownym uruchomieniem. -/log log.txt — tworzy dziennik w określonym pliku. Domyślnie plik dziennika jest tworzony w katalogu %TEMP%. - &Zamknij - &Zgadzam się na warunki licencji - &Zainstaluj - &Zamknij - Postęp instalacji - Przetwarzanie: - Trwa inicjowanie... - &Anuluj - Zmodyfikuj instalatora - &Napraw - &Odinstaluj - &Zamknij - Pomyślnie ukończono naprawę - Pomyślnie ukończono operację odinstalowania - Pomyślnie ukończono instalację - Instalacja przebiegła pomyślnie - &Uruchom - Aby korzystać z 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ł niepowodzenie instalacji. Napraw błędy, a następnie uruchom ponownie 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 - - Witamy w instalatorze produktu [WixBundleName]. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">postanowienia licencyjne</a> i <a href="https://go.microsoft.com/fwlink/?LinkId=786378">oświadczenie o ochronie prywatności</a>. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl index 5811683986dd..8552ce3447ae 100644 --- a/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl @@ -1,55 +1,47 @@ - - - Instalação do [BundleNameFull] - [BundleNameShort] - [BundleNameSub] - Versão [WixBundleVersion] - Tem certeza de que deseja cancelar? - Versão anterior - Ajuda da Instalação - /install | /repair | /uninstall | /layout [\[]diretório[\]] - 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 nenhum prompt 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 qualquer tentativa de reiniciar. Por padrão, a interface do usuário perguntará antes de reiniciar. -/log log.txt - registra em um arquivo específico. Por padrão, um arquivo de log é criado em %TEMP%. - &Fechar - Eu &concordo com os termos e condições da licença - &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 Concluída com Êxito - Instalação com Êxito - &Iniciar - Reinicie o computador para poder usar o software. - &Reiniciar - &Fechar - Falha na Instalação - Falha na Instalação - Falha na Desinstalação - Falha ao Reparar - Um ou mais problemas causaram falha na instalação. Corrija-os e tente instalar novamente. 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 - - Bem-vindo à Instalação do [WixBundleName]. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">termos de licença</a> e <a href="https://go.microsoft.com/fwlink/?LinkId=786378">política de privacidade</a>. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl index ad057e6393cf..63bcf38806b5 100644 --- a/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl @@ -1,55 +1,47 @@ - - - Установка [BundleNameFull] - [BundleNameShort] - [BundleNameSub] - Версия [WixBundleVersion] - Отменить? - Предыдущая версия - Справка по установке - /install | /repair | /uninstall | /layout [\[]каталог[\]] — установка, восстановление, удаление или - создание полной локальной копии пакета в каталоге. По умолчанию — установка. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet — отображение минимального пользовательского интерфейса без запросов или работа без пользовательского интерфейса и - без запросов. По умолчанию отображаются пользовательский интерфейс и все запросы. - -/norestart — отключение всех попыток перезагрузки. По умолчанию в пользовательском интерфейсе перед перезагрузкой отображается запрос. -/log log.txt — запись журнала в указанный файл. По умолчанию файл журнала создается в папке %TEMP%. - &Закрыть - Я &принимаю условия лицензии - &Установить - &Закрыть - Ход установки - Обработка: - Инициализация... - Отм&ена - Изменение установки - &Исправить - &Удалить - &Закрыть - Восстановление успешно завершено - Удаление успешно завершено - Установка успешно завершена - Установка успешно завершена - &Запустить - Перед использованием программного обеспечения необходимо перезапустить компьютер. - &Перезапустить - &Закрыть - Сбой установки - Сбой установки - Сбой удаления - Сбой восстановления - Одна или несколько проблем вызывали сбой программы установки. Исправьте эти проблемы и попробуйте повторить установку. Дополнительные сведения см. в <a href="#">файле журнала</a>. - Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. - &Перезапустить - З&акрыть - Используемые файлы - Следующие приложения используют файлы, которые нуждаются в обновлении: - Закройте &приложения и попробуйте перезапустить их. - &Не закрывайте приложения. Потребуется перезагрузка компьютера. - О&К - &Отменить - - Вас приветствует мастер установки [WixBundleName]. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">условия лицензии</a> и <a href="https://go.microsoft.com/fwlink/?LinkId=786378">заявление о конфиденциальности</a>. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl index f9bd28efaa75..b53a9c8216d9 100644 --- a/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl @@ -1,55 +1,47 @@ - - - [BundleNameFull] Kurulumu - [BundleNameShort] - [BundleNameSub] - [WixBundleVersion] Sürümü - İptal etmek istediğinizden emin misiniz? - Önceki sürüm - Kurulum Yardımı - /install | /repair | /uninstall | /layout [\[]dizin[\]] - yükler, onarır, kaldırır ya da - dizindeki paketin tam bir yerel kopyasını oluşturur. Varsayılan install değeridir. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - en az düzeyde istemsiz UI gösterir ya da hiç UI göstermez ve - istem yoktur. Varsayılan olarak UI ve tüm istemler görüntülenir. - -/norestart - yeniden başlama denemelerini engeller. Varsayılan olarak UI yeniden başlatılmadan önce sorar. -/log log.txt - belirli bir günlük dosyası tutar. Varsayılan olarak %TEMP% içinde bir günlük dosyası oluşturulur. - &Kapat - Lisans &hüküm ve koşullarını kabul ediyorum - &Yükle - &Kapat - Kurulum İlerleme Durumu - İşleniyor: - Başlatılıyor... - &İptal - Kurulumu değiştir - &Onar - K&aldır - &Kapat - Onarım Başarıyla Tamamlandı - Kaldırma Başarıyla Tamamlandı - Yükleme Başarıyla Tamamlandı - Kurulum Başarılı - &Başlat - Yazılımı kullanabilmeniz için bilgisayarınızı yeniden başlatmanız gerekiyor. - 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 - - [WixBundleName] Kurulumu'na Hoş Geldiniz. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">lisans koşulları</a> ve <a href="https://go.microsoft.com/fwlink/?LinkId=786378">gizlilik bildirimi</a>. + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl index bf92e27877ac..364e3978952d 100644 --- a/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl @@ -1,55 +1,47 @@ - - - [BundleNameFull] 安装 - [BundleNameShort] - [BundleNameSub] - 版本 [WixBundleVersion] - 是否确实要取消? - 上一版本 - 安装程序帮助 - /install | /repair | /uninstall | /layout [\[]目录[\]] - 安装、修复、卸载 - 目录中的捆绑包或创建其完整本地副本。Install 为默认选择。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - 显示最少的 UI 且无提示，或不显示 UI 且 - 无提示。默认情况下，显示 UI 及全部提示。 - -/norestart - 禁止任何重启尝试。默认情况下将在重启前显示提示 UI。 -/log log.txt - 向特定文件写入日志。默认情况下在 %TEMP% 中创建日志文件。 - 关闭(&C) - 我同意许可条款和条件(&A) - 安装(&I) - 关闭(&C) - 安装进度 - 正在处理: - 正在初始化... - 取消(&C) - 修改安装程序 - 修复(&R) - 卸载(&U) - 关闭(&C) - 已成功完成修复 - 已成功完成卸载 - 已成功完成安装 - 设置成功 - 启动(&L) - 您必须先重新启动计算机，然后才能使用该软件。 - 重新启动(&R) - 关闭(&C) - 安装失败 - 安装失败 - 卸载失败 - 修复失败 - 一个或多个问题导致了安装失败。请修复这些问题，然后重试安装。有关详细信息，请参阅<a href="#">日志文件</a>。 - 必须重新启动计算机才能完成软件回退。 - 重新启动(&R) - 关闭(&C) - 文件正在使用 - 以下应用程序正在使用的文件需要更新: - 关闭应用程序并尝试重启(&A)。 - 不关闭应用程序(&D)。需要重启。 - 确定(&O) - 取消(&C) - - 欢迎使用 [WixBundleName] 安装程序。 - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">许可条款</a>和<a href="https://go.microsoft.com/fwlink/?LinkId=786378">隐私声明</a>。 + + \ No newline at end of file diff --git a/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl index e6c32bd70c27..40c96fc94c45 100644 --- a/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl @@ -1,55 +1,47 @@ - - - Configuración de [BundleNameFull] - [BundleNameShort] - [BundleNameSub] - Versión [WixBundleVersion] - ¿Está seguro de que desea cancelar la operación? - Versión anterior - Ayuda del programa de instalación - /install | /repair | /uninstall | /layout [\[]directorio[\]] - instala, repara, desinstala o - crea una copia local completa del paquete en el directorio. Install es la opción predeterminada. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -/passive | /quiet - muestra una IU mínima sin peticiones, o bien no muestra la IU - ni las peticiones. De forma predeterminada, se muestran la IU y todas las peticiones. - -/norestart - suprime los intentos de reiniciar. De forma predeterminada, la IU preguntará antes de reiniciar. -/log log.txt - se 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 - &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 se completó correctamente - La instalación o desinstalación se realizó correctamente - &Iniciar - Debe reiniciar el equipo para poder usar el software. - &Reiniciar - &Cerrar - Error de instalación - Error de instalación - No se pudo desinstalar - No se pudo reparar - Error de instalación debido a uno o varios problemas. Corrija los problemas e intente de nuevo la instalación. Para obtener más información, consulte el <a href="#">archivo de registro</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 - - Programa de instalación de [WixBundleName]. - [WixBundleName] <a href="https://go.microsoft.com/fwlink/?LinkId=329770">Términos de licencia</a> y <a href="https://go.microsoft.com/fwlink/?LinkId=786378">declaración de privacidad</a>. + + \ No newline at end of file From b91f2e01d37bbe4265a93e362354be0ef1722879 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 9 Sep 2025 10:15:39 -0700 Subject: [PATCH 091/102] Update bundleproj --- .../bundle/aspnetcore-runtime-bundle.bundleproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj index b1011b202c90..013a867c092d 100644 --- a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -24,6 +24,14 @@ + + + + + + + + From 1ecfdb9dc33787ae10c0a0ab374d7c44346a9c84 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 9 Sep 2025 11:34:09 -0700 Subject: [PATCH 092/102] Use wix 5 in runtime bundle --- .../App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj index 013a867c092d..db370eb4bc9c 100644 --- a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -20,6 +20,7 @@ true HyperlinkLicense + true From 750dbd36838a627db6794aae13a1611776639745 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 9 Sep 2025 13:35:16 -0700 Subject: [PATCH 093/102] Update Arcade --- eng/Version.Details.props | 14 +++++++------- eng/Version.Details.xml | 14 +++++++------- global.json | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4f85f93e1c6b..e4fece9eb015 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -9,13 +9,13 @@ This file should be imported by eng/Versions.props 10.0.0-rc.1.25420.121 10.0.0-rc.1.25420.121 10.0.0-rc.1.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 10.0.0-rc.1.25420.121 10.0.0-rc.1.25420.121 10.0.0-rc.1.25420.121 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a29b8235100d..b9a15df8a72f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -362,31 +362,31 @@ https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 - + https://github.com/dotnet/dotnet c4dc56079d959dbdb7fc27ea8ad7f95194885923 diff --git a/global.json b/global.json index ff8ebbeee787..68d5a8334710 100644 --- a/global.json +++ b/global.json @@ -32,9 +32,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.121", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.121", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25420.121", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25454.102", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25454.102", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25454.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382" From c192a73eb7c137f0e4635749ebe44ba4b9934235 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 10 Sep 2025 08:08:44 -0700 Subject: [PATCH 094/102] Stop using WixThemeVariables --- .../bundle/aspnetcore-runtime-bundle.bundleproj | 14 -------------- src/Framework/App.Runtime/bundle/bundle.thm | 1 - .../App.Runtime/bundle/theme/1028/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1029/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1031/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1033/bundle.wxl | 7 +++---- .../App.Runtime/bundle/theme/1036/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1040/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1041/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1042/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1045/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1046/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1049/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/1055/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/2052/bundle.wxl | 5 ++--- .../App.Runtime/bundle/theme/3082/bundle.wxl | 5 ++--- 16 files changed, 29 insertions(+), 58 deletions(-) diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj index db370eb4bc9c..eac0e8c882ae 100644 --- a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -40,18 +40,4 @@ - - - Microsoft ASP.NET Core $(PackageBrandingVersion) - Shared Framework - $(BundleNameShort) - $(BundleNameSub) ($(TargetArchitecture)) - $(BundleName) - - - - - - - - diff --git a/src/Framework/App.Runtime/bundle/bundle.thm b/src/Framework/App.Runtime/bundle/bundle.thm index 8f2b485a2d08..72372b44fc78 100644 --- a/src/Framework/App.Runtime/bundle/bundle.thm +++ b/src/Framework/App.Runtime/bundle/bundle.thm @@ -14,7 +14,6 @@ #(loc.Title) - #(loc.SubTitle) diff --git a/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl index 392e90c10f53..303b86c6d639 100644 --- a/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1028/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl index 0dd1e2dfc763..ce6270a526e5 100644 --- a/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1029/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl index af90409d939c..224e8331564b 100644 --- a/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1031/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl index 5583060cecc3..814cc29fadf8 100644 --- a/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl @@ -1,10 +1,9 @@  - - + + - + - diff --git a/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl index 27dd51ccb733..43088ebe8df5 100644 --- a/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1036/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl index fb2c2ebb384a..c0b776aa8314 100644 --- a/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1040/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl index 2d3cdab2827d..9e653f235127 100644 --- a/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1041/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl index ef7d8360302b..420b2c1f5722 100644 --- a/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1042/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl index c1dff403edfd..b755d8bd1b16 100644 --- a/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1045/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl index 8552ce3447ae..4d8002750261 100644 --- a/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1046/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl index 63bcf38806b5..b14ce444a452 100644 --- a/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1049/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl index b53a9c8216d9..399c01619511 100644 --- a/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1055/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl index 364e3978952d..91b729c0d79e 100644 --- a/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/2052/bundle.wxl @@ -1,7 +1,6 @@  - - - + + diff --git a/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl index 40c96fc94c45..6151dccba595 100644 --- a/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/3082/bundle.wxl @@ -1,7 +1,6 @@  - - - + + From 28e7490fa551b7fc97561ae0fee8c3421c59c16e Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 10 Sep 2025 09:20:22 -0700 Subject: [PATCH 095/102] Not using hyperlink license anymore --- .../App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj index eac0e8c882ae..6023cd007828 100644 --- a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -19,7 +19,6 @@ $(AspNetCorePatchVersion) true - HyperlinkLicense true From cff8a920c73499c5f6f4a6dd82c95b5110fcab8b Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 10 Sep 2025 10:37:42 -0700 Subject: [PATCH 096/102] Some loc stuff --- src/Framework/App.Runtime/bundle/bundle.thm | 4 +++- src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Framework/App.Runtime/bundle/bundle.thm b/src/Framework/App.Runtime/bundle/bundle.thm index 72372b44fc78..350e9d4bf8d8 100644 --- a/src/Framework/App.Runtime/bundle/bundle.thm +++ b/src/Framework/App.Runtime/bundle/bundle.thm @@ -24,7 +24,9 @@ - + + #(loc.WelcomeHeaderMessage) + #(loc.WelcomeDescription) diff --git a/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl index 814cc29fadf8..c7cafcde9c66 100644 --- a/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl @@ -62,9 +62,9 @@ + ASP.NET Runtime + The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! - - \ No newline at end of file From dde7bcbf0a5dc0e65b76f025653706c3c19cf627 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 16 Sep 2025 12:27:52 -0700 Subject: [PATCH 097/102] X86 & FilesInUse --- .../App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj | 2 ++ src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl | 5 +++++ .../Windows/WindowsHostingBundle/LCID/1033/thm.wxl | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj index 6023cd007828..fa5e05dbb6ab 100644 --- a/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj +++ b/src/Framework/App.Runtime/bundle/aspnetcore-runtime-bundle.bundleproj @@ -6,6 +6,8 @@ false false + + x86 ASP.NET Core Shared Framework Bundle Installer $(MSBuildProjectDirectory) aspnetcore-runtime diff --git a/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl index c7cafcde9c66..c7c1ba962cd2 100644 --- a/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl +++ b/src/Framework/App.Runtime/bundle/theme/1033/bundle.wxl @@ -59,8 +59,13 @@ + + + + + ASP.NET Runtime The ASP.NET Runtime is used to run ASP.NET applications, on your Windows computer. ASP.NET is open source, cross platform, and supported by Microsoft. We hope you enjoy it! diff --git a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl index 0956af2ab86a..5fe7efe2ab1a 100644 --- a/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl +++ b/src/Installers/Windows/WindowsHostingBundle/LCID/1033/thm.wxl @@ -52,9 +52,14 @@ + + + + + From 684c12b018e382f42a2ea937c2868629c0d4916d Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 16 Sep 2025 14:28:34 -0700 Subject: [PATCH 098/102] Sign less --- .azure/pipelines/ci-unofficial.yml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index 2ba05ad9b17b..133c7e255d22 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -59,12 +59,6 @@ variables: value: -RuntimeSourceFeed https://ci.dot.net/internal -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)' -# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This -# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically. -- name: _InternalRuntimeDownloadCodeSignArgs - value: $(_InternalRuntimeDownloadArgs) - /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal - /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - group: DotNet-HelixApi-Access - name: _SignType value: test @@ -181,11 +175,9 @@ extends: -prepareMachine -noBuildRepoTasks -arch arm64 - -sign -pack -noBuildJava -noBuildNative - /p:DotNetSignType=$(_SignType) /p:OnlyPackPlatformSpecificPackages=true $(_BuildArgs) $(_InternalRuntimeDownloadArgs) @@ -208,23 +200,6 @@ extends: MSBUILDUSESERVER: "1" displayName: Build SiteExtension - # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If - # https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other - # previous steps. Sign check is disabled because it is run in a separate step below, after installers are built. - - script: ./eng/build.cmd - -ci - -prepareMachine - -noBuildRepoTasks - -noBuildNative - -noBuild - -sign - /p:DotNetSignType=$(_SignType) - $(_BuildArgs) - $(WindowsSignLogArgs) - env: - MSBUILDUSESERVER: "1" - displayName: Code sign packages - # Windows installers bundle x86/x64/arm64 assets - script: ./eng/build.cmd -ci From 23ef642d2a98d6f7c076112a186949a44190d6c1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 17 Sep 2025 10:35:37 -0700 Subject: [PATCH 099/102] Try new enable conditions --- .azure/pipelines/ci-unofficial.yml | 6 ++++++ src/Installers/Windows/WindowsHostingBundle/ANCM.wxs | 8 +------- src/Installers/Windows/WindowsHostingBundle/Bundle.wxs | 5 +---- src/Installers/Windows/WindowsHostingBundle/bundle.thm | 8 ++++---- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.azure/pipelines/ci-unofficial.yml b/.azure/pipelines/ci-unofficial.yml index 133c7e255d22..30989fd4d25e 100644 --- a/.azure/pipelines/ci-unofficial.yml +++ b/.azure/pipelines/ci-unofficial.yml @@ -59,6 +59,12 @@ variables: value: -RuntimeSourceFeed https://ci.dot.net/internal -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) /p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)' +# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This +# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically. +- name: _InternalRuntimeDownloadCodeSignArgs + value: $(_InternalRuntimeDownloadArgs) + /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - group: DotNet-HelixApi-Access - name: _SignType value: test diff --git a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs index ca8b7fa39a8c..f11fde32bc06 100644 --- a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs @@ -32,12 +32,6 @@ - - - - - - - + diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 813278b143ec..c9cfbf141bfe 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -40,10 +40,7 @@ - - - - + diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index 284ecf187466..85fd83dc7116 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -28,8 +28,8 @@ - #(loc.InstallResetIIS) - #(loc.InstallNoIIS) + #(loc.InstallResetIIS) + #(loc.InstallNoIIS) @@ -59,8 +59,8 @@ - - + #(loc.ModifyResetIIS) + #(loc.ModifyNoIIS) From 8c9b3891efe15d73b5cc0d63410dca17afa3faa7 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 17 Sep 2025 10:37:36 -0700 Subject: [PATCH 100/102] NOT --- src/Installers/Windows/WindowsHostingBundle/bundle.thm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/WindowsHostingBundle/bundle.thm b/src/Installers/Windows/WindowsHostingBundle/bundle.thm index 85fd83dc7116..94b911589d02 100644 --- a/src/Installers/Windows/WindowsHostingBundle/bundle.thm +++ b/src/Installers/Windows/WindowsHostingBundle/bundle.thm @@ -60,7 +60,7 @@ #(loc.ModifyResetIIS) - #(loc.ModifyNoIIS) + #(loc.ModifyNoIIS) From dbbe43a07e42a2aed1b1289e89820e4ac70b79aa Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 17 Sep 2025 11:44:53 -0700 Subject: [PATCH 101/102] Fix signing --- .azure/pipelines/ci.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 7c968f353eef..16cb6f1bc3f6 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -202,11 +202,9 @@ extends: -prepareMachine -noBuildRepoTasks -arch arm64 - -sign -pack -noBuildJava -noBuildNative - /p:DotNetSignType=$(_SignType) /p:OnlyPackPlatformSpecificPackages=true $(_BuildArgs) $(_InternalRuntimeDownloadArgs) @@ -228,23 +226,6 @@ extends: MSBUILDUSESERVER: "1" displayName: Build SiteExtension - # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If - # https://github.com/dotnet/arcade/issues/1957 is resolved, consider running code-signing inline with the other - # previous steps. Sign check is disabled because it is run in a separate step below, after installers are built. - - script: ./eng/build.cmd - -ci - -prepareMachine - -noBuildRepoTasks - -noBuildNative - -noBuild - -sign - /p:DotNetSignType=$(_SignType) - $(_BuildArgs) - $(WindowsSignLogArgs) - env: - MSBUILDUSESERVER: "1" - displayName: Code sign packages - # Windows installers bundle x86/x64/arm64 assets - script: ./eng/build.cmd -ci From 9ca6fe61a285e14345b2df1f6cb86f448324103b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 17 Sep 2025 12:00:39 -0700 Subject: [PATCH 102/102] Feedback --- eng/targets/BeforeWix.Common.targets | 16 ---------------- .../Windows/WindowsHostingBundle/ANCM.wxs | 6 +++--- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/eng/targets/BeforeWix.Common.targets b/eng/targets/BeforeWix.Common.targets index 5145e2ae943b..99c95b6f503d 100644 --- a/eng/targets/BeforeWix.Common.targets +++ b/eng/targets/BeforeWix.Common.targets @@ -1,21 +1,5 @@ - - - - Microsoft400 - - - Microsoft400 - - - Microsoft400 - - - Microsoft400 - - - yes $(ProductName) diff --git a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs index f11fde32bc06..2b200b1df23d 100644 --- a/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/ANCM.wxs @@ -29,9 +29,9 @@ - +