Mirrored_Repos/DisplayMagician
1
0
Fork 0
mirror of https://github.com/terrymacdonald/DisplayMagician.git synced 2024-08-30 18:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/amd-eyefinity-support

Browse Source
This commit is contained in:
Terry MacDonald 2021-06-10 19:28:24 +12:00
commit 77d67d7ef5
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DisplayMagician/Properties/AssemblyInfo.cs
View File

@ -37,8 +37,8 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.3.0")] [assembly: AssemblyVersion("1.1.4.0")]
[assembly: AssemblyFileVersion("1.1.3.0")] [assembly: AssemblyFileVersion("1.1.4.0")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]
[assembly: CLSCompliant(true)] [assembly: CLSCompliant(true)]

2
DisplayMagician/UIForms/ShortcutLibraryForm.cs
View File

@ -66,7 +66,7 @@ namespace DisplayMagician.UIForms
foreach (ShortcutItem loadedShortcut in ShortcutRepository.AllShortcuts.OrderBy(s => s.Name)) foreach (ShortcutItem loadedShortcut in ShortcutRepository.AllShortcuts.OrderBy(s => s.Name))
{ {
// Ignore any shortcuts with incompatible game libraries // Ignore any shortcuts with incompatible game libraries
if (!Enum.IsDefined(typeof(SupportedGameLibraryType), loadedShortcut.GameLibrary) || loadedShortcut.GameLibrary == SupportedGameLibraryType.Unknown) if (loadedShortcut.Category == ShortcutCategory.Game && (!Enum.IsDefined(typeof(SupportedGameLibraryType), loadedShortcut.GameLibrary) || loadedShortcut.GameLibrary == SupportedGameLibraryType.Unknown))
{ {
// Skip showing unknown game library items as we have no way to deal with them // Skip showing unknown game library items as we have no way to deal with them
logger.Warn( $"ShortcutLibraryForm/RefreshShortcutLibraryUI: Ignoring game shortcut {loadedShortcut.Name} as it's from a Game library this version doesn't support."); logger.Warn( $"ShortcutLibraryForm/RefreshShortcutLibraryUI: Ignoring game shortcut {loadedShortcut.Name} as it's from a Game library this version doesn't support.");

4
DisplayMagicianLogReporter/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.3.0")] [assembly: AssemblyVersion("1.1.4.0")]
[assembly: AssemblyFileVersion("1.1.3.0")] [assembly: AssemblyFileVersion("1.1.4.0")]

2
DisplayMagicianSetup/Includes/DisplayMagicianVariables.wxi
View File

@ -6,7 +6,7 @@
--> -->
<?define MajorVersion="1" ?> <?define MajorVersion="1" ?>
<?define MinorVersion="1" ?> <?define MinorVersion="1" ?>
<?define PatchVersion="3" ?> <?define PatchVersion="4" ?>
<!-- Revision is NOT used by WiX in the upgrade procedure --> <!-- Revision is NOT used by WiX in the upgrade procedure -->
<!-- Full version number to display --> <!-- Full version number to display -->
<?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.PatchVersion)" ?> <?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.PatchVersion)" ?>

4
DisplayMagicianShared/Properties/AssemblyInfo.cs
View File

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.3.0")] [assembly: AssemblyVersion("1.1.4.0")]
[assembly: AssemblyFileVersion("1.1.3.0")] [assembly: AssemblyFileVersion("1.1.4.0")]

4
DisplayMagicianShellExtension/Properties/AssemblyInfo.cs
View File

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.3.0")] [assembly: AssemblyVersion("1.1.4.0")]
[assembly: AssemblyFileVersion("1.1.3.0")] [assembly: AssemblyFileVersion("1.1.4.0")]

BIN
READMEAssets/DisplayMagicianMainScreen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 766 KiB

After

Width:  |  Height:  |  Size: 766 KiB

6
docs/update/index.json
View File

@ -1,6 +1,6 @@
{ {
"version": "1.1.3.0", "version": "1.1.4.0",
"url": "https://github.com/terrymacdonald/DisplayMagician/releases/download/v1.1.3/DisplayMagicianSetup-v1.1.3.msi", "url": "https://github.com/terrymacdonald/DisplayMagician/releases/download/v1.1.4/DisplayMagicianSetup-v1.1.4.msi",
"changelog": "https://github.com/terrymacdonald/DisplayMagician/releases", "changelog": "https://github.com/terrymacdonald/DisplayMagician/releases",
"mandatory": { "mandatory": {
"value": false, "value": false,
@ -8,7 +8,7 @@
"mode": 0 "mode": 0
}, },
"checksum": { "checksum": {
"value": "DBB93249B6465953E16B29D2A7F64003A698620492927B77D86D02B25DB232C1", "value": "69ECB5E9618996A046754D89F6EEEE03333C9948002DFCEB55F9F13129351390",
"hashingAlgorithm": "SHA256" "hashingAlgorithm": "SHA256"
} }
} }