diff --git a/app/DD-Record-Organizer.sln b/app/DD-Record-Organizer.sln index 74305d7..160805a 100644 --- a/app/DD-Record-Organizer.sln +++ b/app/DD-Record-Organizer.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.9 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DD-Record-Organizer", "DD-Record-Organizer\DD-Record-Organizer.vbproj", "{BDCC148B-4C84-4A48-80CF-4C56057294E0}" EndProject @@ -11,6 +11,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "RecordOrganizer_RightManage EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERSION_CHECKER", "VERSION_CHECKER\VERSION_CHECKER.vbproj", "{BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupWiX_NoUpdater", "SetupWiX_NoUpdater\SetupWiX_NoUpdater.wixproj", "{9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CD_ROM|Any CPU = CD_ROM|Any CPU @@ -130,6 +132,34 @@ Global {BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU {BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU {BD9ADB52-06CA-401C-84C7-1D94BC3E07E7}.SingleImage|x86.ActiveCfg = Release|Any CPU + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Any CPU.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Any CPU.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|Mixed Platforms.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|x86.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.CD_ROM|x86.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|Any CPU.ActiveCfg = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|x86.ActiveCfg = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Debug|x86.Build.0 = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Any CPU.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Any CPU.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|Mixed Platforms.Build.0 = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|x86.ActiveCfg = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.DVD-5|x86.Build.0 = Debug|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|Any CPU.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|Mixed Platforms.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|x86.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.Release|x86.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Any CPU.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Any CPU.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|Mixed Platforms.Build.0 = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|x86.ActiveCfg = Release|x86 + {9E8B6445-8CA8-4B8A-8A04-4437A9970B7B}.SingleImage|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 75a37e0..4573737 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -116,7 +116,7 @@ - + @@ -261,10 +261,7 @@ - - - - + @@ -295,7 +292,7 @@ - + @@ -304,15 +301,15 @@ 1 + Control="Next" + Event="NewDialog" + Value="InstallDirDlg" + Order="2">1 1 + Control="Back" + Event="NewDialog" + Value="WelcomeDlg" + Order="2">1 diff --git a/app/SetupWiX_NoUpdater/Product.wxs b/app/SetupWiX_NoUpdater/Product.wxs new file mode 100644 index 0000000..febb58b --- /dev/null +++ b/app/SetupWiX_NoUpdater/Product.wxs @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 1 + + + + diff --git a/app/SetupWiX_NoUpdater/SetupWiX_NoUpdater.wixproj b/app/SetupWiX_NoUpdater/SetupWiX_NoUpdater.wixproj new file mode 100644 index 0000000..3ba991e --- /dev/null +++ b/app/SetupWiX_NoUpdater/SetupWiX_NoUpdater.wixproj @@ -0,0 +1,81 @@ + + + + Debug + x86 + 3.8 + {9e8b6445-8ca8-4b8a-8a04-4437a9970b7b} + 2.0 + RecordOrganizerSetup + Package + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + + + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + -b "$(SolutionDir)DD-Record-Organizer\bin\$(Configuration)" +-b "$(SolutionDir)RecordOrganizer_RightManager\bin\$(Configuration)" +-b "$(SolutionDir)VERSION_CHECKER\bin\$(Configuration)" +-cultures:de-DE,en-US + + + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file