OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ccfebe7)
In Preparation for VS2019 (now in Preview) (4)
authorGreyMerlin <greymerlin7@gmail.com>
Thu, 13 Dec 2018 19:00:40 +0000 (11:00 -0800)
committerGreyMerlin <greymerlin7@gmail.com>
Fri, 21 Dec 2018 22:45:28 +0000 (14:45 -0800)
* Update various `*.sln` properties
* Update various `*.vcxproj` properties

ArchiveSupport/Merge7z/Merge7z.vs2019.sln patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2019.sln patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj patch | blob | history
Externals/poco/Foundation/Foundation.vs2019.vcxproj patch | blob | history
Externals/poco/Util/Util.vs2019.vcxproj patch | blob | history
Externals/poco/XML/XML.vs2019.vcxproj patch | blob | history
ShellExtension/ShellExtension.vs2019.sln patch | blob | history
Src/Merge.vs2019.vcxproj patch | blob | history
Src/MergeLang.vs2019.vcxproj patch | blob | history
Testing/GoogleTest/UnitTests/UnitTests.vs2019.vcxproj patch | blob | history

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2019.sln b/ArchiveSupport/Merge7z/Merge7z.vs2019.sln
index 2add490..883c274 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2019.sln
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2019.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28407.52
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z.vs2019", "Merge7z.vs2019.vcxproj", "{FFB6D02A-782B-48EF-8398-7F8862859616}"
 EndProject
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj
index db26df1..914cc60 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2019.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{FFB6D02A-782B-48EF-8398-7F8862859616}</ProjectGuid>
     <SccProjectName />
     <SccLocalPath />
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.sln b/Externals/crystaledit/Sample/SampleStatic.vs2019.sln
index 7dc4af0..b04b669 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2019.sln
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28407.52
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic.vs2019", "SampleStatic.vs2019.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
 EndProject
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
index 106d065..45f6d46 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
@@ -38,7 +38,7 @@
     <ProjectGuid>{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}</ProjectGuid>
     <RootNamespace>SampleStatic</RootNamespace>
     <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
diff --git a/Externals/poco/Foundation/Foundation.vs2019.vcxproj b/Externals/poco/Foundation/Foundation.vs2019.vcxproj
index f94ff4a..5e55e95 100644 (file)
--- a/Externals/poco/Foundation/Foundation.vs2019.vcxproj
+++ b/Externals/poco/Foundation/Foundation.vs2019.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/Externals/poco/Util/Util.vs2019.vcxproj b/Externals/poco/Util/Util.vs2019.vcxproj
index 0deb8b9..34c068c 100644 (file)
--- a/Externals/poco/Util/Util.vs2019.vcxproj
+++ b/Externals/poco/Util/Util.vs2019.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{6FF56CDB-787A-4714-A28C-919003F9FA6C}</ProjectGuid>
     <RootNamespace>Util</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/Externals/poco/XML/XML.vs2019.vcxproj b/Externals/poco/XML/XML.vs2019.vcxproj
index b055d84..81d7a4f 100644 (file)
--- a/Externals/poco/XML/XML.vs2019.vcxproj
+++ b/Externals/poco/XML/XML.vs2019.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{9E211743-85FE-4977-82F3-4F04B40C912D}</ProjectGuid>
     <RootNamespace>XML</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/ShellExtension/ShellExtension.vs2019.sln b/ShellExtension/ShellExtension.vs2019.sln
index 4d7b3bb..a792ebd 100644 (file)
--- a/ShellExtension/ShellExtension.vs2019.sln
+++ b/ShellExtension/ShellExtension.vs2019.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28407.52
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension.vs2019.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"
 EndProject
diff --git a/Src/Merge.vs2019.vcxproj b/Src/Merge.vs2019.vcxproj
index b8bc675..2f46c83 100644 (file)
--- a/Src/Merge.vs2019.vcxproj
+++ b/Src/Merge.vs2019.vcxproj
@@ -31,7 +31,7 @@
     <ProjectGuid>{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}</ProjectGuid>
     <RootNamespace>Merge</RootNamespace>
     <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
@@ -39,42 +39,42 @@
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141_xp</PlatformToolset>
-       <XPDeprecationWarning>false</XPDeprecationWarning>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
-       <XPDeprecationWarning>false</XPDeprecationWarning>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141_xp</PlatformToolset>
-       <XPDeprecationWarning>false</XPDeprecationWarning>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141_xp</PlatformToolset>
-       <XPDeprecationWarning>false</XPDeprecationWarning>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
-       <XPDeprecationWarning>false</XPDeprecationWarning>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>Static</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141_xp</PlatformToolset>
-       <XPDeprecationWarning>false</XPDeprecationWarning>
+    <XPDeprecationWarning>false</XPDeprecationWarning>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/Src/MergeLang.vs2019.vcxproj b/Src/MergeLang.vs2019.vcxproj
index 84058e3..5765a9a 100644 (file)
--- a/Src/MergeLang.vs2019.vcxproj
+++ b/Src/MergeLang.vs2019.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{4B011DDA-2279-437D-903C-8028913AF31B}</ProjectGuid>
     <RootNamespace>MergeLang</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vs2019.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vs2019.vcxproj
index aff7ebf..93df451 100644 (file)
--- a/Testing/GoogleTest/UnitTests/UnitTests.vs2019.vcxproj
+++ b/Testing/GoogleTest/UnitTests/UnitTests.vs2019.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <ProjectName>UnitTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
About OSDN
Find Software
Develop Software
Help