From 46fcb7f54bac41483581c1ae7dd58d96146431a6 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 23 Jul 2025 10:18:08 -0700 Subject: [PATCH 01/18] 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 02/18] 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 03/18] 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 04/18] 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 05/18] 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 06/18] 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 07/18] 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 08/18] 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 09/18] 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 10/18] 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 11/18] 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 12/18] 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 13/18] 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 14/18] 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 15/18] 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 16/18] 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 17/18] 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 18/18] 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 @@ - +