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

Added WiX Bootstrapper project (WIP)

Browse Source 
This project will encapsulate the .Net web installer
and the DisplayMagician installer so that it installs
the .net 4.8 if it isn't already installed. Still not sure if
I will keep it. It is a partial work in progress.
This commit is contained in:
Terry MacDonald 2020-12-21 23:06:42 +13:00
parent e4ed01f33b
commit 16ac2bb264
10 changed files with 238 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DisplayMagician.sln
View File

@ -18,6 +18,8 @@ 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
@ -99,6 +101,14 @@ Global
{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

25
DisplayMagicianBootstrapper/Bundle.wxs Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Bundle Name="DisplayMagicianBootstrapper"
Version="0.2.0.0"
UpgradeCode="D965E245-6132-4760-AD2D-07CCC9FA98F9"
Manufacturer="!(loc.Manufacturer)"
HelpUrl="!(loc.HelpUrl)"
UpdateUrl="!(loc.UpdateUrl)"
AboutUrl="!(loc.AboutUrl)"
>
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" />
<!-- Put in a restriction to only allow installation on Windows 10 or higher -->
<bal:Condition Message="This software can only be installed on Windows 10 or later (64-bit).">
<![CDATA[VersionNT64 >= 1000]]>
</bal:Condition>
<Chain>
<!-- TODO: Define the list of chained packages. -->
<MsiPackage SourceFile="$(var.DisplayMagicianSetup.TargetDir)DisplayMagicianSetup.msi" />
<MsiPackage SourceFile="$(var.DisplayMagicianSetup.TargetDir)DisplayMagicianSetup.msi" />
</Chain>
</Bundle>
</Wix>

69
DisplayMagicianBootstrapper/DisplayMagicianBootstrapper.wixproj Normal file
View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>59f3f084-ec7e-42d4-b0f4-8131b82bdb3b</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>DisplayMagicianBootstrapper</OutputName>
<OutputType>Bundle</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Bundle.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name>
</WixExtension>
<WixExtension Include="WixBalExtension">
<HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
<Name>WixBalExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<Folder Include="Includes\" />
<Folder Include="Lang\" />
<Folder Include="Lang\en-us\" />
</ItemGroup>
<ItemGroup>
<Content Include="Includes\DisplayMagicianVariables.wxi" />
<Content Include="Lang\en-us\EULA_en-us.rtf" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Lang\en-us\Loc_en-us.wxl" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DisplayMagicianSetup\DisplayMagicianSetup.wixproj">
<Name>DisplayMagicianSetup</Name>
<Project>{dfd22d4d-f2e4-4ba4-b32a-7a990a35ba08}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

29
DisplayMagicianBootstrapper/Includes/DisplayMagicianVariables.wxi Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<!--
Versioning. These have to be changed for upgrades.
It's not enough to just include newer files.
-->
<?define MajorVersion="0" ?>
<?define MinorVersion="2" ?>
<?define BuildVersion="0" ?>
<!-- Revision is NOT used by WiX in the upgrade procedure -->
<!-- Full version number to display -->
<?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.BuildVersion)" ?>
<!--
Upgrade code HAS to be the same for all updates.
Once you've chosen it don't change it.
-->
<?define UpgradeCode="33E22B4C-982F-4B02-A3DE-085693742DB5" ?>
<!--
Path to the resources directory. resources don't really need to be included
in the project structure but I like to include them for for clarity
-->
<?define ResourcesDir="$(var.ProjectDir)Resources" ?>
<!--
The name of your application exe file. This will be used to kill the process when updating
and creating the desktop shortcut
-->
<?define ExeProcessName="DisplayMagician.exe" ?>
</Include>

BIN
DisplayMagicianBootstrapper/Lang/en-us/EULA_en-us.rtf Normal file
View File

Binary file not shown.

18
DisplayMagicianBootstrapper/Lang/en-us/Loc_en-us.wxl Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="LANG">1033</String>
<String Id="ProductName">DisplayMagician</String>
<String Id="ProductDescription">DisplayMagician will automatically run your games with a different display profile or audio settings and then will revert everything back to the way it was when you've finished playing.</String>
<String Id="LicenseRtf" Overridable="yes">\Lang\en-us\EULA_en-us.rtf</String>
<String Id="ManufacturerName">LittleBitBig</String>
<String Id="HelpUrl">https://displaymagician.littlebitbig.com</String>
<String Id="AboutUrl">https://displaymagician.littlebitbig.com</String>
<String Id="UpdateUrl">https://github.com/terrymacdonald/DisplayMagician/releases</String>
<String Id="LogReporterDescription">LogReporter will collect details about your computer to help us troubleshoot errors running DisplayMagician.</String>
<String Id="AppNotSupported">This application is is not supported on your current OS. Your OS must be Windows 10 or later (64-bit only).</String>
<String Id="DotNetFrameworkNeeded">.NET Framework 4.8 or higher is required for DisplayMagician to work. Please install the latest .NET Framework then run this installer again.</String>
<String Id="MustCloseDisplayMagician">You must close !(loc.ProductName) in order to upgrade it!</String>
<String Id="DowngradeErrorMessage">You cannot downgrade !(loc.ProductName) to a lower version using this installer. Please uninstall the older version of !(loc.ProductName) first!</String>
<String Id="DisplayMagicianNewerVersionInstalled">A newer version of !(loc.ProductName) is already installed.</String>
<String Id="WelcomeDlgDescription">This setup wizard will install DisplayMagician onto your computer. DisplayMagician will automatically run your games with a different display profile or audio settings and then will revert everything back to the way it was when you've finished playing. If you want to install DisplayMagician then click Next to continue or Cancel to exit.</String>
</WixLocalization>

18
DisplayMagicianSetup/DisplayMagicianSetup.wixproj
View File

@ -97,21 +97,21 @@
<Content Include="Resources\DisplayMagician.ico" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixNetFxExtension">
<HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name>
</WixExtension>
<EmbeddedResource Include="Lang\en-us\Loc_en-us.wxl" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
<HintPath>C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUtilExtension.dll</HintPath>
<Name>WixUtilExtension</Name>
</WixExtension>
<WixExtension Include="WixUIExtension">
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<HintPath>C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name>
</WixExtension>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Lang\en-us\Loc_en-us.wxl" />
<WixExtension Include="WixNetFxExtension">
<HintPath>C:\Program Files (x86)\WiX Toolset v3.14\bin\WixNetFxExtension.dll</HintPath>
<Name>WixNetFxExtension</Name>
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />

102
DisplayMagicianSetup/Fragments/DisplayMagicianFilesFragment.wxs
View File

@ -2,196 +2,196 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="APPLICATIONROOTDIRECTORY">
<Component Id="cmp53B07BB21F5AFE76F5469BD1F4BA65C9" Guid="{AC03685A-C9E8-41B5-8C90-913268A138D0}">
<Component Id="cmp53B07BB21F5AFE76F5469BD1F4BA65C9" Guid="{9137FD62-36E3-49BF-9DB0-5350A2869148}">
<File Id="fil8CC3C83921B00F72D50A1E4EEB792DFE" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AudioSwitcher.AudioApi.CoreAudio.dll" />
</Component>
<Component Id="cmp8243CB1E312705B4BA74BC791635270C" Guid="{B3CD7F3F-9CF1-4636-B557-E31B0F6317FE}">
<Component Id="cmp8243CB1E312705B4BA74BC791635270C" Guid="{4C213244-EABE-4330-AA4F-CC00A952A680}">
<File Id="filC0B7F66C67664353137460031E28BC1B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AudioSwitcher.AudioApi.dll" />
</Component>
<Component Id="cmp493DD683A43D05F764F3DEEF08ECA4C6" Guid="{17EDE071-3D50-47B1-B76E-481F349E2EE2}">
<Component Id="cmp493DD683A43D05F764F3DEEF08ECA4C6" Guid="{4C67C1F9-985A-48CC-88C6-D9DBE01C68FE}">
<File Id="filC8194EB99DFB64B8589F5D80DC8E3B4D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AutoUpdater.NET.dll" />
</Component>
<Component Id="cmp357CADF4E916AADB1DD6BD7938986798" Guid="{6F3700CC-DDBE-4A51-A1DF-C8DB2FAB6D9D}">
<Component Id="cmp357CADF4E916AADB1DD6BD7938986798" Guid="{394C33CC-0A16-47AF-93C8-8F858536AEA6}">
<File Id="fil900464E773972F43219693B12A52EDE2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\AutoUpdater.NET.pdb" />
</Component>
<Component Id="cmp78B9C7C9D51B2878B72DCBACE49DE398" Guid="{957963CD-7123-41F6-A092-1644C1678E01}">
<Component Id="cmp78B9C7C9D51B2878B72DCBACE49DE398" Guid="{C8F534AB-A4F5-4258-895A-55BFE72D42D3}">
<File Id="filDE7F24A649EB60701DC0EC41FE83CBBE" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\CircularProgressBar.dll" />
</Component>
<Component Id="cmp7EE113DB90D07F08FCE70C1861DEA947" Guid="{6DE8EEE0-6469-49FE-A2B2-EAAFC332ACF1}">
<Component Id="cmp7EE113DB90D07F08FCE70C1861DEA947" Guid="{BC9EA114-DDF9-41D7-8B08-DB7F99C4AC34}">
<File Id="filF7D383DE2E27A23D8552666CEA0DDC80" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.exe" />
</Component>
<Component Id="cmpCF520827D65E51E3ECB59344A6F528D0" Guid="{AB56A1C6-1D94-49E8-ACD5-AA97DD4172D8}">
<Component Id="cmpCF520827D65E51E3ECB59344A6F528D0" Guid="{721B8909-83AD-4F7C-A380-185BACE20DAE}">
<File Id="fil2841FB135B81D3B7EF6634B1E3E562DA" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.exe.config" />
</Component>
<Component Id="cmp20CF355FCD243C61CF66FB91F20BEA24" Guid="{78D96E0D-6CF5-4570-9AF6-5A9A55483B91}">
<Component Id="cmp20CF355FCD243C61CF66FB91F20BEA24" Guid="{FB10A2EA-E91E-4DBF-8E6B-BF5B42AE5521}">
<File Id="fil00FEE1F8F6F3766FD0431A9B72F4FCC7" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.pdb" />
</Component>
<Component Id="cmp936B3459EEFF10D8EB978B7DD0F9FDDA" Guid="{C6667302-4BA9-491C-9BEA-CB47544A54C0}">
<Component Id="cmp936B3459EEFF10D8EB978B7DD0F9FDDA" Guid="{DD1112A4-71F1-4D3D-86CD-19D37842F39B}">
<File Id="fil44F64B4F8FBBEAA84A71077F7F3B6B4D" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.Shared.dll" />
</Component>
<Component Id="cmpEFA0EED8369E2F430E0ED6D9EB027553" Guid="{A16F2E3F-5856-45FC-A0BB-8853E71340C1}">
<Component Id="cmpEFA0EED8369E2F430E0ED6D9EB027553" Guid="{69FB0ED4-EE06-4712-89DB-72FDF74234CA}">
<File Id="fil52BE9F94EBFDF8C5CFEC426A17966F40" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\DisplayMagician.Shared.pdb" />
</Component>
<Component Id="cmpE8833A8E220525D7707A018B20CEDD87" Guid="{A03B4900-EC03-44D5-AD9C-2A0408A07FC2}">
<Component Id="cmpE8833A8E220525D7707A018B20CEDD87" Guid="{513C865C-5704-4E55-94CA-F5AB010C90E0}">
<File Id="filD4FD53D2FBF78674DBC3A1B446B44FC5" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\EDIDParser.dll" />
</Component>
<Component Id="cmp8C52E948AAB2D43DF696BB7D003A8E4B" Guid="{4C3E73AF-19C4-4FB3-88C0-8678D1B118B3}">
<Component Id="cmp8C52E948AAB2D43DF696BB7D003A8E4B" Guid="{8B1554B4-A1D3-44E2-98DB-B9E62F62C694}">
<File Id="fil1965347683EC48A269FE672473CD04C2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\HtmlAgilityPack.dll" />
</Component>
<Component Id="cmp137F8F514DF6364F5BBFCBDB1B1B9807" Guid="{CD294EDB-7A26-4873-810B-4476EADC3ADE}">
<Component Id="cmp137F8F514DF6364F5BBFCBDB1B1B9807" Guid="{C8F04442-ACB3-4A78-B361-122D14D3BCAB}">
<File Id="filA79B24FCE8AA4DA0DC9A3ACBE5D830DD" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\HtmlAgilityPack.pdb" />
</Component>
<Component Id="cmpC13B4DB64E30D03117ECF099B1A9CD9C" Guid="{7547B002-50D8-4754-9E4E-8595C9FA098F}">
<Component Id="cmpC13B4DB64E30D03117ECF099B1A9CD9C" Guid="{68586FF8-4355-451C-AF3C-E2696D6B4E36}">
<File Id="fil44FFB513E29A8346713440B4BCB7F1E6" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconExtractor.dll" />
</Component>
<Component Id="cmp6AB92D1CF70395670A490E1B9BD347DE" Guid="{84B60671-8E00-4652-8DE5-CBC1DCC53A14}">
<Component Id="cmp6AB92D1CF70395670A490E1B9BD347DE" Guid="{2B8D7276-B65E-4556-A2FF-B166EDD80F15}">
<File Id="fil4DD582D50D7AC9DDD5292A76257854FA" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconLib.dll" />
</Component>
<Component Id="cmp23C6CFB3962E9B4E2A7E8EF56F20A99F" Guid="{B72FDAB9-9AE2-4D1A-9331-A49D28E7FCC5}">
<Component Id="cmp23C6CFB3962E9B4E2A7E8EF56F20A99F" Guid="{727E7E0C-F8F9-48D3-B072-A0533CFEE9BD}">
<File Id="fil0F18A66FBBBB6C44A052B9FB77ACD8F8" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\IconPicker.dll" />
</Component>
<Component Id="cmp5069692C1912B298A026EA30A39A2F36" Guid="{CDB62D7F-DF0C-4185-930D-E241A61895E3}">
<Component Id="cmp5069692C1912B298A026EA30A39A2F36" Guid="{76B43963-DAFA-413B-B563-6FE8258D4ECA}">
<File Id="fil15BCAD6A05EB985A23A6B9DE3EFEB933" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ImageListView.dll" />
</Component>
<Component Id="cmp6B91543EC1EAFC09F3C7747C1333F99A" Guid="{CC4F48C8-2FC8-4E33-B751-9394E3C7F192}">
<Component Id="cmp6B91543EC1EAFC09F3C7747C1333F99A" Guid="{451F9166-448A-4901-8DD8-0B3A87ECF185}">
<File Id="fil34AC49C1FA6CC0335FB4F16BCD03AA7B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\McMaster.Extensions.CommandLineUtils.dll" />
</Component>
<Component Id="cmp8A11CDCDF04C29EC9CA9A0C1D0D78B04" Guid="{CBCA0140-CF7C-4BBE-BF49-0C3E9CBFA25A}">
<Component Id="cmp8A11CDCDF04C29EC9CA9A0C1D0D78B04" Guid="{0E357F46-AE56-4F9E-A419-7230D1B2D8FA}">
<File Id="fil151DD1163831E94E80724A88F88C2231" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Microsoft.Toolkit.Uwp.Notifications.dll" />
</Component>
<Component Id="cmp62D956D9975F1430FEAB37FCAD94474F" Guid="{D1075CB3-6024-4AAE-9477-D079FA6DEE7C}">
<Component Id="cmp62D956D9975F1430FEAB37FCAD94474F" Guid="{41FA759E-5101-4F42-B6F5-680D3852E758}">
<File Id="fil4F519990E7E5387E7BAEB5C056617826" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Microsoft.Toolkit.Uwp.Notifications.pdb" />
</Component>
<Component Id="cmpA6AEEDB3EBF416E3AD000E7408FE3402" Guid="{74A3EE69-CB02-4972-8A65-F8EC6D4FFD0B}">
<Component Id="cmpA6AEEDB3EBF416E3AD000E7408FE3402" Guid="{AFC0A1C7-1FD9-4A44-BB3E-A0CB7EFFC561}">
<File Id="filA93EB7C7565EEDD39AF3362752AE09DB" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\MintPlayer.IconUtils.dll" />
</Component>
<Component Id="cmpA7927FF61A499CF81EE0A562CDFEDEC7" Guid="{070D08C4-3D0C-466E-ABDD-41FF71F49BEA}">
<Component Id="cmpA7927FF61A499CF81EE0A562CDFEDEC7" Guid="{58C0E303-C493-4104-A5BF-9DA6D9369D08}">
<File Id="filD7DC5F43B3964ACECD7725F05E664960" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\Newtonsoft.Json.dll" />
</Component>
<Component Id="cmpC64ECA245317593760E42F3996F3A079" Guid="{B7ABE1EF-ABFA-4C7F-9AC7-2A7E80AF23AB}">
<Component Id="cmpC64ECA245317593760E42F3996F3A079" Guid="{2CDDCFDD-ED69-422F-8E98-315366E3CEC0}">
<File Id="fil5299F0448E950048C778AA65A04FB498" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\NLog.dll" />
</Component>
<Component Id="cmp5CFF8A0C9C138424DA47E04F4B0986EB" Guid="{6281D1DA-BFD4-4A76-A355-B05E31D17DA2}">
<Component Id="cmp5CFF8A0C9C138424DA47E04F4B0986EB" Guid="{D8886986-0C57-4548-AF66-C3899D16885D}">
<File Id="filDB484734B403A8C8EE2F5B5165068C91" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\NvAPIWrapper.dll" />
</Component>
<Component Id="cmpBEC07D0236076B07E4E7D7632CCA69CB" Guid="{51C7E124-373C-42F5-A874-F127F300E89F}">
<Component Id="cmpBEC07D0236076B07E4E7D7632CCA69CB" Guid="{06393EAF-93F8-4A3A-8F83-102FC66E39B6}">
<File Id="fil8C59ED1965E9E2D1C82459BE5C1E903E" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\QueryString.NETCore.dll" />
</Component>
<Component Id="cmpAE5FC77E7BB7E9CB720EF7CEE118A4CE" Guid="{4EC1BAD0-F802-428B-8A5D-52770D711C68}">
<Component Id="cmpAE5FC77E7BB7E9CB720EF7CEE118A4CE" Guid="{BAF34526-E9F0-48BE-BE0E-9E8864182C03}">
<File Id="filD448167ABB54E447850BA2A203C5FCA1" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\QueryString.NETCore.pdb" />
</Component>
<Component Id="cmpB76F273FDED5EA841158E966B403CFC8" Guid="{4130AA74-7CF6-45C7-84C9-F7D1FADB6D36}">
<Component Id="cmpB76F273FDED5EA841158E966B403CFC8" Guid="{534F9C9A-5AD1-4975-B31B-C7845751BBA9}">
<File Id="fil8A5957F9C3DCF1A6D414F9F34402CB53" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\System.Drawing.Common.dll" />
</Component>
<Component Id="cmp7DD29D6442A6E450B2316729EA2C0F1D" Guid="{886649C4-02C0-4BAA-9CEE-7004B2A0DA66}">
<Component Id="cmp7DD29D6442A6E450B2316729EA2C0F1D" Guid="{2B2EE693-C598-401D-AA39-4A62194FB055}">
<File Id="fil9DF3290031BCB652454E62345D1FAE6B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\System.ValueTuple.dll" />
</Component>
<Component Id="cmpA8825A49786C04320E75BCFC8E961667" Guid="{0CFD683C-C525-4B85-B9FB-1265FE6EA0A1}">
<Component Id="cmpA8825A49786C04320E75BCFC8E961667" Guid="{5B3EF127-7992-4902-AADC-B99B7A7356A7}">
<File Id="filD5FED76D92088BA98BD9CF7D4D9B7EF2" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ValveKeyValue.dll" />
</Component>
<Component Id="cmp650327FC006E09EDFC7039D6E7A6F340" Guid="{E19F0280-7C56-4EE6-A9A8-F05DCF9D3C62}">
<Component Id="cmp650327FC006E09EDFC7039D6E7A6F340" Guid="{7A8563E5-64EB-4913-A725-8F23F5C328A8}">
<File Id="filB58835925907FAE2AB432C29CD8C03B4" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\WindowsDisplayAPI.dll" />
</Component>
<Component Id="cmp27AC6F10258FA1C97C54F3C1D153D122" Guid="{4490B4A6-01EF-458E-9EC1-4C32FB58195D}">
<Component Id="cmp27AC6F10258FA1C97C54F3C1D153D122" Guid="{247C866E-83C3-44B4-A6FC-46A302F6CAE7}">
<File Id="fil01CF08752F4284E3144706F10481AEA0" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\WinFormAnimation.dll" />
</Component>
<Directory Id="dirC9CEBA44737D7806DC2F52AE07FB1335" Name="ar">
<Component Id="cmp1D8A437520B8A88B5329BA85AF49F972" Guid="{B313A2E2-4739-45EE-8001-99233BF54F31}">
<Component Id="cmp1D8A437520B8A88B5329BA85AF49F972" Guid="{4D96E3CE-A7C2-4271-8E11-CF17EC6EFC5D}">
<File Id="filC934041A1382ABA35ECB5DE3BB6C4148" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ar\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir1764AC367AADA7667CA18D19856EB829" Name="cs">
<Component Id="cmp1B983AD82D33902E3869C2CD3E625557" Guid="{8A1E933D-F266-46B5-BC5C-1C0320850352}">
<Component Id="cmp1B983AD82D33902E3869C2CD3E625557" Guid="{A293186E-6F6B-4C1E-9F88-EE0235F054B8}">
<File Id="fil5CE1877B3764F3FA8C53E465EC4F1E6B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\cs\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir70240FB68A7D32052E3646DFEC7177A6" Name="da">
<Component Id="cmp645D07231E6F1B4B9F84AAED05DE08B9" Guid="{3DEC5994-3A5F-4652-9D73-B303065A3047}">
<Component Id="cmp645D07231E6F1B4B9F84AAED05DE08B9" Guid="{7BE34221-6658-4278-9D5E-61976A036A4D}">
<File Id="fil6664ED7C2E9121315323240F4A94F71F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\da\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir1C628EE15A29CD6ED08798D6B0A06B2F" Name="de">
<Component Id="cmpF7E34D6BF19681066F5E973C8D30C63A" Guid="{907A926E-71CE-40B8-8178-BD022B3B7569}">
<Component Id="cmpF7E34D6BF19681066F5E973C8D30C63A" Guid="{7274331B-F3D5-459E-B6BD-468A80F84A71}">
<File Id="filC2D506AF5C5B86FA443A326E067EF823" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\de\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir6B7DF5E7779A02DE589C2D4AABF889BA" Name="es">
<Component Id="cmpB54DE98A33D508FC6EF7E3761CDF0661" Guid="{64E8D679-88C3-45F0-B0D4-B536B422D7AC}">
<Component Id="cmpB54DE98A33D508FC6EF7E3761CDF0661" Guid="{B44302AD-C90C-49EA-8843-5D16C7DE318C}">
<File Id="filCDFD6865877E32514969EAE54D3CC9F9" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\es\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dirCCE997692B032DBDA6174416BFED255E" Name="fr">
<Component Id="cmp81105D91EF7C9FAB44E52202DBAF417C" Guid="{6E3E38F6-8FDA-4F31-85F6-FCF6EEE6C041}">
<Component Id="cmp81105D91EF7C9FAB44E52202DBAF417C" Guid="{F4866ADF-A23E-4E42-BACD-0A409326E1DA}">
<File Id="fil6B84F6EC6C9F50B7139B0E99914B401A" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\fr\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dirC0620602576770B728F6D7CF835E4230" Name="it">
<Component Id="cmpCC505044A437DF227E44E7B31A54D0BF" Guid="{8F7AFAA8-9320-46B0-A680-A7664B563C9E}">
<Component Id="cmpCC505044A437DF227E44E7B31A54D0BF" Guid="{61C1FA5A-063A-4CB7-A5F4-A6154E5A9B58}">
<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="{361A1E3B-F1EC-43A6-BF7E-8C77BE83895F}">
<Component Id="cmp2B1808EAFED02DC5D42D475F2BB83458" Guid="{08612A6C-0FFB-4EB9-9D9A-07945D3D42C4}">
<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="{89B4D3AF-FB23-46A5-912A-F5AA65A8611F}">
<Component Id="cmpE8B7CCFB66BD36E9CF741814FEE6AD14" Guid="{5AC00046-71CA-4BA5-8F2E-B7037251D782}">
<File Id="fil1A20D0790F057F2E9E188792193A32BD" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ko\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir0BFBA37D9F94C8F490A10DA87815DED5" Name="nl">
<Component Id="cmp9449E2C32768367A145DF20983A12FF7" Guid="{6FF49747-51B9-4ED4-AB61-7B483FA02F87}">
<Component Id="cmp9449E2C32768367A145DF20983A12FF7" Guid="{1A9BC1B9-BD4D-452D-ADCE-D473EA1573CA}">
<File Id="filE87E30BFF942128946D7656D111B9E28" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\nl\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir5D30DDBDF1F855D2C3CFCAE5A7D4DFB7" Name="pl">
<Component Id="cmp34EDF353BCC5E92A39657F713CAF1AA0" Guid="{F97FD62C-C2E2-41B5-9E21-1AA22AE0C0FD}">
<Component Id="cmp34EDF353BCC5E92A39657F713CAF1AA0" Guid="{E8237D6F-6533-4166-8518-79200A076508}">
<File Id="filB0BCC1B40E0F3F37F614E9AC51A1BEDF" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\pl\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir32D9AD0C9188498053C05E4C1D09269D" Name="pt">
<Component Id="cmp1E67A3938BF74EC5ADD54FAB69A80CB3" Guid="{77B1CFD8-B1CD-4D01-932C-EC930FC8EBFF}">
<Component Id="cmp1E67A3938BF74EC5ADD54FAB69A80CB3" Guid="{F8F711BA-2755-40F5-9D67-52179B9F2E4B}">
<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="{9CF6C0DE-AD37-40B8-8BEA-5A25F9F18A0D}">
<Component Id="cmpEEAAA81C74F88DC87008EB031C2F1030" Guid="{1843DE8C-896A-44B6-BB20-8A1E5B888BF5}">
<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="{FF6AD82E-ED2B-4F39-96D2-DD2D1FBD5444}">
<Component Id="cmpA923B5BC9CB54BE671D485B3A39D93A5" Guid="{D0042E5C-3B75-43DF-B60E-FC8E28F30FE1}">
<File Id="fil0672B3CFA1451A14C32747BE1794732F" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\ru\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dir0A61397BAE3772A68E21EF1C51156F2C" Name="sk">
<Component Id="cmp8D4C4B444510137E2D82B4FD6A0B9776" Guid="{39628F9D-24B2-489A-9B8F-6B801F07F70E}">
<Component Id="cmp8D4C4B444510137E2D82B4FD6A0B9776" Guid="{BA204EAA-C3D2-4349-BC7B-5A8B82EE0B08}">
<File Id="filC5765B8E01B5B47AAF9794806A76E690" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\sk\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dirBBD306FA33D57073FD02CF4EFC3A0326" Name="sv">
<Component Id="cmpFB55A1004D6DF4923A748FDC2F523D8B" Guid="{DE65DC38-8285-4515-B409-6C6789533F71}">
<Component Id="cmpFB55A1004D6DF4923A748FDC2F523D8B" Guid="{E747DBBC-A789-4091-A842-612A7003E4C4}">
<File Id="fil54738B12543ED9C06F79D373D2EB015B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\sv\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dirCE3BF130A177608F70523C718370D4AB" Name="th">
<Component Id="cmp4490FE644B0447492BBB39E2832B87C0" Guid="{8F8092CF-8673-4018-9E07-7CE35E0F3358}">
<Component Id="cmp4490FE644B0447492BBB39E2832B87C0" Guid="{A79C899C-5A16-4E1D-9378-3CB602523CA6}">
<File Id="fil4735CFBE1739CDA690669E71EA774734" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\th\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dirC06FC06848A827DE7E1246A3EEE173B9" Name="tr">
<Component Id="cmp7311ACB3A3BB0005E1BD421A03BAC70D" Guid="{F05AE2F8-28FA-456B-8DD1-D7CF5408C282}">
<Component Id="cmp7311ACB3A3BB0005E1BD421A03BAC70D" Guid="{1CEA99B8-3718-4FCF-A7B4-01E616E72B93}">
<File Id="fil9EDE895C94E3E737A7E2345A3354E4ED" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\tr\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>
<Directory Id="dirA9E5CFBEBA3415CA12E141D142550091" Name="zh">
<Component Id="cmp0E8893641CCC97E160269D736795633C" Guid="{A065F89B-7E94-42B9-ABE0-52785E4F73CA}">
<Component Id="cmp0E8893641CCC97E160269D736795633C" Guid="{01E3847A-4EA6-469E-B936-3A853F1130A7}">
<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="{BCF3C6FC-89C4-4AF2-8D22-8790B12E1D1B}">
<Component Id="cmp1D85EF433AB8DDB383D91C1C33BAA91A" Guid="{94AA9B67-CBDC-490A-B132-F4AB95F96C48}">
<File Id="fil03FB6CBB0D2712EFAD51B20D66FE4B9B" KeyPath="yes" Source="$(var.DisplayMagicianFilesDir)\zh-tw\AutoUpdater.NET.resources.dll" />
</Component>
</Directory>

4
DisplayMagicianSetup/Lang/en-us/Loc_en-us.wxl
View File

@ -7,8 +7,8 @@
<String Id="ManufacturerName">LittleBitBig</String>
<String Id="LogReporterName">LogReporter</String>
<String Id="LogReporterDescription">LogReporter will collect details about your computer to help us troubleshoot errors running DisplayMagician.</String>
<String Id="AppNotSupported">This application is is not supported on your current OS. Your OS must be Windows 10 or later (64-bit only).</String>
<String Id="DotNetFrameworkNeeded">.NET Framework 4.8 or higher is required for DisplayMagician to work. Please install the latest .NET Framework then run this installer again.</String>
<String Id="AppNotSupported">This application is is not supported on your current OS. Your OS must be Windows 8.1 or later (64-bit only).</String>
<String Id="DotNetFrameworkNeeded">.NET Framework 4.8 or higher is required for DisplayMagician to work. Please install the latest .NET Framework then run this installer again. You can download the latest .NET Framework from https://dotnet.microsoft.com/download/dotnet-framework.</String>
<String Id="MustCloseDisplayMagician">You must close !(loc.ProductName) in order to upgrade it!</String>
<String Id="DowngradeErrorMessage">You cannot downgrade !(loc.ProductName) to a lower version using this installer. Please uninstall the older version of !(loc.ProductName) first!</String>
<String Id="DisplayMagicianNewerVersionInstalled">A newer version of !(loc.ProductName) is already installed.</String>

20
DisplayMagicianSetup/Product.wxs
View File

@ -2,7 +2,8 @@
<!--Code from https://weblogs.sqlteam.com/mladenp/2010/02/11/wix-3-tutorial-solutionproject-structure-and-dev-resources/ -->
<!-- Add xmlns:util namespace definition to be able to use stuff from WixUtilExtension dll-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<!-- This is how we include wxi files -->
<?include $(sys.CURRENTDIR)Includes\DisplayMagicianVariables.wxi ?>
<!--
@ -11,7 +12,7 @@
-->
<Product Id="*" Name="!(loc.ProductName) $(var.VersionNumber)" Language="!(loc.LANG)" Version="$(var.VersionNumber)" Manufacturer="!(loc.ManufacturerName)" UpgradeCode="$(var.UpgradeCode)">
<!-- Define the minimum supported installer version (3.0) and that the install should be done for the whole machine not just the current user -->
<Package InstallerVersion="300" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" Platform="x64"/>
<Package InstallerVersion="314" Compressed="yes" InstallPrivileges="elevated" InstallScope="perMachine" Platform="x64"/>
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
<!-- Upgrade settings. This will be explained in more detail in a future post -->
<!-- <Upgrade Id="$(var.UpgradeCode)">
@ -20,19 +21,24 @@
</Upgrade> -->
<MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="!(loc.DowngradeErrorMessage)" />
<!-- Reference the global WIXNETFX4RELEASEINSTALLED property so that will automatically pull in the .Net 4.8 variables -->
<!--<PropertyRef Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED"/>
<Condition Message="!(loc.DotNetFrameworkNeeded)">
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED]]>
</Condition>-->
<!-- Load the -->
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED"/>
<Condition Message="!(loc.DotNetFrameworkNeeded)">
<![CDATA[Installed OR (WIXNETFX4RELEASEINSTALLED >= "#528040")]]>
</Condition>
<!--
Startup conditions that checks if .Net Framework 4.8 is installed or if
we're running Windows 10 or higher as the OS.
we're running Windows 8.1 or higher as the OS.
If not the installation is aborted.
By doing the (Installed OR ...) property means that this condition will only
be evaluated if the app is being installed and not on uninstall or changing
-->
<Condition Message="!(loc.DotNetFrameworkNeeded)">
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED]]>
</Condition>
<Condition Message="!(loc.AppNotSupported)">
<![CDATA[Installed OR (VersionNT64 >= 1000)]]>
<![CDATA[Installed OR (VersionNT64 >= 603)]]>
</Condition>
<!--
This custom action in the InstallExecuteSequence is needed to