From 142ecbe957dfbc3298630d425e2211f7d3d0bc75 Mon Sep 17 00:00:00 2001 From: Ivan Mogilko Date: Tue, 26 Nov 2024 00:04:51 +0300 Subject: [PATCH 1/3] MSVS: upgraded Editor solution and projects to VS2019 - Upgraded PlatformToolset from v140 to v142 - Updated Windows SDK version from 8.1 to 10.0 --- Editor/AGS.Native/NativeDLL.vcxproj | 9 +++++---- Editor/AGS.Native/NativeDLL.vcxproj.filters | 9 ++++++--- Solutions/AGS.Editor.Full.sln | 4 ++-- Solutions/Common.Lib/Common.Lib.vcxproj | 18 +++++++++--------- Solutions/Compiler.Lib/Compiler.Lib.vcxproj | 18 +++++++++--------- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Editor/AGS.Native/NativeDLL.vcxproj b/Editor/AGS.Native/NativeDLL.vcxproj index 9063dc24865..e8cd9f14f06 100644 --- a/Editor/AGS.Native/NativeDLL.vcxproj +++ b/Editor/AGS.Native/NativeDLL.vcxproj @@ -24,32 +24,33 @@ AGS.Native AtlProj v4.6 + 10.0 DynamicLibrary - v140 + v142 false MultiByte true DynamicLibrary - v140 + v142 false MultiByte true DynamicLibrary - v140 + v142 false MultiByte true DynamicLibrary - v140 + v142 false MultiByte true diff --git a/Editor/AGS.Native/NativeDLL.vcxproj.filters b/Editor/AGS.Native/NativeDLL.vcxproj.filters index 9bbde4de4e0..14fac99c469 100644 --- a/Editor/AGS.Native/NativeDLL.vcxproj.filters +++ b/Editor/AGS.Native/NativeDLL.vcxproj.filters @@ -216,9 +216,6 @@ Header Files - - Header Files - Header Files\ac @@ -234,6 +231,12 @@ Header Files + + Header Files + + + Header Files + diff --git a/Solutions/AGS.Editor.Full.sln b/Solutions/AGS.Editor.Full.sln index 3ecbb29492e..fad2de699ed 100644 --- a/Solutions/AGS.Editor.Full.sln +++ b/Solutions/AGS.Editor.Full.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33529.622 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native Libraries", "Native Libraries", "{AD076495-5CEC-4149-B448-0E24AF8B2C2E}" EndProject diff --git a/Solutions/Common.Lib/Common.Lib.vcxproj b/Solutions/Common.Lib/Common.Lib.vcxproj index 43f42af23ae..f96f66849ee 100644 --- a/Solutions/Common.Lib/Common.Lib.vcxproj +++ b/Solutions/Common.Lib/Common.Lib.vcxproj @@ -54,40 +54,40 @@ {463A715C-3EF3-47C7-AC7F-D97660149C49} CommonLib Win32Proj - 8.1 + 10.0 StaticLibrary - v140 + v142 Unicode StaticLibrary - v140 + v142 Unicode StaticLibrary - v140 + v142 Unicode true StaticLibrary - v140 + v142 Unicode true StaticLibrary - v140 + v142 Unicode true StaticLibrary - v140 + v142 Unicode true @@ -105,12 +105,12 @@ StaticLibrary - v140 + v142 Unicode StaticLibrary - v140 + v142 Unicode diff --git a/Solutions/Compiler.Lib/Compiler.Lib.vcxproj b/Solutions/Compiler.Lib/Compiler.Lib.vcxproj index 25dadd2701f..47a469dd460 100644 --- a/Solutions/Compiler.Lib/Compiler.Lib.vcxproj +++ b/Solutions/Compiler.Lib/Compiler.Lib.vcxproj @@ -38,51 +38,51 @@ {7B621FC0-BFD0-40E4-800A-0CD5E5707532} CompilerLib Win32Proj - 8.1 + 10.0 StaticLibrary - v140 + v142 MultiByte StaticLibrary - v140 + v142 MultiByte StaticLibrary - v140 + v142 MultiByte true StaticLibrary - v140 + v142 MultiByte true StaticLibrary - v140 + v142 MultiByte true StaticLibrary - v140 + v142 MultiByte true StaticLibrary - v140 + v142 MultiByte StaticLibrary - v140 + v142 MultiByte From 0e939f45380f06161bfe8a753b01b9725dad4c30 Mon Sep 17 00:00:00 2001 From: Ivan Mogilko Date: Tue, 26 Nov 2024 00:14:52 +0300 Subject: [PATCH 2/3] MSVC: upgraded Engine solution and projects to VS2019 - Upgraded PlatformToolset from v140 to v142; and v141_xp for _XP configs. - Updated Windows SDK version from 8.1 to 10.0 - In .props files change references to LIB locations, by adding _VS19 prefix; this is to be able to have both VS15 and VS19 versions of libs in the same enviroment. --- Solutions/Common.Lib/Common.Lib.vcxproj | 8 ++++---- Solutions/Engine.App/Engine.App.vcxproj | 18 +++++++++--------- Solutions/Engine.sln | 7 +++++-- Solutions/libogg.props | 4 ++-- Solutions/libtheora.props | 4 ++-- Solutions/libvorbis.props | 4 ++-- Solutions/sdl2.props | 4 ++-- 7 files changed, 26 insertions(+), 23 deletions(-) diff --git a/Solutions/Common.Lib/Common.Lib.vcxproj b/Solutions/Common.Lib/Common.Lib.vcxproj index f96f66849ee..411fb377fde 100644 --- a/Solutions/Common.Lib/Common.Lib.vcxproj +++ b/Solutions/Common.Lib/Common.Lib.vcxproj @@ -93,13 +93,13 @@ StaticLibrary - v140_xp + v141_xp Unicode true StaticLibrary - v140_xp + v141_xp Unicode true @@ -115,12 +115,12 @@ StaticLibrary - v140_xp + v141_xp Unicode StaticLibrary - v140_xp + v141_xp Unicode diff --git a/Solutions/Engine.App/Engine.App.vcxproj b/Solutions/Engine.App/Engine.App.vcxproj index c2608d4dfd9..3a9e201a414 100644 --- a/Solutions/Engine.App/Engine.App.vcxproj +++ b/Solutions/Engine.App/Engine.App.vcxproj @@ -38,51 +38,51 @@ {49A909AF-49F3-451D-B6DF-839159E54A01} EngineApp Win32Proj - 8.1 + 10.0 Application - v140 + v142 MultiByte true Application - v140 + v142 MultiByte true Application - v140_xp + v141_xp MultiByte true Application - v140_xp + v141_xp MultiByte true Application - v140 + v142 MultiByte Application - v140 + v142 MultiByte Application - v140_xp + v141_xp MultiByte Application - v140_xp + v141_xp MultiByte diff --git a/Solutions/Engine.sln b/Solutions/Engine.sln index 356d6101686..6fb9706d8ec 100644 --- a/Solutions/Engine.sln +++ b/Solutions/Engine.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33529.622 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Lib", "Common.Lib\Common.Lib.vcxproj", "{463A715C-3EF3-47C7-AC7F-D97660149C49}" EndProject @@ -58,4 +58,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B529F582-F0F0-4BCE-9AD3-5A66162203FB} + EndGlobalSection EndGlobal diff --git a/Solutions/libogg.props b/Solutions/libogg.props index f06a1c7afcf..8ca6162033c 100644 --- a/Solutions/libogg.props +++ b/Solutions/libogg.props @@ -5,12 +5,12 @@ - $(AGS_LIBOGG_LIB);%(AdditionalLibraryDirectories) + $(AGS_LIBOGG_LIB_VS19);%(AdditionalLibraryDirectories) - $(AGS_LIBOGG_LIB_X64);$(AGS_LIBOGG_LIB)\..\x64;%(AdditionalLibraryDirectories) + $(AGS_LIBOGG_LIB_VS19_X64);$(AGS_LIBOGG_LIB_VS19)\..\x64;%(AdditionalLibraryDirectories) diff --git a/Solutions/libtheora.props b/Solutions/libtheora.props index 35a51a6dcb4..168249160d0 100644 --- a/Solutions/libtheora.props +++ b/Solutions/libtheora.props @@ -5,12 +5,12 @@ - $(AGS_LIBTHEORA_LIB);%(AdditionalLibraryDirectories) + $(AGS_LIBTHEORA_LIB_VS19);%(AdditionalLibraryDirectories) - $(AGS_LIBTHEORA_LIB_X64);$(AGS_LIBTHEORA_LIB)\..\x64;%(AdditionalLibraryDirectories) + $(AGS_LIBTHEORA_LIB_VS19_X64);$(AGS_LIBTHEORA_LIB_VS19)\..\x64;%(AdditionalLibraryDirectories) diff --git a/Solutions/libvorbis.props b/Solutions/libvorbis.props index 96fb151cc8d..37179e2f0af 100644 --- a/Solutions/libvorbis.props +++ b/Solutions/libvorbis.props @@ -5,12 +5,12 @@ - $(AGS_LIBVORBIS_LIB);%(AdditionalLibraryDirectories) + $(AGS_LIBVORBIS_LIB_VS19);%(AdditionalLibraryDirectories) - $(AGS_LIBVORBIS_LIB_X64);$(AGS_LIBVORBIS_LIB)\..\x64;%(AdditionalLibraryDirectories) + $(AGS_LIBVORBIS_LIB_VS19_X64);$(AGS_LIBVORBIS_LIB_VS19)\..\x64;%(AdditionalLibraryDirectories) diff --git a/Solutions/sdl2.props b/Solutions/sdl2.props index 8397a931c0b..0977a88667d 100644 --- a/Solutions/sdl2.props +++ b/Solutions/sdl2.props @@ -10,7 +10,7 @@ $(AGS_SDL_INCLUDE);$(AGS_SDL_SOUND_INCLUDE);%(AdditionalIncludeDirectories) - $(AGS_SDL_LIB);$(AGS_SDL_SOUND_LIB);%(AdditionalLibraryDirectories) + $(AGS_SDL_LIB);$(AGS_SDL_SOUND_LIB_VS19);%(AdditionalLibraryDirectories) @@ -18,7 +18,7 @@ $(AGS_SDL_INCLUDE);$(AGS_SDL_SOUND_INCLUDE);%(AdditionalIncludeDirectories) - $(AGS_SDL_LIB_X64);$(AGS_SDL_SOUND_LIB_X64);$(AGS_SDL_LIB)\..\x64;$(AGS_SDL_SOUND_LIB)\..\x64;%(AdditionalLibraryDirectories) + $(AGS_SDL_LIB_X64);$(AGS_SDL_SOUND_LIB_VS19_X64);$(AGS_SDL_LIB)\..\x64;$(AGS_SDL_SOUND_LIB_VS19)\..\x64;%(AdditionalLibraryDirectories) From 0d3f50680ad8236bb2c10cf271242501c51f6a4b Mon Sep 17 00:00:00 2001 From: Ivan Mogilko Date: Tue, 26 Nov 2024 03:05:45 +0300 Subject: [PATCH 3/3] MSVS: upgraded Tools and Tests projects to VS2019 --- Solutions/Compiler.App/Compiler.App.vcxproj | 18 ++++++------- Solutions/Compiler.Lib.sln | 7 +++-- .../Compiler.Lib/Compiler.Lib.Test.vcxproj | 9 ++++--- Solutions/Tests.App/Common.Lib.Test.vcxproj | 10 +++---- Solutions/Tests.App/Engine.App.Test.vcxproj | 10 +++---- Solutions/Tests.sln | 27 ++++++++++--------- Solutions/Tools.App/afg2dlgasc.vcxproj | 10 +++---- Solutions/Tools.App/agfexport.vcxproj | 16 +++++------ Solutions/Tools.App/agspak.vcxproj | 12 ++++----- Solutions/Tools.App/agsunpak.vcxproj | 10 +++---- Solutions/Tools.App/crm2ash.vcxproj | 10 +++---- Solutions/Tools.App/crmpak.vcxproj | 10 +++---- Solutions/Tools.App/trac.vcxproj | 10 +++---- Solutions/Tools.sln | 7 +++-- 14 files changed, 88 insertions(+), 78 deletions(-) diff --git a/Solutions/Compiler.App/Compiler.App.vcxproj b/Solutions/Compiler.App/Compiler.App.vcxproj index 995413cfa3d..e0b7f09cb04 100644 --- a/Solutions/Compiler.App/Compiler.App.vcxproj +++ b/Solutions/Compiler.App/Compiler.App.vcxproj @@ -38,51 +38,51 @@ {328E0769-7941-4093-8BF9-0E138955F44C} Win32Proj CompilerApp - 8.1 + 10.0 Application - v140 + v142 MultiByte Application - v140 + v142 MultiByte Application - v140 + v142 MultiByte true Application - v140 + v142 MultiByte true Application - v140 + v142 MultiByte true Application - v140 + v142 MultiByte true Application - v140 + v142 MultiByte Application - v140 + v142 MultiByte diff --git a/Solutions/Compiler.Lib.sln b/Solutions/Compiler.Lib.sln index a7e77b5cf18..f3c20b053af 100644 --- a/Solutions/Compiler.Lib.sln +++ b/Solutions/Compiler.Lib.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33529.622 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler.Lib", "Compiler.Lib\Compiler.Lib.vcxproj", "{7B621FC0-BFD0-40E4-800A-0CD5E5707532}" EndProject @@ -56,4 +56,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {6296B736-E37A-42D4-B73F-6001D9BB666F} + EndGlobalSection EndGlobal diff --git a/Solutions/Compiler.Lib/Compiler.Lib.Test.vcxproj b/Solutions/Compiler.Lib/Compiler.Lib.Test.vcxproj index 6ff9e1738bd..3c1e5702d05 100644 --- a/Solutions/Compiler.Lib/Compiler.Lib.Test.vcxproj +++ b/Solutions/Compiler.Lib/Compiler.Lib.Test.vcxproj @@ -22,28 +22,29 @@ {EADA878B-2D85-484A-AA0A-1F19C40D2D2A} CompilerLibTest Win32Proj + 10.0 Application - v140 + v142 Unicode true Application - v140 + v142 Unicode true Application - v140 + v142 Unicode Application - v140 + v142 Unicode diff --git a/Solutions/Tests.App/Common.Lib.Test.vcxproj b/Solutions/Tests.App/Common.Lib.Test.vcxproj index 7a3a28ac6e0..2dab7a3a9e4 100644 --- a/Solutions/Tests.App/Common.Lib.Test.vcxproj +++ b/Solutions/Tests.App/Common.Lib.Test.vcxproj @@ -79,32 +79,32 @@ {212724F9-66FC-4BB6-97F5-975CA10EFFEB} Win32Proj EngineAppTest - 8.1 + 10.0 Application true - v140 + v142 Unicode Application false - v140 + v142 true Unicode Application true - v140 + v142 Unicode Application false - v140 + v142 true Unicode diff --git a/Solutions/Tests.App/Engine.App.Test.vcxproj b/Solutions/Tests.App/Engine.App.Test.vcxproj index e761cf08cb6..a1ab7e9014b 100644 --- a/Solutions/Tests.App/Engine.App.Test.vcxproj +++ b/Solutions/Tests.App/Engine.App.Test.vcxproj @@ -30,32 +30,32 @@ {E5EBFBA9-1617-412B-843E-682609C65100} Win32Proj EngineAppTest - 8.1 + 10.0 Application true - v140 + v142 Unicode Application false - v140 + v142 true Unicode Application true - v140 + v142 Unicode Application false - v140 + v142 true Unicode diff --git a/Solutions/Tests.sln b/Solutions/Tests.sln index c695eb99948..09d33ec358a 100644 --- a/Solutions/Tests.sln +++ b/Solutions/Tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33529.622 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Lib.Test", "Tests.App\Common.Lib.Test.vcxproj", "{212724F9-66FC-4BB6-97F5-975CA10EFFEB}" EndProject @@ -9,30 +9,33 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Engine.App.Test", "Tests.Ap EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 Debug|Win32 = Debug|Win32 - Release|x64 = Release|x64 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Debug|x64.ActiveCfg = Debug|x64 - {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Debug|x64.Build.0 = Debug|x64 {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Debug|Win32.ActiveCfg = Debug|Win32 {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Debug|Win32.Build.0 = Debug|Win32 - {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Release|x64.ActiveCfg = Release|x64 - {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Release|x64.Build.0 = Release|x64 + {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Debug|x64.ActiveCfg = Debug|x64 + {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Debug|x64.Build.0 = Debug|x64 {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Release|Win32.ActiveCfg = Release|Win32 {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Release|Win32.Build.0 = Release|Win32 - {E5EBFBA9-1617-412B-843E-682609C65100}.Debug|x64.ActiveCfg = Debug|x64 - {E5EBFBA9-1617-412B-843E-682609C65100}.Debug|x64.Build.0 = Debug|x64 + {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Release|x64.ActiveCfg = Release|x64 + {212724F9-66FC-4BB6-97F5-975CA10EFFEB}.Release|x64.Build.0 = Release|x64 {E5EBFBA9-1617-412B-843E-682609C65100}.Debug|Win32.ActiveCfg = Debug|Win32 {E5EBFBA9-1617-412B-843E-682609C65100}.Debug|Win32.Build.0 = Debug|Win32 - {E5EBFBA9-1617-412B-843E-682609C65100}.Release|x64.ActiveCfg = Release|x64 - {E5EBFBA9-1617-412B-843E-682609C65100}.Release|x64.Build.0 = Release|x64 + {E5EBFBA9-1617-412B-843E-682609C65100}.Debug|x64.ActiveCfg = Debug|x64 + {E5EBFBA9-1617-412B-843E-682609C65100}.Debug|x64.Build.0 = Debug|x64 {E5EBFBA9-1617-412B-843E-682609C65100}.Release|Win32.ActiveCfg = Release|Win32 {E5EBFBA9-1617-412B-843E-682609C65100}.Release|Win32.Build.0 = Release|Win32 + {E5EBFBA9-1617-412B-843E-682609C65100}.Release|x64.ActiveCfg = Release|x64 + {E5EBFBA9-1617-412B-843E-682609C65100}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {018160F0-A96F-4970-8FBE-DB91242E051A} + EndGlobalSection EndGlobal diff --git a/Solutions/Tools.App/afg2dlgasc.vcxproj b/Solutions/Tools.App/afg2dlgasc.vcxproj index 4d0b0d8a40c..4622ae35d4e 100644 --- a/Solutions/Tools.App/afg2dlgasc.vcxproj +++ b/Solutions/Tools.App/afg2dlgasc.vcxproj @@ -55,33 +55,33 @@ {D0CB449B-83AB-43B2-9286-0FAE4C37D73F} MakeRoomHeader - 8.1 + 10.0 agf2dlgasc Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte diff --git a/Solutions/Tools.App/agfexport.vcxproj b/Solutions/Tools.App/agfexport.vcxproj index b7d11dd0145..acfb82a2836 100644 --- a/Solutions/Tools.App/agfexport.vcxproj +++ b/Solutions/Tools.App/agfexport.vcxproj @@ -43,33 +43,33 @@ {776E38BA-D6A4-431E-8053-299310D85301} MakeRoomHeader - 8.1 + 10.0 agfexport Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte @@ -121,7 +121,7 @@ true ..\..\Tools;..\..\Common;..\..\libsrc\tinyxml2;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 4996 + 4996 shlwapi.lib;%(AdditionalDependencies) @@ -156,7 +156,7 @@ true _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\..\Tools;..\..\Common;..\..\libsrc\tinyxml2;%(AdditionalIncludeDirectories) - 4996 + 4996 true @@ -168,4 +168,4 @@ - + \ No newline at end of file diff --git a/Solutions/Tools.App/agspak.vcxproj b/Solutions/Tools.App/agspak.vcxproj index bc76d987f1f..7591223f4f1 100644 --- a/Solutions/Tools.App/agspak.vcxproj +++ b/Solutions/Tools.App/agspak.vcxproj @@ -40,33 +40,33 @@ {45BBD8B0-1FBB-4997-94D9-830461D56781} MakeRoomHeader - 8.1 + 10.0 agspak Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte @@ -167,4 +167,4 @@ - + \ No newline at end of file diff --git a/Solutions/Tools.App/agsunpak.vcxproj b/Solutions/Tools.App/agsunpak.vcxproj index 1d76803063f..31b426fc8ab 100644 --- a/Solutions/Tools.App/agsunpak.vcxproj +++ b/Solutions/Tools.App/agsunpak.vcxproj @@ -40,33 +40,33 @@ {BED528B1-6BC6-4857-B78D-B70F672D8F23} MakeRoomHeader - 8.1 + 10.0 agsunpak Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte diff --git a/Solutions/Tools.App/crm2ash.vcxproj b/Solutions/Tools.App/crm2ash.vcxproj index c534066624a..a6bfe775cb2 100644 --- a/Solutions/Tools.App/crm2ash.vcxproj +++ b/Solutions/Tools.App/crm2ash.vcxproj @@ -42,33 +42,33 @@ {1BCFCAFE-B38D-4960-AB33-F76FDA316FB6} MakeRoomHeader - 8.1 + 10.0 crm2ash Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte diff --git a/Solutions/Tools.App/crmpak.vcxproj b/Solutions/Tools.App/crmpak.vcxproj index 2512ca6c058..2d236815632 100644 --- a/Solutions/Tools.App/crmpak.vcxproj +++ b/Solutions/Tools.App/crmpak.vcxproj @@ -37,33 +37,33 @@ {20F0B521-1E8C-4F96-9C35-8CF244CA6947} MakeRoomHeader - 8.1 + 10.0 crmpak Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte diff --git a/Solutions/Tools.App/trac.vcxproj b/Solutions/Tools.App/trac.vcxproj index 90f2f708122..9b79c03b26b 100644 --- a/Solutions/Tools.App/trac.vcxproj +++ b/Solutions/Tools.App/trac.vcxproj @@ -44,33 +44,33 @@ {0981C97D-C8AE-43CE-8A4B-3231B6468AE7} MakeRoomHeader - 8.1 + 10.0 trac Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte Application true - v140 + v142 MultiByte Application false - v140 + v142 true MultiByte diff --git a/Solutions/Tools.sln b/Solutions/Tools.sln index 3dabef42913..1ccbd7df792 100644 --- a/Solutions/Tools.sln +++ b/Solutions/Tools.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.33529.622 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crm2ash", "Tools.App\crm2ash.vcxproj", "{1BCFCAFE-B38D-4960-AB33-F76FDA316FB6}" EndProject @@ -85,4 +85,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {43E46631-8168-4C9F-A48F-53D9F1994333} + EndGlobalSection EndGlobal