diff --git a/app/DD_PM_WINDREAM.sln b/app/DD_PM_WINDREAM.sln index cfdcc0f..ca2f6da 100644 --- a/app/DD_PM_WINDREAM.sln +++ b/app/DD_PM_WINDREAM.sln @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26228.9 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD_PM_WINDREAM", "DD_PM_WINDREAM\DD_PM_WINDREAM.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{E714688A-5E3D-4229-9645-9FB650139B47}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CD_ROM|x86 = CD_ROM|x86 @@ -36,8 +38,21 @@ Global {E714688A-5E3D-4229-9645-9FB650139B47}.Release|x86.Build.0 = Release|x86 {E714688A-5E3D-4229-9645-9FB650139B47}.SingleImage|x86.ActiveCfg = Release|x86 {E714688A-5E3D-4229-9645-9FB650139B47}.SingleImage|x86.Build.0 = Release|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|x86.ActiveCfg = Release|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.CD_ROM|x86.Build.0 = Release|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Debug|x86.ActiveCfg = Debug|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Debug|x86.Build.0 = Debug|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.DVD-5|x86.ActiveCfg = Debug|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.DVD-5|x86.Build.0 = Debug|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Release|x86.ActiveCfg = Release|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.Release|x86.Build.0 = Release|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|x86.ActiveCfg = Release|x86 + {11F40F86-5DF6-4279-BDF3-17AD8B93AE7C}.SingleImage|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D2AB72E6-23F2-4C08-95A0-55C39BACF5D7} + EndGlobalSection EndGlobal diff --git a/app/Setup/Setup.wixproj b/app/Setup/Setup.wixproj index c9a79fc..19cba6e 100644 --- a/app/Setup/Setup.wixproj +++ b/app/Setup/Setup.wixproj @@ -30,19 +30,19 @@ + + + - $(WixExtDir)\WixUtilExtension.dll + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUtilExtension.dll WixUtilExtension - $(WixExtDir)\WixUIExtension.dll + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll WixUIExtension - - - diff --git a/app/SetupVS19/Config.wxi b/app/SetupVS19/Config.wxi new file mode 100644 index 0000000..2f5c59e --- /dev/null +++ b/app/SetupVS19/Config.wxi @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs new file mode 100644 index 0000000..8e2e83c --- /dev/null +++ b/app/SetupVS19/Product.wxs @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DISABLE_DESKTOP_ICON + + + + + DISABLE_STARTMENU_ICON + + + + + + + + + + + + 1 + 1 + 1 + 1 + 1 + + + \ No newline at end of file diff --git a/app/SetupVS19/SetupVS19.wixproj b/app/SetupVS19/SetupVS19.wixproj new file mode 100644 index 0000000..2d85d00 --- /dev/null +++ b/app/SetupVS19/SetupVS19.wixproj @@ -0,0 +1,61 @@ + + + + Debug + x86 + 3.10 + 11f40f86-5df6-4279-bdf3-17ad8b93ae7c + 2.0 + SetupVS19 + Package + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + -b "$(SolutionDir)DD_PM_WINDREAM\bin\$(Configuration)" + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + + + + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUtilExtension.dll + WixUtilExtension + + + C:\Program Files (x86)\WiX Toolset v3.14\bin\WixUIExtension.dll + WixUIExtension + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file