aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaarlo Räihä <mcraiha@users.noreply.github.com>2022-10-07 18:38:56 +0300
committerRob Mensching <rob@firegiant.com>2022-11-04 17:29:34 -0700
commitaec4d14e6f73727a2ae73f43c22f187d52bf37ca (patch)
tree57ce27155e9de431188103aa614d19050688fdbc
parenteb954e1575d2fdaf3aa20d00c136f62a57b5ec09 (diff)
downloadwix-aec4d14e6f73727a2ae73f43c22f187d52bf37ca.tar.gz
wix-aec4d14e6f73727a2ae73f43c22f187d52bf37ca.tar.bz2
wix-aec4d14e6f73727a2ae73f43c22f187d52bf37ca.zip
Update URLs to their redirected ones
To make things a bit more future-proof
-rw-r--r--src/api/wix/WixToolset.Data/ErrorMessages.cs4
-rw-r--r--src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs2
-rw-r--r--src/api/wix/WixToolset.Data/WarningMessages.cs2
-rw-r--r--src/libs/dutil/WixToolset.DUtil/deputil.cpp2
-rw-r--r--src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs2
-rw-r--r--src/wix/WixToolset.Core/Compiler_Dependency.cs2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs
index cb8da02a..c447f89d 100644
--- a/src/api/wix/WixToolset.Data/ErrorMessages.cs
+++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs
@@ -1063,7 +1063,7 @@ namespace WixToolset.Data
1063 1063
1064 public static Message IllegalTerminalServerCustomActionAttributes(SourceLineNumber sourceLineNumbers) 1064 public static Message IllegalTerminalServerCustomActionAttributes(SourceLineNumber sourceLineNumbers)
1065 { 1065 {
1066 return Message(sourceLineNumbers, Ids.IllegalTerminalServerCustomActionAttributes, "The CustomAction/@TerminalServerAware attribute's value is 'yes' but the Execute attribute is not 'deferred,' 'rollback,' or 'commit.' Terminal-Server-aware custom actions must be deferred, rollback, or commit custom actions. For more information, see https://msdn.microsoft.com/library/aa372071.aspx.\""); 1066 return Message(sourceLineNumbers, Ids.IllegalTerminalServerCustomActionAttributes, "The CustomAction/@TerminalServerAware attribute's value is 'yes' but the Execute attribute is not 'deferred,' 'rollback,' or 'commit.' Terminal-Server-aware custom actions must be deferred, rollback, or commit custom actions. For more information, see https://learn.microsoft.com/en-us/windows/win32/msi/terminalserver .\"");
1067 } 1067 }
1068 1068
1069 public static Message IllegalValidationArguments() 1069 public static Message IllegalValidationArguments()
@@ -2183,7 +2183,7 @@ namespace WixToolset.Data
2183 2183
2184 public static Message ValidationFailedDueToMultilanguageMergeModule() 2184 public static Message ValidationFailedDueToMultilanguageMergeModule()
2185 { 2185 {
2186 return Message(null, Ids.ValidationFailedDueToMultilanguageMergeModule, "Failed to open merge module for validation. The most common cause of this error is specifying that the merge module supports multiple languages (using the Package/@Languages attribute) but not including language-specific embedded transforms. To fix this error, make the merge module language-neutral, make it language-specific, embed language transforms as specified in the MSI SDK at https://msdn.microsoft.com/library/aa367799.aspx, or disable validation."); 2186 return Message(null, Ids.ValidationFailedDueToMultilanguageMergeModule, "Failed to open merge module for validation. The most common cause of this error is specifying that the merge module supports multiple languages (using the Package/@Languages attribute) but not including language-specific embedded transforms. To fix this error, make the merge module language-neutral, make it language-specific, embed language transforms as specified in the MSI SDK at https://learn.microsoft.com/en-us/windows/win32/msi/authoring-multiple-language-merge-modules, or disable validation.");
2187 } 2187 }
2188 2188
2189 public static Message ValidationFailedToOpenDatabase() 2189 public static Message ValidationFailedToOpenDatabase()
diff --git a/src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs
index 79e02f6e..0cf42886 100644
--- a/src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs
@@ -33,7 +33,7 @@ namespace WixToolset.Data.Symbols
33 33
34 /// <summary> 34 /// <summary>
35 ///------------------------------------------------------------------------------------------------- 35 ///-------------------------------------------------------------------------------------------------
36 /// Layout of an Access Mask (from https://technet.microsoft.com/en-us/library/cc783530(WS.10).aspx) 36 /// Layout of an Access Mask (from https://learn.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2003/cc783530(v=ws.10))
37 /// 37 ///
38 /// ------------------------------------------------------------------------------------------------- 38 /// -------------------------------------------------------------------------------------------------
39 /// |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10|09|08|07|06|05|04|03|02|01|00| 39 /// |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|11|10|09|08|07|06|05|04|03|02|01|00|
diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs
index aba0eb09..5455c3ad 100644
--- a/src/api/wix/WixToolset.Data/WarningMessages.cs
+++ b/src/api/wix/WixToolset.Data/WarningMessages.cs
@@ -384,7 +384,7 @@ namespace WixToolset.Data
384 384
385 public static Message MajorUpgradePatchNotRecommended() 385 public static Message MajorUpgradePatchNotRecommended()
386 { 386 {
387 return Message(null, Ids.MajorUpgradePatchNotRecommended, "Changing the ProductCode in a patch is not recommended because the patch cannot be uninstalled nor can it be sequenced along with other patches for the target product. See https://msdn2.microsoft.com/library/aa367571.aspx for more information."); 387 return Message(null, Ids.MajorUpgradePatchNotRecommended, "Changing the ProductCode in a patch is not recommended because the patch cannot be uninstalled nor can it be sequenced along with other patches for the target product. See https://learn.microsoft.com/en-us/windows/win32/msi/applying-major-upgrades-by-patching-the-local-installation-of-the-product for more information.");
388 } 388 }
389 389
390 public static Message MediaExternalCabinetFilenameIllegal(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value) 390 public static Message MediaExternalCabinetFilenameIllegal(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
diff --git a/src/libs/dutil/WixToolset.DUtil/deputil.cpp b/src/libs/dutil/WixToolset.DUtil/deputil.cpp
index b5649948..aa19353e 100644
--- a/src/libs/dutil/WixToolset.DUtil/deputil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/deputil.cpp
@@ -29,7 +29,7 @@ static LPCWSTR vcszAttributesValue = L"Attributes";
29enum eRequiresAttributes { RequiresAttributesMinVersionInclusive = 256, RequiresAttributesMaxVersionInclusive = 512 }; 29enum eRequiresAttributes { RequiresAttributesMinVersionInclusive = 256, RequiresAttributesMaxVersionInclusive = 512 };
30 30
31// We write to Software\Classes explicitly based on the current security context instead of HKCR. 31// We write to Software\Classes explicitly based on the current security context instead of HKCR.
32// See https://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information. 32// See https://learn.microsoft.com/en-us/windows/win32/sysinfo/hkey-classes-root-key for more information.
33static LPCWSTR vsczRegistryRoot = L"Software\\Classes\\Installer\\Dependencies\\"; 33static LPCWSTR vsczRegistryRoot = L"Software\\Classes\\Installer\\Dependencies\\";
34static LPCWSTR vsczRegistryDependents = L"Dependents"; 34static LPCWSTR vsczRegistryDependents = L"Dependents";
35 35
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs
index 1bd2a427..b2ffabcf 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessDependencyReferencesCommand.cs
@@ -13,7 +13,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
13 { 13 {
14 // The root registry key for the dependency extension. We write to Software\Classes explicitly 14 // The root registry key for the dependency extension. We write to Software\Classes explicitly
15 // based on the current security context instead of HKCR. See 15 // based on the current security context instead of HKCR. See
16 // http://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information. 16 // https://learn.microsoft.com/en-us/windows/win32/sysinfo/hkey-classes-root-key for more information.
17 private const string DependencyRegistryRoot = @"Software\Classes\Installer\Dependencies\"; 17 private const string DependencyRegistryRoot = @"Software\Classes\Installer\Dependencies\";
18 private const string RegistryDependents = "Dependents"; 18 private const string RegistryDependents = "Dependents";
19 19
diff --git a/src/wix/WixToolset.Core/Compiler_Dependency.cs b/src/wix/WixToolset.Core/Compiler_Dependency.cs
index d0230527..5cc4bf77 100644
--- a/src/wix/WixToolset.Core/Compiler_Dependency.cs
+++ b/src/wix/WixToolset.Core/Compiler_Dependency.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Core
14 { 14 {
15 // The root registry key for the dependency extension. We write to Software\Classes explicitly 15 // The root registry key for the dependency extension. We write to Software\Classes explicitly
16 // based on the current security context instead of HKCR. See 16 // based on the current security context instead of HKCR. See
17 // https://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information. 17 // https://learn.microsoft.com/en-us/windows/win32/sysinfo/hkey-classes-root-key for more information.
18 private const string DependencyRegistryRoot = @"Software\Classes\Installer\Dependencies\"; 18 private const string DependencyRegistryRoot = @"Software\Classes\Installer\Dependencies\";
19 19
20 private static readonly char[] InvalidDependencyCharacters = new char[] { ' ', '\"', ';', '\\' }; 20 private static readonly char[] InvalidDependencyCharacters = new char[] { ' ', '\"', ';', '\\' };