mirror of
https://github.com/terrymacdonald/DisplayMagician.git
synced 2024-08-30 18:32:20 +00:00
Initial Code Analysis fixes
Also fixed up the Setup properties file for x64 build configuration.
This commit is contained in:
Terry MacDonald
parent
6759cc4aa0
commit
49329b870e
@ -18,8 +18,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisplayMagicianTests", "Dis
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DisplayMagicianSetup", "DisplayMagicianSetup\DisplayMagicianSetup.wixproj", "{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DisplayMagicianBootstrapper", "DisplayMagicianBootstrapper\DisplayMagicianBootstrapper.wixproj", "{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|AnyCPU = Debug|AnyCPU
|
||||
@ -90,25 +88,18 @@ Global
|
||||
{D7AFD3CC-53BF-4991-ABFE-638A3F355310}.Release|x64.Build.0 = Release|Any CPU
|
||||
{D7AFD3CC-53BF-4991-ABFE-638A3F355310}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{D7AFD3CC-53BF-4991-ABFE-638A3F355310}.Release|x86.Build.0 = Release|Any CPU
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|AnyCPU.ActiveCfg = Debug|x86
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|AnyCPU.Build.0 = Debug|x86
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|AnyCPU.ActiveCfg = Debug|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|AnyCPU.Build.0 = Debug|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|x64.Build.0 = Debug|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Debug|x86.Build.0 = Debug|x86
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Release|AnyCPU.ActiveCfg = Release|x86
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Release|AnyCPU.ActiveCfg = Release|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Release|AnyCPU.Build.0 = Release|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Release|x64.ActiveCfg = Release|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Release|x64.Build.0 = Release|x64
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Release|x86.ActiveCfg = Release|x86
|
||||
{DFD22D4D-F2E4-4BA4-B32A-7A990A35BA08}.Release|x86.Build.0 = Release|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Debug|AnyCPU.ActiveCfg = Debug|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Debug|x86.Build.0 = Debug|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Release|AnyCPU.ActiveCfg = Release|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Release|x64.ActiveCfg = Release|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Release|x86.ActiveCfg = Release|x86
|
||||
{59F3F084-EC7E-42D4-B0F4-8131B82BDB3B}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -20,7 +20,7 @@ namespace DisplayMagician
|
||||
[Guid("56F14154-6339-4B94-8B82-80F78D5BCEAF"), ComVisible(true)]
|
||||
public class DesktopNotificationActivator : NotificationActivator
|
||||
{
|
||||
public override void OnActivated(string invokedArgs, NotificationUserInput userInput, string appUserModelId)
|
||||
public override void OnActivated(string arguments, NotificationUserInput userInput, string appUserModelId)
|
||||
{
|
||||
// Invoke the code we're running on the UI Thread to avoid
|
||||
// cross thread exceptions
|
||||
@ -29,11 +29,11 @@ namespace DisplayMagician
|
||||
// This code is running on the main UI thread!
|
||||
|
||||
// Parse the query string (using NuGet package QueryString.NET)
|
||||
QueryString args = QueryString.Parse(invokedArgs);
|
||||
QueryString args = QueryString.Parse(arguments);
|
||||
|
||||
foreach (QueryStringParameter myArg in args)
|
||||
{
|
||||
if (myArg.Name.Equals("action",StringComparison.InvariantCultureIgnoreCase))
|
||||
if (myArg.Name.Equals("action",StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
// See what action is being requested
|
||||
switch (args["action"].ToLowerInvariant())
|
||||
|
||||
@ -64,6 +64,7 @@ namespace DesktopNotifications
|
||||
/// under Desktop Bridge. Call this upon application startup, before calling any other APIs.
|
||||
/// </summary>
|
||||
/// <param name="aumid">An AUMID that uniquely identifies your application.</param>
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
|
||||
public static void RegisterAumidAndComServer<T>(string aumid)
|
||||
where T : NotificationActivator
|
||||
{
|
||||
@ -127,6 +128,7 @@ namespace DesktopNotifications
|
||||
/// Registers the activator type as a COM server client so that Windows can launch your activator.
|
||||
/// </summary>
|
||||
/// <typeparam name="T">Your implementation of NotificationActivator. Must have GUID and ComVisible attributes on class.</typeparam>
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
|
||||
public static void RegisterActivator<T>()
|
||||
where T : NotificationActivator, new()
|
||||
{
|
||||
@ -225,6 +227,7 @@ namespace DesktopNotifications
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "RegisterAumidAndComServer")]
|
||||
private static void EnsureRegistered()
|
||||
{
|
||||
// If not registered AUMID yet
|
||||
@ -350,6 +353,7 @@ namespace DesktopNotifications
|
||||
/// Gets all notifications sent by this app that are currently still in Action Center.
|
||||
/// </summary>
|
||||
/// <returns>A collection of toasts.</returns>
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
|
||||
public IReadOnlyList<ToastNotification> GetHistory()
|
||||
{
|
||||
return _aumid != null ? _history.GetHistory(_aumid) : _history.GetHistory();
|
||||
|
||||
@ -51,7 +51,8 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<Prefer32Bit>false</Prefer32Bit>
|
||||
<RunCodeAnalysis>true</RunCodeAnalysis>
|
||||
<RunCodeAnalysis>false</RunCodeAnalysis>
|
||||
<CodeAnalysisRuleSet>BasicCorrectnessRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationIcon>Resources\DisplayMagician.ico</ApplicationIcon>
|
||||
@ -97,6 +98,7 @@
|
||||
<Compile Include="GameLibraries\UplayConfigurationParser\UplayConfigurationParser.cs" />
|
||||
<Compile Include="GameLibraries\UplayLibrary.cs" />
|
||||
<Compile Include="GameLibraries\SteamLibrary.cs" />
|
||||
<Compile Include="GlobalSuppressions.cs" />
|
||||
<Compile Include="IconFromFile.cs" />
|
||||
<Compile Include="IconUtils.cs" />
|
||||
<Compile Include="ProgressReporter.cs" />
|
||||
|
||||
@ -15,7 +15,7 @@ namespace DisplayMagician
|
||||
{
|
||||
Name = display.DeviceName;
|
||||
Path = display.DevicePath;
|
||||
var index = Path.IndexOf("{", StringComparison.InvariantCultureIgnoreCase);
|
||||
var index = Path.IndexOf("{", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
if (index > 0)
|
||||
{
|
||||
|
||||
@ -128,6 +128,7 @@ namespace DisplayMagician.GameLibraries
|
||||
}
|
||||
}
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
|
||||
public bool CopyInto(SteamGame steamGame)
|
||||
{
|
||||
if (!(steamGame is SteamGame))
|
||||
|
||||
@ -190,6 +190,7 @@ namespace DisplayMagician.GameLibraries
|
||||
}
|
||||
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
|
||||
public static bool ContainsSteamGame(SteamGame steamGame)
|
||||
{
|
||||
if (!(steamGame is SteamGame))
|
||||
|
||||
@ -129,6 +129,7 @@ namespace DisplayMagician.GameLibraries
|
||||
}
|
||||
}*/
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
|
||||
public bool CopyTo(UplayGame uplayGame)
|
||||
{
|
||||
if (!(uplayGame is UplayGame))
|
||||
|
||||
@ -173,6 +173,7 @@ namespace DisplayMagician.GameLibraries
|
||||
}
|
||||
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
|
||||
public static bool ContainsUplayGame(UplayGame uplayGame)
|
||||
{
|
||||
if (!(uplayGame is UplayGame))
|
||||
@ -300,7 +301,7 @@ namespace DisplayMagician.GameLibraries
|
||||
// Go through every record and attempt to parse it
|
||||
foreach (string uplayEntry in uplayConfigFile) {
|
||||
// Skip any Uplay entry records that don't start with 'version:'
|
||||
if (!uplayEntry.StartsWith("version:",StringComparison.InvariantCultureIgnoreCase))
|
||||
if (!uplayEntry.StartsWith("version:",StringComparison.OrdinalIgnoreCase))
|
||||
continue;
|
||||
|
||||
//Split the record into entrylines
|
||||
@ -398,7 +399,7 @@ namespace DisplayMagician.GameLibraries
|
||||
if (gotGameFileName && gotGameId && gotGameIconPath && gotGameName)
|
||||
break;
|
||||
// This line contains the Game Name
|
||||
if (uplayEntryLines[i].StartsWith(" name:", StringComparison.InvariantCultureIgnoreCase) && !gotGameName)
|
||||
if (uplayEntryLines[i].StartsWith(" name:", StringComparison.OrdinalIgnoreCase) && !gotGameName)
|
||||
{
|
||||
mc = Regex.Matches(uplayEntryLines[i], @" name\: (.*)");
|
||||
uplayGameAppInfo.GameName = mc[0].Groups[1].ToString();
|
||||
@ -409,7 +410,7 @@ namespace DisplayMagician.GameLibraries
|
||||
}
|
||||
gotGameName = true;
|
||||
}
|
||||
else if (uplayEntryLines[i].StartsWith(" icon_image:", StringComparison.InvariantCultureIgnoreCase) && !gotGameIconPath)
|
||||
else if (uplayEntryLines[i].StartsWith(" icon_image:", StringComparison.OrdinalIgnoreCase) && !gotGameIconPath)
|
||||
{
|
||||
mc = Regex.Matches(uplayEntryLines[i], @"icon_image: (.*)");
|
||||
string iconImageFileName = mc[0].Groups[1].ToString();
|
||||
|
||||
BIN
DisplayMagician/GlobalSuppressions.cs
Normal file
BIN
DisplayMagician/GlobalSuppressions.cs
Normal file
Binary file not shown.
@ -8,6 +8,9 @@ namespace DisplayMagician.InterProcess
|
||||
{
|
||||
internal class IPCClient : ClientBase<IService>, IService
|
||||
{
|
||||
|
||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||
|
||||
public IPCClient(Process process)
|
||||
: base(
|
||||
new ServiceEndpoint(
|
||||
@ -71,9 +74,10 @@ namespace DisplayMagician.InterProcess
|
||||
{
|
||||
if (process.Id != thisProcess.Id)
|
||||
{
|
||||
IPCClient processChannel = null;
|
||||
try
|
||||
{
|
||||
var processChannel = new IPCClient(process);
|
||||
processChannel = new IPCClient(process);
|
||||
|
||||
if (processChannel.Status == status)
|
||||
{
|
||||
@ -82,6 +86,8 @@ namespace DisplayMagician.InterProcess
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
processChannel = null;
|
||||
logger.Error(ex, $"IPCClient/QueryByStatus: Couldn't create an IPC Client");
|
||||
Console.WriteLine($"IPCClient/QueryByStatus exception: {ex.Message}: {ex.StackTrace} - {ex.InnerException}");
|
||||
// ignored
|
||||
}
|
||||
|
||||
@ -10,6 +10,8 @@ namespace DisplayMagician.InterProcess
|
||||
{
|
||||
private static ServiceHost _serviceHost;
|
||||
|
||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||
|
||||
private IPCService()
|
||||
{
|
||||
Status = InstanceStatus.Busy;
|
||||
@ -53,6 +55,7 @@ namespace DisplayMagician.InterProcess
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.Error(ex, $"IPCService/StartService exception: Couldn't create an IPC Service");
|
||||
Console.WriteLine($"IPCService/StartService exception: {ex.Message}: {ex.StackTrace} - {ex.InnerException}");
|
||||
try
|
||||
{
|
||||
@ -60,6 +63,7 @@ namespace DisplayMagician.InterProcess
|
||||
}
|
||||
catch (Exception ex2)
|
||||
{
|
||||
logger.Error(ex, $"IPCService/StartService exception: Couldn't close an IPC Service after error creating it");
|
||||
Console.WriteLine($"IPCService/StartService exception 2: {ex2.Message}: {ex2.InnerException}");
|
||||
// ignored
|
||||
}
|
||||
|
||||
@ -13,10 +13,8 @@ using DisplayMagicianShared;
|
||||
using DisplayMagician.UIForms;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Drawing;
|
||||
//using Microsoft.Toolkit.Uwp.Notifications;
|
||||
using DesktopNotifications;
|
||||
|
||||
//using System.Runtime.InteropServices;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace DisplayMagician {
|
||||
|
||||
@ -646,19 +644,40 @@ namespace DisplayMagician {
|
||||
|
||||
public class ApplyTopologyException : Exception
|
||||
{
|
||||
public ApplyTopologyException(String message) : base(message)
|
||||
public ApplyTopologyException()
|
||||
{ }
|
||||
|
||||
public ApplyTopologyException(string message) : base(message)
|
||||
{ }
|
||||
|
||||
public ApplyTopologyException(string message, Exception innerException) : base(message, innerException)
|
||||
{ }
|
||||
public ApplyTopologyException(SerializationInfo info, StreamingContext context) : base(info, context)
|
||||
{ }
|
||||
}
|
||||
|
||||
public class ApplyPathInfoException : Exception
|
||||
{
|
||||
public ApplyPathInfoException(String message) : base(message)
|
||||
public ApplyPathInfoException()
|
||||
{ }
|
||||
|
||||
public ApplyPathInfoException(string message) : base(message)
|
||||
{ }
|
||||
public ApplyPathInfoException(string message, Exception innerException) : base(message, innerException)
|
||||
{ }
|
||||
public ApplyPathInfoException(SerializationInfo info, StreamingContext context) : base(info, context)
|
||||
{ }
|
||||
}
|
||||
|
||||
public class LoadingInstalledGamesException : Exception
|
||||
{
|
||||
public LoadingInstalledGamesException(String message) : base(message)
|
||||
public LoadingInstalledGamesException()
|
||||
{ }
|
||||
public LoadingInstalledGamesException(string message) : base(message)
|
||||
{ }
|
||||
public LoadingInstalledGamesException(string message, Exception innerException) : base(message, innerException)
|
||||
{ }
|
||||
public LoadingInstalledGamesException(SerializationInfo info, StreamingContext context) : base(info, context)
|
||||
{ }
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
using System.Resources;
|
||||
using System;
|
||||
using System.Resources;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
@ -39,3 +40,5 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AssemblyVersion("0.2.0.*")]
|
||||
[assembly: AssemblyFileVersion("0.2.0.0")]
|
||||
[assembly: NeutralResourcesLanguage("en")]
|
||||
|
||||
[assembly: CLSCompliant(true)]
|
||||
@ -216,7 +216,7 @@ namespace DisplayMagician
|
||||
// Now we need to find and populate the profileToUse
|
||||
foreach (ProfileItem profileToTest in ProfileRepository.AllProfiles)
|
||||
{
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_profileToUse = profileToTest;
|
||||
break;
|
||||
@ -419,7 +419,7 @@ namespace DisplayMagician
|
||||
// Now we need to find and populate the profileToUse
|
||||
foreach (ProfileItem profileToTest in ProfileRepository.AllProfiles)
|
||||
{
|
||||
if (profileToTest.UUID.Equals(_profileUuid,StringComparison.InvariantCultureIgnoreCase))
|
||||
if (profileToTest.UUID.Equals(_profileUuid,StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_profileToUse = profileToTest;
|
||||
break;
|
||||
@ -617,7 +617,7 @@ namespace DisplayMagician
|
||||
// Now we need to find and populate the profileToUse
|
||||
foreach (ProfileItem profileToTest in ProfileRepository.AllProfiles)
|
||||
{
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_profileToUse = profileToTest;
|
||||
break;
|
||||
@ -729,7 +729,7 @@ namespace DisplayMagician
|
||||
// We try to find and set the ProfileTouse
|
||||
foreach (ProfileItem profileToTest in ProfileRepository.AllProfiles)
|
||||
{
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.OrdinalIgnoreCase))
|
||||
_profileToUse = profileToTest;
|
||||
}
|
||||
}
|
||||
@ -1224,7 +1224,7 @@ namespace DisplayMagician
|
||||
// Now we need to find and populate the profileToUse
|
||||
foreach (ProfileItem profileToTest in ProfileRepository.AllProfiles)
|
||||
{
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_profileToUse = profileToTest;
|
||||
break;
|
||||
@ -1431,7 +1431,7 @@ namespace DisplayMagician
|
||||
// Now we need to find and populate the profileToUse
|
||||
foreach (ProfileItem profileToTest in ProfileRepository.AllProfiles)
|
||||
{
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_profileToUse = profileToTest;
|
||||
break;
|
||||
@ -1634,7 +1634,7 @@ namespace DisplayMagician
|
||||
// Now we need to find and populate the profileToUse
|
||||
foreach (ProfileItem profileToTest in ProfileRepository.AllProfiles)
|
||||
{
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (profileToTest.UUID.Equals(_profileUuid, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_profileToUse = profileToTest;
|
||||
break;
|
||||
@ -1821,6 +1821,7 @@ namespace DisplayMagician
|
||||
}
|
||||
|
||||
|
||||
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
|
||||
public Bitmap ToBitmapOverlay(Bitmap originalBitmap, Bitmap overlayBitmap, int width, int height, PixelFormat format = PixelFormat.Format32bppArgb)
|
||||
{
|
||||
|
||||
|
||||
@ -136,7 +136,7 @@ namespace DisplayMagician
|
||||
return false;
|
||||
|
||||
// Remove the Shortcut Icons from the Cache
|
||||
List<ShortcutItem> shortcutsToRemove = _allShortcuts.FindAll(item => item.UUID.Equals(shortcut.UUID, StringComparison.InvariantCultureIgnoreCase));
|
||||
List<ShortcutItem> shortcutsToRemove = _allShortcuts.FindAll(item => item.UUID.Equals(shortcut.UUID, StringComparison.OrdinalIgnoreCase));
|
||||
foreach (ShortcutItem shortcutToRemove in shortcutsToRemove)
|
||||
{
|
||||
try
|
||||
@ -152,7 +152,7 @@ namespace DisplayMagician
|
||||
}
|
||||
|
||||
// Remove the shortcut from the list.
|
||||
int numRemoved = _allShortcuts.RemoveAll(item => item.UUID.Equals(shortcut.UUID, StringComparison.InvariantCultureIgnoreCase));
|
||||
int numRemoved = _allShortcuts.RemoveAll(item => item.UUID.Equals(shortcut.UUID, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
if (numRemoved == 1)
|
||||
{
|
||||
@ -178,13 +178,13 @@ namespace DisplayMagician
|
||||
Match match = Regex.Match(shortcutNameOrUuid, uuidV4Regex, RegexOptions.IgnoreCase);
|
||||
if (match.Success)
|
||||
{
|
||||
shortcutsToRemove = _allShortcuts.FindAll(item => item.UUID.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase));
|
||||
numRemoved = _allShortcuts.RemoveAll(item => item.UUID.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase));
|
||||
shortcutsToRemove = _allShortcuts.FindAll(item => item.UUID.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase));
|
||||
numRemoved = _allShortcuts.RemoveAll(item => item.UUID.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase));
|
||||
}
|
||||
else
|
||||
{
|
||||
shortcutsToRemove = _allShortcuts.FindAll(item => item.Name.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase));
|
||||
numRemoved = _allShortcuts.RemoveAll(item => item.Name.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase));
|
||||
shortcutsToRemove = _allShortcuts.FindAll(item => item.Name.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase));
|
||||
numRemoved = _allShortcuts.RemoveAll(item => item.Name.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase));
|
||||
}
|
||||
// Remove the Shortcut Icons from the Cache
|
||||
foreach (ShortcutItem shortcutToRemove in shortcutsToRemove)
|
||||
@ -221,7 +221,7 @@ namespace DisplayMagician
|
||||
|
||||
foreach (ShortcutItem testShortcut in _allShortcuts)
|
||||
{
|
||||
if (testShortcut.UUID.Equals(shortcut.UUID,StringComparison.InvariantCultureIgnoreCase))
|
||||
if (testShortcut.UUID.Equals(shortcut.UUID,StringComparison.OrdinalIgnoreCase))
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -240,7 +240,7 @@ namespace DisplayMagician
|
||||
{
|
||||
foreach (ShortcutItem testShortcut in _allShortcuts)
|
||||
{
|
||||
if (testShortcut.UUID.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (testShortcut.UUID.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase))
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -249,7 +249,7 @@ namespace DisplayMagician
|
||||
{
|
||||
foreach (ShortcutItem testShortcut in _allShortcuts)
|
||||
{
|
||||
if (testShortcut.Name.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (testShortcut.Name.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase))
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -271,7 +271,7 @@ namespace DisplayMagician
|
||||
{
|
||||
foreach (ShortcutItem testShortcut in _allShortcuts)
|
||||
{
|
||||
if (testShortcut.UUID.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (testShortcut.UUID.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase))
|
||||
return testShortcut;
|
||||
}
|
||||
|
||||
@ -280,7 +280,7 @@ namespace DisplayMagician
|
||||
{
|
||||
foreach (ShortcutItem testShortcut in _allShortcuts)
|
||||
{
|
||||
if (testShortcut.Name.Equals(shortcutNameOrUuid, StringComparison.InvariantCultureIgnoreCase))
|
||||
if (testShortcut.Name.Equals(shortcutNameOrUuid, StringComparison.OrdinalIgnoreCase))
|
||||
return testShortcut;
|
||||
}
|
||||
|
||||
@ -297,7 +297,7 @@ namespace DisplayMagician
|
||||
|
||||
foreach (ShortcutItem testShortcut in ShortcutRepository.AllShortcuts)
|
||||
{
|
||||
if (testShortcut.ProfileUUID.Equals(newProfile.UUID, StringComparison.InvariantCultureIgnoreCase) && testShortcut.AutoName)
|
||||
if (testShortcut.ProfileUUID.Equals(newProfile.UUID, StringComparison.OrdinalIgnoreCase) && testShortcut.AutoName)
|
||||
{
|
||||
testShortcut.ProfileToUse = newProfile;
|
||||
testShortcut.AutoSuggestShortcutName();
|
||||
|
||||
@ -157,7 +157,7 @@
|
||||
</value>
|
||||
</data>
|
||||
<data name="ilv_saved_profiles.Colors" xml:space="preserve">
|
||||
<value>BorderColor = 406d6d6d; UnFocusedColor1 = ffff8080; UnFocusedColor2 = LightCoral; UnFocusedBorderColor = Maroon; HoverColor1 = 80078d7; HoverColor2 = 400078d7; HoverBorderColor = 400078d7; SelectedColor1 = ffff8080; SelectedColor2 = LightCoral; SelectedBorderColor = Maroon; DisabledColor1 = 6d6d6d; DisabledColor2 = 206d6d6d; DisabledBorderColor = 206d6d6d; DisabledForeColor = ff808080; ColumnHeaderBackColor1 = 20f0f0f0; ColumnHeaderBackColor2 = c4f0f0f0; ColumnHeaderHoverColor1 = 100078d7; ColumnHeaderHoverColor2 = 400078d7; ColumnSelectColor = 106d6d6d; ColumnSeparatorColor = 206d6d6d; PaneBackColor = 106d6d6d; PaneSeparatorColor = 806d6d6d; SelectionRectangleColor1 = 800078d7; SelectionRectangleColor2 = 800078d7</value>
|
||||
<value>BorderColor = 406d6d6d; UnfocusedColor1 = ffff8080; UnfocusedColor2 = LightCoral; UnfocusedBorderColor = Maroon; HoverColor1 = 80078d7; HoverColor2 = 400078d7; HoverBorderColor = 400078d7; SelectedColor1 = ffff8080; SelectedColor2 = LightCoral; SelectedBorderColor = Maroon; DisabledColor1 = 6d6d6d; DisabledColor2 = 206d6d6d; DisabledBorderColor = 206d6d6d; DisabledForeColor = ff808080; ColumnHeaderBackColor1 = 20f0f0f0; ColumnHeaderBackColor2 = c4f0f0f0; ColumnHeaderHoverColor1 = 100078d7; ColumnHeaderHoverColor2 = 400078d7; ColumnSelectColor = 106d6d6d; ColumnSeparatorColor = 206d6d6d; PaneBackColor = 106d6d6d; PaneSeparatorColor = 806d6d6d; SelectionRectangleColor1 = 800078d7; SelectionRectangleColor2 = 800078d7</value>
|
||||
</data>
|
||||
<metadata name="tt_selected.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>248, 17</value>
|
||||
|
||||
@ -31,7 +31,9 @@ namespace DisplayMagician.UIForms
|
||||
private bool allowVisible; // ContextMenu's Show command used
|
||||
private bool allowClose; // ContextMenu's Exit command used
|
||||
|
||||
public MainForm(Form formToOpen = null, bool FromToast = false)
|
||||
private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||
|
||||
public MainForm(Form formToOpen = null)
|
||||
{
|
||||
InitializeComponent();
|
||||
btn_setup_display_profiles.Parent = splitContainer1.Panel1;
|
||||
@ -383,6 +385,7 @@ namespace DisplayMagician.UIForms
|
||||
DialogResult dialogResult;
|
||||
if (args.Mandatory.Value)
|
||||
{
|
||||
logger.Info($"MainForm/AutoUpdaterOnCheckForUpdateEvent - New version {args.CurrentVersion} available. Current version is {args.InstalledVersion}. Mandatory upgrade.");
|
||||
dialogResult =
|
||||
MessageBox.Show(
|
||||
$@"There is new version {args.CurrentVersion} available. You are using version {args.InstalledVersion}. This is required update. Press Ok to begin updating the application.", @"Update Available",
|
||||
@ -391,6 +394,7 @@ namespace DisplayMagician.UIForms
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.Info($"MainForm/AutoUpdaterOnCheckForUpdateEvent - New version {args.CurrentVersion} available. Current version is {args.InstalledVersion}. Optional upgrade.");
|
||||
dialogResult =
|
||||
MessageBox.Show(
|
||||
$@"There is new version {args.CurrentVersion} available. You are using version {
|
||||
@ -407,34 +411,34 @@ namespace DisplayMagician.UIForms
|
||||
{
|
||||
try
|
||||
{
|
||||
logger.Info($"MainForm/AutoUpdaterOnCheckForUpdateEvent - Downloading {args.InstalledVersion} update.");
|
||||
if (AutoUpdater.DownloadUpdate(args))
|
||||
{
|
||||
logger.Info($"MainForm/AutoUpdaterOnCheckForUpdateEvent - Restarting to apply {args.InstalledVersion} update.");
|
||||
Application.Exit();
|
||||
}
|
||||
}
|
||||
catch (Exception exception)
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(exception.Message, exception.GetType().ToString(), MessageBoxButtons.OK,
|
||||
logger.Warn(ex, $"MainForm/AutoUpdaterOnCheckForUpdateEvent - Exception during update download.");
|
||||
MessageBox.Show(ex.Message, ex.GetType().ToString(), MessageBoxButtons.OK,
|
||||
MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
/*else
|
||||
{
|
||||
MessageBox.Show(@"There is no update available please try again later.", @"No update available",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
}*/
|
||||
}
|
||||
else
|
||||
{
|
||||
if (args.Error is WebException)
|
||||
{
|
||||
logger.Warn(args.Error, $"MainForm/AutoUpdaterOnCheckForUpdateEvent - WebException - There was a problem reaching the update server.");
|
||||
MessageBox.Show(
|
||||
@"There is a problem reaching update server. Please check your internet connection and try again later.",
|
||||
@"Update Check Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
else
|
||||
{
|
||||
logger.Warn(args.Error, $"MainForm/AutoUpdaterOnCheckForUpdateEvent - There was a problem performing the update: {args.Error.Message}");
|
||||
MessageBox.Show(args.Error.Message,
|
||||
args.Error.GetType().ToString(), MessageBoxButtons.OK,
|
||||
MessageBoxIcon.Error);
|
||||
|
||||
@ -11,15 +11,16 @@
|
||||
<Name>DisplayMagicianSetup</Name>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug;DisplayMagicianFilesDir=H:\vscode-projects\DisplayMagician\DisplayMagician\bin\Debug</DefineConstants>
|
||||
<CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<CompilerAdditionalOptions />
|
||||
<CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
|
||||
<DefineConstants>DisplayMagicianFilesDir=H:\vscode-projects\DisplayMagician\DisplayMagician\bin\Debug</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
||||
<DefineConstants>DisplayMagicianFilesDir=H:\vscode-projects\DisplayMagician\DisplayMagician\bin\Debug;</DefineConstants>
|
||||
@ -36,7 +37,7 @@
|
||||
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
||||
<SuppressAllWarnings>False</SuppressAllWarnings>
|
||||
<Pedantic>True</Pedantic>
|
||||
<DefineConstants>DisplayMagicianFilesDir=H:\vscode-projects\DisplayMagician\Debug</DefineConstants>
|
||||
<DefineConstants>DisplayMagicianFilesDir=H:\vscode-projects\DisplayMagician\DisplayMagician\bin\Debug</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="CustomDialogs\LicenseAgreementDialogOverwritten.wxs" />
|
||||
|
||||
@ -2,196 +2,196 @@
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Fragment>
|
||||
<DirectoryRef Id="APPLICATIONROOTDIRECTORY">
|
||||
<Component Id="cmp53B07BB21F5AFE76F5469BD1F4BA65C9" Guid="{9F9819EC-8BCF-475F-9193-2478357D72F7}">
|
||||
<Component Id="cmp53B07BB21F5AFE76F5469BD1F4BA65C9" Guid="{EDE4004A-5A24-42E4-A162-EDA52D90C860}">
|
||||
<File Id="fil8CC3C83921B00F72D50A1E4EEB792DFE" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AudioSwitcher.AudioApi.CoreAudio.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp8243CB1E312705B4BA74BC791635270C" Guid="{8BACD5A7-5D9A-4D8A-8D6E-3042079B9798}">
|
||||
<Component Id="cmp8243CB1E312705B4BA74BC791635270C" Guid="{024FA79F-A062-47DA-82E2-66E4E9C17166}">
|
||||
<File Id="filC0B7F66C67664353137460031E28BC1B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AudioSwitcher.AudioApi.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp493DD683A43D05F764F3DEEF08ECA4C6" Guid="{AE753188-407B-479D-B656-9B19F0A86A6B}">
|
||||
<Component Id="cmp493DD683A43D05F764F3DEEF08ECA4C6" Guid="{9279F738-542C-4721-BC95-3C52F2D4829E}">
|
||||
<File Id="filC8194EB99DFB64B8589F5D80DC8E3B4D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AutoUpdater.NET.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp357CADF4E916AADB1DD6BD7938986798" Guid="{F65B3470-659A-495E-872D-7699006B742D}">
|
||||
<Component Id="cmp357CADF4E916AADB1DD6BD7938986798" Guid="{CFF0297F-607B-4731-B8EB-078300FE0C3B}">
|
||||
<File Id="fil900464E773972F43219693B12A52EDE2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AutoUpdater.NET.pdb" />
|
||||
</Component>
|
||||
<Component Id="cmp78B9C7C9D51B2878B72DCBACE49DE398" Guid="{2A143FFF-28DD-43BC-817C-C555343FE965}">
|
||||
<Component Id="cmp78B9C7C9D51B2878B72DCBACE49DE398" Guid="{3D2F0D54-944B-4D89-85BA-FEE2A10EEB23}">
|
||||
<File Id="filDE7F24A649EB60701DC0EC41FE83CBBE" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\CircularProgressBar.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp7EE113DB90D07F08FCE70C1861DEA947" Guid="{7ACD1306-202E-49EA-A489-CD9818F5CADC}">
|
||||
<Component Id="cmp7EE113DB90D07F08FCE70C1861DEA947" Guid="{C0807125-EE5B-4288-BBB6-03A20C42FDA7}">
|
||||
<File Id="filF7D383DE2E27A23D8552666CEA0DDC80" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.exe" />
|
||||
</Component>
|
||||
<Component Id="cmpCF520827D65E51E3ECB59344A6F528D0" Guid="{ADA2713C-3737-4E8D-B503-5920E4C5C89D}">
|
||||
<Component Id="cmpCF520827D65E51E3ECB59344A6F528D0" Guid="{2D82251E-CF2C-4017-82A5-F6D999EDE419}">
|
||||
<File Id="fil2841FB135B81D3B7EF6634B1E3E562DA" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.exe.config" />
|
||||
</Component>
|
||||
<Component Id="cmp20CF355FCD243C61CF66FB91F20BEA24" Guid="{00A5B046-0A5C-4DE6-A97C-8E88916EC6CD}">
|
||||
<Component Id="cmp20CF355FCD243C61CF66FB91F20BEA24" Guid="{824B0363-9FB9-4929-81FA-E0204F36EE33}">
|
||||
<File Id="fil00FEE1F8F6F3766FD0431A9B72F4FCC7" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.pdb" />
|
||||
</Component>
|
||||
<Component Id="cmp936B3459EEFF10D8EB978B7DD0F9FDDA" Guid="{6A065434-3E8F-4198-9EA9-740B2DB9BC6D}">
|
||||
<Component Id="cmp936B3459EEFF10D8EB978B7DD0F9FDDA" Guid="{216165D0-8954-4C96-9273-E16EF99DAF80}">
|
||||
<File Id="fil44F64B4F8FBBEAA84A71077F7F3B6B4D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.Shared.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpEFA0EED8369E2F430E0ED6D9EB027553" Guid="{081AE1C6-CF74-4A6A-B19C-D9B11D917E39}">
|
||||
<Component Id="cmpEFA0EED8369E2F430E0ED6D9EB027553" Guid="{7797F88B-8DD2-43DE-91E5-79B544801BAE}">
|
||||
<File Id="fil52BE9F94EBFDF8C5CFEC426A17966F40" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.Shared.pdb" />
|
||||
</Component>
|
||||
<Component Id="cmpE8833A8E220525D7707A018B20CEDD87" Guid="{63937B78-C44C-4073-90F8-92E30ADB2A67}">
|
||||
<Component Id="cmpE8833A8E220525D7707A018B20CEDD87" Guid="{28E89B9A-9FC1-469F-A2A8-CEE7E4617220}">
|
||||
<File Id="filD4FD53D2FBF78674DBC3A1B446B44FC5" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\EDIDParser.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp8C52E948AAB2D43DF696BB7D003A8E4B" Guid="{154AD986-3083-4FE6-95DD-EE6130DDD2A5}">
|
||||
<Component Id="cmp8C52E948AAB2D43DF696BB7D003A8E4B" Guid="{2146B6C1-9EA3-49C6-B9AC-E4E044C71398}">
|
||||
<File Id="fil1965347683EC48A269FE672473CD04C2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\HtmlAgilityPack.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp137F8F514DF6364F5BBFCBDB1B1B9807" Guid="{CEEEAD06-1D08-432F-B79C-50C014785032}">
|
||||
<Component Id="cmp137F8F514DF6364F5BBFCBDB1B1B9807" Guid="{41912A18-DFFF-47D8-B3A3-A2280321FFA5}">
|
||||
<File Id="filA79B24FCE8AA4DA0DC9A3ACBE5D830DD" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\HtmlAgilityPack.pdb" />
|
||||
</Component>
|
||||
<Component Id="cmpC13B4DB64E30D03117ECF099B1A9CD9C" Guid="{6BA2D7BB-F3BA-4880-B6EA-5D09F13EFEA6}">
|
||||
<Component Id="cmpC13B4DB64E30D03117ECF099B1A9CD9C" Guid="{0F5A815C-675E-4CD3-AE3E-F46E3F448753}">
|
||||
<File Id="fil44FFB513E29A8346713440B4BCB7F1E6" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconExtractor.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp6AB92D1CF70395670A490E1B9BD347DE" Guid="{0F332945-12D0-4A00-930E-17A5683F4020}">
|
||||
<Component Id="cmp6AB92D1CF70395670A490E1B9BD347DE" Guid="{B2ABA227-6959-45CB-A061-E714197576FE}">
|
||||
<File Id="fil4DD582D50D7AC9DDD5292A76257854FA" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconLib.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp23C6CFB3962E9B4E2A7E8EF56F20A99F" Guid="{E7004F6F-9341-42EC-87A0-6C9B3B06BC20}">
|
||||
<Component Id="cmp23C6CFB3962E9B4E2A7E8EF56F20A99F" Guid="{1B62FF59-71BB-4702-8B88-2EB4F5288D95}">
|
||||
<File Id="fil0F18A66FBBBB6C44A052B9FB77ACD8F8" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconPicker.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp5069692C1912B298A026EA30A39A2F36" Guid="{9874D18F-B1E9-42C9-9BA3-2600D856301D}">
|
||||
<Component Id="cmp5069692C1912B298A026EA30A39A2F36" Guid="{BEE75915-FBBD-4A63-B6C9-DAAF56240B67}">
|
||||
<File Id="fil15BCAD6A05EB985A23A6B9DE3EFEB933" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ImageListView.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp6B91543EC1EAFC09F3C7747C1333F99A" Guid="{A0302B6E-D65B-4DA9-98FB-8DF745DE3AD0}">
|
||||
<Component Id="cmp6B91543EC1EAFC09F3C7747C1333F99A" Guid="{8DA5D14E-247B-40FF-A3D1-B0AFEDE9B3E4}">
|
||||
<File Id="fil34AC49C1FA6CC0335FB4F16BCD03AA7B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\McMaster.Extensions.CommandLineUtils.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp8A11CDCDF04C29EC9CA9A0C1D0D78B04" Guid="{53D679C6-3365-4E2C-AE3E-E277CF92734A}">
|
||||
<Component Id="cmp8A11CDCDF04C29EC9CA9A0C1D0D78B04" Guid="{FFA34980-95A0-4E43-9A2C-C7EEE1320476}">
|
||||
<File Id="fil151DD1163831E94E80724A88F88C2231" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Microsoft.Toolkit.Uwp.Notifications.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp62D956D9975F1430FEAB37FCAD94474F" Guid="{3C605722-A936-4164-80DB-B55CD33A1C0E}">
|
||||
<Component Id="cmp62D956D9975F1430FEAB37FCAD94474F" Guid="{565B05A8-494D-4ECB-852D-91E42AF84FF6}">
|
||||
<File Id="fil4F519990E7E5387E7BAEB5C056617826" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Microsoft.Toolkit.Uwp.Notifications.pdb" />
|
||||
</Component>
|
||||
<Component Id="cmpA6AEEDB3EBF416E3AD000E7408FE3402" Guid="{4ED062D8-F6D3-4CF9-B5A1-85ACE928965D}">
|
||||
<Component Id="cmpA6AEEDB3EBF416E3AD000E7408FE3402" Guid="{CD59CC8B-B759-4EAB-8A24-30D6A0B09287}">
|
||||
<File Id="filA93EB7C7565EEDD39AF3362752AE09DB" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\MintPlayer.IconUtils.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpA7927FF61A499CF81EE0A562CDFEDEC7" Guid="{700C8AFB-DCAD-4968-9542-DFD8A7BF432B}">
|
||||
<Component Id="cmpA7927FF61A499CF81EE0A562CDFEDEC7" Guid="{D243B9AB-7E0A-432E-9FA9-C5363BF51CE2}">
|
||||
<File Id="filD7DC5F43B3964ACECD7725F05E664960" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Newtonsoft.Json.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpC64ECA245317593760E42F3996F3A079" Guid="{B2C8DD9B-D086-4D16-AD45-79882B9D280C}">
|
||||
<Component Id="cmpC64ECA245317593760E42F3996F3A079" Guid="{92F909B5-AA2C-4724-A2A5-973AF5890225}">
|
||||
<File Id="fil5299F0448E950048C778AA65A04FB498" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\NLog.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp5CFF8A0C9C138424DA47E04F4B0986EB" Guid="{5798B55D-5E8C-4442-8AED-80DB7AF5FB26}">
|
||||
<Component Id="cmp5CFF8A0C9C138424DA47E04F4B0986EB" Guid="{EF9CA66D-956E-4039-9602-0A02B3D48B91}">
|
||||
<File Id="filDB484734B403A8C8EE2F5B5165068C91" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\NvAPIWrapper.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpBEC07D0236076B07E4E7D7632CCA69CB" Guid="{A306CE62-B50F-4E30-8451-4CF7A69E4237}">
|
||||
<Component Id="cmpBEC07D0236076B07E4E7D7632CCA69CB" Guid="{A4CE5C7B-51FF-4AF1-A838-0D3D053F07CF}">
|
||||
<File Id="fil8C59ED1965E9E2D1C82459BE5C1E903E" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\QueryString.NETCore.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpAE5FC77E7BB7E9CB720EF7CEE118A4CE" Guid="{409948F3-A884-4E99-B9F5-45085F401CB6}">
|
||||
<Component Id="cmpAE5FC77E7BB7E9CB720EF7CEE118A4CE" Guid="{B04896A9-6C7E-4AF7-B971-784F486B3C49}">
|
||||
<File Id="filD448167ABB54E447850BA2A203C5FCA1" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\QueryString.NETCore.pdb" />
|
||||
</Component>
|
||||
<Component Id="cmpB76F273FDED5EA841158E966B403CFC8" Guid="{07867EDE-4E09-406A-B85A-F823508B7DE5}">
|
||||
<Component Id="cmpB76F273FDED5EA841158E966B403CFC8" Guid="{858D8A8B-B823-4956-B1B8-9F8F043F6267}">
|
||||
<File Id="fil8A5957F9C3DCF1A6D414F9F34402CB53" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\System.Drawing.Common.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp7DD29D6442A6E450B2316729EA2C0F1D" Guid="{08A4505D-FA4E-4138-96FB-8744EC73DCBC}">
|
||||
<Component Id="cmp7DD29D6442A6E450B2316729EA2C0F1D" Guid="{BEBDDE72-EBC3-458A-A5F9-518C3D79EA75}">
|
||||
<File Id="fil9DF3290031BCB652454E62345D1FAE6B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\System.ValueTuple.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpA8825A49786C04320E75BCFC8E961667" Guid="{B6AD4CAE-A48D-422F-A15E-DA6951887C7E}">
|
||||
<Component Id="cmpA8825A49786C04320E75BCFC8E961667" Guid="{7F8DBAE4-886C-4D78-9525-6BA68A915D70}">
|
||||
<File Id="filD5FED76D92088BA98BD9CF7D4D9B7EF2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ValveKeyValue.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp650327FC006E09EDFC7039D6E7A6F340" Guid="{15781F2C-0FDF-402B-BE4A-573ECD3080DA}">
|
||||
<Component Id="cmp650327FC006E09EDFC7039D6E7A6F340" Guid="{332864F6-B31B-4369-9A95-2A1A380E881B}">
|
||||
<File Id="filB58835925907FAE2AB432C29CD8C03B4" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\WindowsDisplayAPI.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp27AC6F10258FA1C97C54F3C1D153D122" Guid="{6861CE13-8831-431A-9F48-12C70B267211}">
|
||||
<Component Id="cmp27AC6F10258FA1C97C54F3C1D153D122" Guid="{1AF23E7F-83FD-4B35-A1F8-E46717600AB8}">
|
||||
<File Id="fil01CF08752F4284E3144706F10481AEA0" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\WinFormAnimation.dll" />
|
||||
</Component>
|
||||
<Directory Id="dirC9CEBA44737D7806DC2F52AE07FB1335" Name="ar">
|
||||
<Component Id="cmp1D8A437520B8A88B5329BA85AF49F972" Guid="{F2CFFA83-6EFC-44A2-B830-F95A37400168}">
|
||||
<Component Id="cmp1D8A437520B8A88B5329BA85AF49F972" Guid="{E8DC03F8-D728-48EB-8472-4DA81D7CCE16}">
|
||||
<File Id="filC934041A1382ABA35ECB5DE3BB6C4148" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ar\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir1764AC367AADA7667CA18D19856EB829" Name="cs">
|
||||
<Component Id="cmp1B983AD82D33902E3869C2CD3E625557" Guid="{0724C523-97EF-4676-86F4-857CE295A4B4}">
|
||||
<Component Id="cmp1B983AD82D33902E3869C2CD3E625557" Guid="{52DD5BE2-0AA7-40E0-9F69-D3BAF2A9008E}">
|
||||
<File Id="fil5CE1877B3764F3FA8C53E465EC4F1E6B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\cs\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir70240FB68A7D32052E3646DFEC7177A6" Name="da">
|
||||
<Component Id="cmp645D07231E6F1B4B9F84AAED05DE08B9" Guid="{AACCBEBF-64B6-4AC1-B960-12E2963C9B82}">
|
||||
<Component Id="cmp645D07231E6F1B4B9F84AAED05DE08B9" Guid="{F1EEC644-E0F4-4821-99EF-73E9DF69CE62}">
|
||||
<File Id="fil6664ED7C2E9121315323240F4A94F71F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\da\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir1C628EE15A29CD6ED08798D6B0A06B2F" Name="de">
|
||||
<Component Id="cmpF7E34D6BF19681066F5E973C8D30C63A" Guid="{8E9BD69C-4FB2-4CA2-AD4F-857B2643235F}">
|
||||
<Component Id="cmpF7E34D6BF19681066F5E973C8D30C63A" Guid="{892D534F-94AE-4F63-9B48-63F0F2A40296}">
|
||||
<File Id="filC2D506AF5C5B86FA443A326E067EF823" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\de\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir6B7DF5E7779A02DE589C2D4AABF889BA" Name="es">
|
||||
<Component Id="cmpB54DE98A33D508FC6EF7E3761CDF0661" Guid="{BB805BCB-4407-40B7-9D8E-DE32D48C0067}">
|
||||
<Component Id="cmpB54DE98A33D508FC6EF7E3761CDF0661" Guid="{20DAD530-FE0D-4534-A6B3-7915F14674C6}">
|
||||
<File Id="filCDFD6865877E32514969EAE54D3CC9F9" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\es\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirCCE997692B032DBDA6174416BFED255E" Name="fr">
|
||||
<Component Id="cmp81105D91EF7C9FAB44E52202DBAF417C" Guid="{5DBBE97C-FE37-4195-B2A8-09463AE8607D}">
|
||||
<Component Id="cmp81105D91EF7C9FAB44E52202DBAF417C" Guid="{01B43EE5-11C6-4099-B06A-E3D55E68D640}">
|
||||
<File Id="fil6B84F6EC6C9F50B7139B0E99914B401A" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\fr\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirC0620602576770B728F6D7CF835E4230" Name="it">
|
||||
<Component Id="cmpCC505044A437DF227E44E7B31A54D0BF" Guid="{8DBA1968-00FF-4ABD-8A4A-EEB0FB7409C6}">
|
||||
<Component Id="cmpCC505044A437DF227E44E7B31A54D0BF" Guid="{7BA12451-B5DF-48C6-BD74-662FB6BBBBDB}">
|
||||
<File Id="filD812096039F1E9D729065E7109AB857F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\it\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir299EDA906CCCF90FED2B1DE9A0AE661D" Name="ja-JP">
|
||||
<Component Id="cmp2B1808EAFED02DC5D42D475F2BB83458" Guid="{257CB6AB-C63A-45AD-98A5-08DC39401923}">
|
||||
<Component Id="cmp2B1808EAFED02DC5D42D475F2BB83458" Guid="{FA495471-C19B-4DF8-8A09-AFFEA2E9818D}">
|
||||
<File Id="filA3B2CB69DE697F856902A5EB591C1BA9" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ja-JP\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir5F675FF0062E1C1CACE0170EC20A5208" Name="ko">
|
||||
<Component Id="cmpE8B7CCFB66BD36E9CF741814FEE6AD14" Guid="{180704A9-A06B-4798-A3B3-33A216182F9A}">
|
||||
<Component Id="cmpE8B7CCFB66BD36E9CF741814FEE6AD14" Guid="{2C97313C-AD25-4CA5-9471-F10D9FD7E491}">
|
||||
<File Id="fil1A20D0790F057F2E9E188792193A32BD" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ko\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir0BFBA37D9F94C8F490A10DA87815DED5" Name="nl">
|
||||
<Component Id="cmp9449E2C32768367A145DF20983A12FF7" Guid="{FB313A12-08E3-4B57-97DE-BA93CC9C3664}">
|
||||
<Component Id="cmp9449E2C32768367A145DF20983A12FF7" Guid="{219F448E-FC1D-4FA0-A0D5-57119409D016}">
|
||||
<File Id="filE87E30BFF942128946D7656D111B9E28" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\nl\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir5D30DDBDF1F855D2C3CFCAE5A7D4DFB7" Name="pl">
|
||||
<Component Id="cmp34EDF353BCC5E92A39657F713CAF1AA0" Guid="{1765D2E0-8FAE-4FE8-905F-7FCF782734ED}">
|
||||
<Component Id="cmp34EDF353BCC5E92A39657F713CAF1AA0" Guid="{F5B3EB3C-67CA-4BF6-B1A7-A11C3682026F}">
|
||||
<File Id="filB0BCC1B40E0F3F37F614E9AC51A1BEDF" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\pl\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir32D9AD0C9188498053C05E4C1D09269D" Name="pt">
|
||||
<Component Id="cmp1E67A3938BF74EC5ADD54FAB69A80CB3" Guid="{D3660039-0C71-4BAC-9BC3-9898E3C4A599}">
|
||||
<Component Id="cmp1E67A3938BF74EC5ADD54FAB69A80CB3" Guid="{F661DDF4-E763-4576-9B7E-68F9D3E4AED8}">
|
||||
<File Id="filB6A7729764F42969B1A0A1093D3F600D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\pt\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir3EA1054A4A68F70CEF22E983B9D684DB" Name="pt-BR">
|
||||
<Component Id="cmpEEAAA81C74F88DC87008EB031C2F1030" Guid="{369A8A98-F6F6-4F8C-B392-3A2F8A65A01F}">
|
||||
<Component Id="cmpEEAAA81C74F88DC87008EB031C2F1030" Guid="{F745BD37-6206-4418-8B6C-3A5DF937DE68}">
|
||||
<File Id="filBDE4FF11B65DE8486E6AE2917075C4F2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\pt-BR\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirF9A13AB290C9570B2C0CE7CB6EF9D86E" Name="ru">
|
||||
<Component Id="cmpA923B5BC9CB54BE671D485B3A39D93A5" Guid="{0E6D2D34-796F-4183-86EE-930C92C3E8A2}">
|
||||
<Component Id="cmpA923B5BC9CB54BE671D485B3A39D93A5" Guid="{A34A9BD6-E4AD-425D-BF2D-9C2EDC0D7C56}">
|
||||
<File Id="fil0672B3CFA1451A14C32747BE1794732F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ru\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir0A61397BAE3772A68E21EF1C51156F2C" Name="sk">
|
||||
<Component Id="cmp8D4C4B444510137E2D82B4FD6A0B9776" Guid="{25E56A03-7B7A-45D2-BF5A-CA1C9F6DFE9C}">
|
||||
<Component Id="cmp8D4C4B444510137E2D82B4FD6A0B9776" Guid="{60C991E7-B784-41B1-94F9-745916354225}">
|
||||
<File Id="filC5765B8E01B5B47AAF9794806A76E690" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\sk\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirBBD306FA33D57073FD02CF4EFC3A0326" Name="sv">
|
||||
<Component Id="cmpFB55A1004D6DF4923A748FDC2F523D8B" Guid="{ECCB2C0C-DF8C-45F6-972F-B6B6CC721DCD}">
|
||||
<Component Id="cmpFB55A1004D6DF4923A748FDC2F523D8B" Guid="{599A74C4-0EFC-47C6-9138-8E9F2C23FA73}">
|
||||
<File Id="fil54738B12543ED9C06F79D373D2EB015B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\sv\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirCE3BF130A177608F70523C718370D4AB" Name="th">
|
||||
<Component Id="cmp4490FE644B0447492BBB39E2832B87C0" Guid="{67EEB906-B680-4A3D-826E-F365970F3B09}">
|
||||
<Component Id="cmp4490FE644B0447492BBB39E2832B87C0" Guid="{352BB48A-FB12-4803-BEF0-6289ED34E4D8}">
|
||||
<File Id="fil4735CFBE1739CDA690669E71EA774734" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\th\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirC06FC06848A827DE7E1246A3EEE173B9" Name="tr">
|
||||
<Component Id="cmp7311ACB3A3BB0005E1BD421A03BAC70D" Guid="{D7313305-B9A3-4FED-8F5D-0C5F9C7B4CBD}">
|
||||
<Component Id="cmp7311ACB3A3BB0005E1BD421A03BAC70D" Guid="{05D02565-5550-4B91-882E-01717D5C2BB7}">
|
||||
<File Id="fil9EDE895C94E3E737A7E2345A3354E4ED" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\tr\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirA9E5CFBEBA3415CA12E141D142550091" Name="zh">
|
||||
<Component Id="cmp0E8893641CCC97E160269D736795633C" Guid="{872C6DFC-B725-4F4B-8B3B-CC9F2C7DC23C}">
|
||||
<Component Id="cmp0E8893641CCC97E160269D736795633C" Guid="{D37DB3FD-D668-4312-A1FC-410C692B3078}">
|
||||
<File Id="filD14D5D68900793C75702C773F11A305F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\zh\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirB915F738D24EC7F5CE340DC7A43B9BD1" Name="zh-tw">
|
||||
<Component Id="cmp1D85EF433AB8DDB383D91C1C33BAA91A" Guid="{BB00203B-0C84-4583-9394-B3526900EE72}">
|
||||
<Component Id="cmp1D85EF433AB8DDB383D91C1C33BAA91A" Guid="{89626564-005A-47F1-A581-1314EF26B326}">
|
||||
<File Id="fil03FB6CBB0D2712EFAD51B20D66FE4B9B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\zh-tw\AutoUpdater.NET.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user