From eb954e1575d2fdaf3aa20d00c136f62a57b5ec09 Mon Sep 17 00:00:00 2001 From: Kaarlo Räihä Date: Thu, 6 Oct 2022 20:11:08 +0300 Subject: Use HTTPS instead of HTTP Fix some of these --- src/api/wix/WixToolset.Data/ErrorMessages.cs | 8 ++++---- src/api/wix/WixToolset.Data/Json/SimpleJson.cs | 2 +- src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs | 2 +- src/api/wix/WixToolset.Data/WarningMessages.cs | 2 +- src/libs/dutil/WixToolset.DUtil/deputil.cpp | 2 +- src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs | 4 ++-- src/wix/WixToolset.Core/Compiler_Dependency.cs | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs index fcf377e3..cb8da02a 100644 --- a/src/api/wix/WixToolset.Data/ErrorMessages.cs +++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs @@ -1063,7 +1063,7 @@ namespace WixToolset.Data public static Message IllegalTerminalServerCustomActionAttributes(SourceLineNumber sourceLineNumbers) { - 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 http://msdn.microsoft.com/library/aa372071.aspx.\""); + 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.\""); } public static Message IllegalValidationArguments() @@ -2048,12 +2048,12 @@ namespace WixToolset.Data public static Message UnexpectedExternalUIMessage(string message) { - return Message(null, Ids.UnexpectedExternalUIMessage, "Error executing unknown ICE action. The most common cause of this kind of ICE failure is an incorrectly registered scripting engine. See http://wixtoolset.org/documentation/error217/ for details and how to solve this problem. The following string format was not expected by the external UI message logger: \"{0}\".", message); + return Message(null, Ids.UnexpectedExternalUIMessage, "Error executing unknown ICE action. The most common cause of this kind of ICE failure is an incorrectly registered scripting engine. See https://wixtoolset.org/documentation/error217/ for details and how to solve this problem. The following string format was not expected by the external UI message logger: \"{0}\".", message); } public static Message UnexpectedExternalUIMessage(string message, string action) { - return Message(null, Ids.UnexpectedExternalUIMessage, "Error executing ICE action '{1}'. The most common cause of this kind of ICE failure is an incorrectly registered scripting engine. See http://wixtoolset.org/documentation/error217/ for details and how to solve this problem. The following string format was not expected by the external UI message logger: \"{0}\".", message, action); + return Message(null, Ids.UnexpectedExternalUIMessage, "Error executing ICE action '{1}'. The most common cause of this kind of ICE failure is an incorrectly registered scripting engine. See https://wixtoolset.org/documentation/error217/ for details and how to solve this problem. The following string format was not expected by the external UI message logger: \"{0}\".", message, action); } public static Message UnexpectedFileExtension(string fileName, string expectedExtensions) @@ -2183,7 +2183,7 @@ namespace WixToolset.Data public static Message ValidationFailedDueToMultilanguageMergeModule() { - 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 http://msdn.microsoft.com/library/aa367799.aspx, or disable validation."); + 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."); } public static Message ValidationFailedToOpenDatabase() diff --git a/src/api/wix/WixToolset.Data/Json/SimpleJson.cs b/src/api/wix/WixToolset.Data/Json/SimpleJson.cs index 3d956f6e..8ac1f25a 100644 --- a/src/api/wix/WixToolset.Data/Json/SimpleJson.cs +++ b/src/api/wix/WixToolset.Data/Json/SimpleJson.cs @@ -488,7 +488,7 @@ namespace SimpleJson { /// /// This class encodes and decodes JSON strings. - /// Spec. details, see http://www.json.org/ + /// Spec. details, see https://www.json.org/ /// /// JSON uses Arrays and Objects. These correspond here to the datatypes JsonArray(IList<object>) and JsonObject(IDictionary<string,object>). /// All numbers are parsed to doubles. diff --git a/src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/LockPermissionsSymbol.cs index b9337446..79e02f6e 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 /// ///------------------------------------------------------------------------------------------------- - /// Layout of an Access Mask (from http://technet.microsoft.com/en-us/library/cc783530(WS.10).aspx) + /// Layout of an Access Mask (from https://technet.microsoft.com/en-us/library/cc783530(WS.10).aspx) /// /// ------------------------------------------------------------------------------------------------- /// |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 5eb8fb62..aba0eb09 100644 --- a/src/api/wix/WixToolset.Data/WarningMessages.cs +++ b/src/api/wix/WixToolset.Data/WarningMessages.cs @@ -384,7 +384,7 @@ namespace WixToolset.Data public static Message MajorUpgradePatchNotRecommended() { - 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 http://msdn2.microsoft.com/library/aa367571.aspx for more information."); + 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."); } 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 f92c7d18..b5649948 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"; enum eRequiresAttributes { RequiresAttributesMinVersionInclusive = 256, RequiresAttributesMaxVersionInclusive = 512 }; // We write to Software\Classes explicitly based on the current security context instead of HKCR. -// See http://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information. +// See https://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information. static LPCWSTR vsczRegistryRoot = L"Software\\Classes\\Installer\\Dependencies\\"; static LPCWSTR vsczRegistryDependents = L"Dependents"; diff --git a/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs index f3afd64e..01d5657b 100644 --- a/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs +++ b/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs @@ -56,7 +56,7 @@ namespace WixToolset.Core.Burn.Bundles this.FlattenDependentReferences(constraints); - // Reorder by topographical sort (http://en.wikipedia.org/wiki/Topological_sorting) + // Reorder by topographical sort (https://en.wikipedia.org/wiki/Topological_sorting) // We use a variation of Kahn (1962) algorithm as described in // Wikipedia, with the additional criteria that start nodes are sorted // lexicographically at each step to ensure a deterministic ordering @@ -198,7 +198,7 @@ namespace WixToolset.Core.Burn.Bundles /// /// /// We use a variation of Kahn (1962) algorithm as described in - /// Wikipedia (http://en.wikipedia.org/wiki/Topological_sorting), with + /// Wikipedia (https://en.wikipedia.org/wiki/Topological_sorting), with /// the additional criteria that start nodes are sorted lexicographically /// at each step to ensure a deterministic ordering based on 'after' /// dependencies and ID. diff --git a/src/wix/WixToolset.Core/Compiler_Dependency.cs b/src/wix/WixToolset.Core/Compiler_Dependency.cs index 664ac1be..d0230527 100644 --- a/src/wix/WixToolset.Core/Compiler_Dependency.cs +++ b/src/wix/WixToolset.Core/Compiler_Dependency.cs @@ -14,7 +14,7 @@ namespace WixToolset.Core { // The root registry key for the dependency extension. We write to Software\Classes explicitly // based on the current security context instead of HKCR. See - // http://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information. + // https://msdn.microsoft.com/en-us/library/ms724475(VS.85).aspx for more information. private const string DependencyRegistryRoot = @"Software\Classes\Installer\Dependencies\"; private static readonly char[] InvalidDependencyCharacters = new char[] { ' ', '\"', ';', '\\' }; -- cgit v1.2.3-55-g6feb