OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update Korean.po (#1689)
[winmerge-jp/winmerge-jp.git] / ALL.vs2017.sln
diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index 8f1ccba..1a243da 100644 (file)
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -93,7 +93,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinMerge32BitPluginProxyPS"
                {AF985E3F-14EE-420E-90FE-AAA844797D36} = {AF985E3F-14EE-420E-90FE-AAA844797D36}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMerge", "Externals\winimerge\src\WinIMerge\winimerge.vcxproj", "{36365C8C-04A0-4892-9B83-AD6E05D50D67}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}
@@ -140,7 +140,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImagePlus", "Externals\
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\winimerge\src\WinIMergeLib\WinIMergeLib.vcxproj", "{C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {9E219DF2-315D-478E-8A07-8960C377CE1E} = {9E219DF2-315D-478E-8A07-8960C377CE1E}
@@ -148,7 +148,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinIMergeLib", "Externals\w
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FreeImage", "FreeImage", "{AD6E6E47-0363-409F-8B7A-48341147E632}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cidiff", "Externals\winimerge\src\cidiff\cidiff.vcxproj", "{49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}"
        ProjectSection(ProjectDependencies) = postProject
                {94F36908-A4E2-4533-939D-64FF6EADA5A1} = {94F36908-A4E2-4533-939D-64FF6EADA5A1}
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A} = {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}
@@ -240,10 +240,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{231348
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InnoSetup", "InnoSetup", "{5360DC20-6552-4F74-8D4D-BF88B23E0B3A}"
        ProjectSection(SolutionItems) = preProject
-               Docs\Manual\Shared\xsl\common.xsl = Docs\Manual\Shared\xsl\common.xsl
                Installer\InnoSetup\ExternalArchiveFormat.ini = Installer\InnoSetup\ExternalArchiveFormat.ini
-               Docs\Manual\Shared\xsl\html.xsl = Docs\Manual\Shared\xsl\html.xsl
-               Docs\Manual\Shared\xsl\htmlhelp.xsl = Docs\Manual\Shared\xsl\htmlhelp.xsl
                Installer\InnoSetup\modpath.is6.iss = Installer\InnoSetup\modpath.is6.iss
                Installer\InnoSetup\modpath.iss = Installer\InnoSetup\modpath.iss
                Installer\InnoSetup\modpathNonAdmin.iss = Installer\InnoSetup\modpathNonAdmin.iss
@@ -273,6 +270,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ColorSchemes", "ColorSchemes", "{92E79FEF-3EDE-4F79-97BA-CD6F3E1BE58B}"
        ProjectSection(SolutionItems) = preProject
                ColorSchemes\Default.ini = ColorSchemes\Default.ini
+               ColorSchemes\Midnight.ini = ColorSchemes\Midnight.ini
                ColorSchemes\Modern.ini = ColorSchemes\Modern.ini
                ColorSchemes\Solarized Dark.ini = ColorSchemes\Solarized Dark.ini
                ColorSchemes\Solarized Light.ini = ColorSchemes\Solarized Light.ini
@@ -410,6 +408,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{14C9
                ShellExtension\UnregisterWinMergeContextMenuPackage.bat = ShellExtension\UnregisterWinMergeContextMenuPackage.bat
        EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java", "Java", "{235DAFAF-0236-4F18-B864-FEE6510B489D}"
+       ProjectSection(SolutionItems) = preProject
+               Plugins\Commands\Java\java.bat = Plugins\Commands\Java\java.bat
+               Plugins\Commands\Java\LICENSE.txt = Plugins\Commands\Java\LICENSE.txt
+               Plugins\Commands\Java\URL.txt = Plugins\Commands\Java\URL.txt
+       EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "md4c", "md4c", "{CC5DD45F-61D5-4A43-BBF5-E84509F3F3B6}"
+       ProjectSection(SolutionItems) = preProject
+               Plugins\Commands\md4c\md2html.bat = Plugins\Commands\md4c\md2html.bat
+       EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlantUML", "PlantUML", "{460A3D0C-F937-4E82-9F70-C79E158809B4}"
+       ProjectSection(SolutionItems) = preProject
+               Plugins\Commands\PlantUML\license.txt = Plugins\Commands\PlantUML\license.txt
+               Plugins\Commands\PlantUML\plantuml.bat = Plugins\Commands\PlantUML\plantuml.bat
+               Plugins\Commands\PlantUML\URL.txt = Plugins\Commands\PlantUML\URL.txt
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SharedMSBuildProjectFiles) = preSolution
                Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4
@@ -535,13 +552,9 @@ Global
                {9E211743-85FE-4977-82F3-4F04B40C912D}.Release|x86.ActiveCfg = Release|Win32
                {9E211743-85FE-4977-82F3-4F04B40C912D}.Release|x86.Build.0 = Release|Win32
                {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|ARM.ActiveCfg = Debug|ARM
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|ARM.Build.0 = Debug|ARM
                {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|ARM64.ActiveCfg = Debug|ARM64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|ARM64.Build.0 = Debug|ARM64
                {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.ActiveCfg = Debug|x64
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.Build.0 = Debug|x64
                {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x86.ActiveCfg = Debug|Win32
-               {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x86.Build.0 = Debug|Win32
                {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x86.Deploy.0 = Debug|Win32
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug|ARM.ActiveCfg = Debug|ARM
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug|ARM.Build.0 = Debug|ARM
@@ -560,7 +573,6 @@ Global
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release|x86.ActiveCfg = Release|Win32
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release|x86.Build.0 = Release|Win32
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|ARM.ActiveCfg = Debug|ARM
-               {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|ARM.Build.0 = Debug|ARM
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|ARM64.ActiveCfg = Debug|ARM64
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x64.ActiveCfg = Debug|x64
                {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x86.ActiveCfg = Debug|Win32
@@ -581,7 +593,6 @@ Global
                {0A3727B1-51E7-4702-AD0C-8AEE317EA510}.Release|x86.ActiveCfg = Release|Win32
                {0A3727B1-51E7-4702-AD0C-8AEE317EA510}.Release|x86.Build.0 = Release|Win32
                {0A3727B1-51E7-4702-AD0C-8AEE317EA510}.Test|ARM.ActiveCfg = Debug|ARM
-               {0A3727B1-51E7-4702-AD0C-8AEE317EA510}.Test|ARM.Build.0 = Debug|ARM
                {0A3727B1-51E7-4702-AD0C-8AEE317EA510}.Test|ARM64.ActiveCfg = Debug|ARM64
                {0A3727B1-51E7-4702-AD0C-8AEE317EA510}.Test|x64.ActiveCfg = Debug|x64
                {0A3727B1-51E7-4702-AD0C-8AEE317EA510}.Test|x86.ActiveCfg = Debug|Win32
@@ -602,7 +613,6 @@ Global
                {6877DE2D-4ABA-49B0-858D-7D9A9F92945C}.Release|x86.ActiveCfg = Release|Win32
                {6877DE2D-4ABA-49B0-858D-7D9A9F92945C}.Release|x86.Build.0 = Release|Win32
                {6877DE2D-4ABA-49B0-858D-7D9A9F92945C}.Test|ARM.ActiveCfg = Debug|ARM
-               {6877DE2D-4ABA-49B0-858D-7D9A9F92945C}.Test|ARM.Build.0 = Debug|ARM
                {6877DE2D-4ABA-49B0-858D-7D9A9F92945C}.Test|ARM64.ActiveCfg = Debug|ARM64
                {6877DE2D-4ABA-49B0-858D-7D9A9F92945C}.Test|x64.ActiveCfg = Debug|x64
                {6877DE2D-4ABA-49B0-858D-7D9A9F92945C}.Test|x86.ActiveCfg = Debug|Win32
@@ -623,7 +633,6 @@ Global
                {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release|x86.ActiveCfg = Release|Win32
                {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Release|x86.Build.0 = Release|Win32
                {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Test|ARM.ActiveCfg = Debug|ARM
-               {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Test|ARM.Build.0 = Debug|ARM
                {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Test|ARM64.ActiveCfg = Debug|ARM64
                {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Test|x64.ActiveCfg = Debug|x64
                {BD0C5FE1-8457-49C2-8801-0C99A6E6CC03}.Test|x86.ActiveCfg = Debug|Win32
@@ -644,7 +653,6 @@ Global
                {0EE652FF-27B0-4F91-BAD6-2931BC072762}.Release|x86.ActiveCfg = Release|Win32
                {0EE652FF-27B0-4F91-BAD6-2931BC072762}.Release|x86.Build.0 = Release|Win32
                {0EE652FF-27B0-4F91-BAD6-2931BC072762}.Test|ARM.ActiveCfg = Debug|ARM
-               {0EE652FF-27B0-4F91-BAD6-2931BC072762}.Test|ARM.Build.0 = Debug|ARM
                {0EE652FF-27B0-4F91-BAD6-2931BC072762}.Test|ARM64.ActiveCfg = Debug|ARM64
                {0EE652FF-27B0-4F91-BAD6-2931BC072762}.Test|x64.ActiveCfg = Debug|x64
                {0EE652FF-27B0-4F91-BAD6-2931BC072762}.Test|x86.ActiveCfg = Debug|Win32
@@ -665,7 +673,6 @@ Global
                {78ABD31C-70A2-4608-8A3D-506E1E2C0AFE}.Release|x86.ActiveCfg = Release|Win32
                {78ABD31C-70A2-4608-8A3D-506E1E2C0AFE}.Release|x86.Build.0 = Release|Win32
                {78ABD31C-70A2-4608-8A3D-506E1E2C0AFE}.Test|ARM.ActiveCfg = Debug|ARM
-               {78ABD31C-70A2-4608-8A3D-506E1E2C0AFE}.Test|ARM.Build.0 = Debug|ARM
                {78ABD31C-70A2-4608-8A3D-506E1E2C0AFE}.Test|ARM64.ActiveCfg = Debug|ARM64
                {78ABD31C-70A2-4608-8A3D-506E1E2C0AFE}.Test|x64.ActiveCfg = Debug|x64
                {78ABD31C-70A2-4608-8A3D-506E1E2C0AFE}.Test|x86.ActiveCfg = Debug|Win32
@@ -686,7 +693,6 @@ Global
                {A644FBA4-D76E-4500-B4B7-04D7A245359A}.Release|x86.ActiveCfg = Release|Win32
                {A644FBA4-D76E-4500-B4B7-04D7A245359A}.Release|x86.Build.0 = Release|Win32
                {A644FBA4-D76E-4500-B4B7-04D7A245359A}.Test|ARM.ActiveCfg = Debug|ARM
-               {A644FBA4-D76E-4500-B4B7-04D7A245359A}.Test|ARM.Build.0 = Debug|ARM
                {A644FBA4-D76E-4500-B4B7-04D7A245359A}.Test|ARM64.ActiveCfg = Debug|ARM64
                {A644FBA4-D76E-4500-B4B7-04D7A245359A}.Test|x64.ActiveCfg = Debug|x64
                {A644FBA4-D76E-4500-B4B7-04D7A245359A}.Test|x86.ActiveCfg = Debug|Win32
@@ -707,7 +713,6 @@ Global
                {32000226-A923-40A5-B60A-6C4402869C43}.Release|x86.ActiveCfg = Release|Win32
                {32000226-A923-40A5-B60A-6C4402869C43}.Release|x86.Build.0 = Release|Win32
                {32000226-A923-40A5-B60A-6C4402869C43}.Test|ARM.ActiveCfg = Debug|ARM
-               {32000226-A923-40A5-B60A-6C4402869C43}.Test|ARM.Build.0 = Debug|ARM
                {32000226-A923-40A5-B60A-6C4402869C43}.Test|ARM64.ActiveCfg = Debug|ARM64
                {32000226-A923-40A5-B60A-6C4402869C43}.Test|x64.ActiveCfg = Debug|x64
                {32000226-A923-40A5-B60A-6C4402869C43}.Test|x86.ActiveCfg = Debug|Win32
@@ -728,7 +733,6 @@ Global
                {098B241D-63AF-4683-BAF8-6DA57FD8FE75}.Release|x86.ActiveCfg = Release|Win32
                {098B241D-63AF-4683-BAF8-6DA57FD8FE75}.Release|x86.Build.0 = Release|Win32
                {098B241D-63AF-4683-BAF8-6DA57FD8FE75}.Test|ARM.ActiveCfg = Debug|ARM
-               {098B241D-63AF-4683-BAF8-6DA57FD8FE75}.Test|ARM.Build.0 = Debug|ARM
                {098B241D-63AF-4683-BAF8-6DA57FD8FE75}.Test|ARM64.ActiveCfg = Debug|ARM64
                {098B241D-63AF-4683-BAF8-6DA57FD8FE75}.Test|x64.ActiveCfg = Debug|x64
                {098B241D-63AF-4683-BAF8-6DA57FD8FE75}.Test|x86.ActiveCfg = Debug|Win32
@@ -749,7 +753,6 @@ Global
                {AA88B46E-B2E2-4B03-8CD5-1E9D60DB6AB2}.Release|x86.ActiveCfg = Release|Win32
                {AA88B46E-B2E2-4B03-8CD5-1E9D60DB6AB2}.Release|x86.Build.0 = Release|Win32
                {AA88B46E-B2E2-4B03-8CD5-1E9D60DB6AB2}.Test|ARM.ActiveCfg = Debug|ARM
-               {AA88B46E-B2E2-4B03-8CD5-1E9D60DB6AB2}.Test|ARM.Build.0 = Debug|ARM
                {AA88B46E-B2E2-4B03-8CD5-1E9D60DB6AB2}.Test|ARM64.ActiveCfg = Debug|ARM64
                {AA88B46E-B2E2-4B03-8CD5-1E9D60DB6AB2}.Test|x64.ActiveCfg = Debug|x64
                {AA88B46E-B2E2-4B03-8CD5-1E9D60DB6AB2}.Test|x86.ActiveCfg = Debug|Win32
@@ -770,7 +773,6 @@ Global
                {A948A08A-3AF4-4860-8D13-8C425E56806F}.Release|x86.ActiveCfg = Release|Win32
                {A948A08A-3AF4-4860-8D13-8C425E56806F}.Release|x86.Build.0 = Release|Win32
                {A948A08A-3AF4-4860-8D13-8C425E56806F}.Test|ARM.ActiveCfg = Debug|ARM
-               {A948A08A-3AF4-4860-8D13-8C425E56806F}.Test|ARM.Build.0 = Debug|ARM
                {A948A08A-3AF4-4860-8D13-8C425E56806F}.Test|ARM64.ActiveCfg = Debug|ARM64
                {A948A08A-3AF4-4860-8D13-8C425E56806F}.Test|x64.ActiveCfg = Debug|x64
                {A948A08A-3AF4-4860-8D13-8C425E56806F}.Test|x86.ActiveCfg = Debug|Win32
@@ -791,7 +793,6 @@ Global
                {4A3F0C35-6B6D-44B3-84FD-7E2168398361}.Release|x86.ActiveCfg = Release|Win32
                {4A3F0C35-6B6D-44B3-84FD-7E2168398361}.Release|x86.Build.0 = Release|Win32
                {4A3F0C35-6B6D-44B3-84FD-7E2168398361}.Test|ARM.ActiveCfg = Debug|ARM
-               {4A3F0C35-6B6D-44B3-84FD-7E2168398361}.Test|ARM.Build.0 = Debug|ARM
                {4A3F0C35-6B6D-44B3-84FD-7E2168398361}.Test|ARM64.ActiveCfg = Debug|ARM64
                {4A3F0C35-6B6D-44B3-84FD-7E2168398361}.Test|x64.ActiveCfg = Debug|x64
                {4A3F0C35-6B6D-44B3-84FD-7E2168398361}.Test|x86.ActiveCfg = Debug|Win32
@@ -812,7 +813,6 @@ Global
                {76A538A1-9D2C-49CB-AE9F-72548CE37F88}.Release|x86.ActiveCfg = Release|Win32
                {76A538A1-9D2C-49CB-AE9F-72548CE37F88}.Release|x86.Build.0 = Release|Win32
                {76A538A1-9D2C-49CB-AE9F-72548CE37F88}.Test|ARM.ActiveCfg = Debug|ARM
-               {76A538A1-9D2C-49CB-AE9F-72548CE37F88}.Test|ARM.Build.0 = Debug|ARM
                {76A538A1-9D2C-49CB-AE9F-72548CE37F88}.Test|ARM64.ActiveCfg = Debug|ARM64
                {76A538A1-9D2C-49CB-AE9F-72548CE37F88}.Test|x64.ActiveCfg = Debug|x64
                {76A538A1-9D2C-49CB-AE9F-72548CE37F88}.Test|x86.ActiveCfg = Debug|Win32
@@ -860,7 +860,6 @@ Global
                {36365C8C-04A0-4892-9B83-AD6E05D50D67}.Release|x86.ActiveCfg = Release|Win32
                {36365C8C-04A0-4892-9B83-AD6E05D50D67}.Release|x86.Build.0 = Release|Win32
                {36365C8C-04A0-4892-9B83-AD6E05D50D67}.Test|ARM.ActiveCfg = Debug|ARM
-               {36365C8C-04A0-4892-9B83-AD6E05D50D67}.Test|ARM.Build.0 = Debug|ARM
                {36365C8C-04A0-4892-9B83-AD6E05D50D67}.Test|ARM64.ActiveCfg = Debug|ARM64
                {36365C8C-04A0-4892-9B83-AD6E05D50D67}.Test|x64.ActiveCfg = Debug|x64
                {36365C8C-04A0-4892-9B83-AD6E05D50D67}.Test|x86.ActiveCfg = Debug|Win32
@@ -881,7 +880,6 @@ Global
                {9E219DF2-315D-478E-8A07-8960C377CE1E}.Release|x86.ActiveCfg = Release|Win32
                {9E219DF2-315D-478E-8A07-8960C377CE1E}.Release|x86.Build.0 = Release|Win32
                {9E219DF2-315D-478E-8A07-8960C377CE1E}.Test|ARM.ActiveCfg = Debug|ARM
-               {9E219DF2-315D-478E-8A07-8960C377CE1E}.Test|ARM.Build.0 = Debug|ARM
                {9E219DF2-315D-478E-8A07-8960C377CE1E}.Test|ARM64.ActiveCfg = Debug|ARM64
                {9E219DF2-315D-478E-8A07-8960C377CE1E}.Test|x64.ActiveCfg = Debug|x64
                {9E219DF2-315D-478E-8A07-8960C377CE1E}.Test|x86.ActiveCfg = Debug|Win32
@@ -902,7 +900,6 @@ Global
                {5E1D4E5F-E10C-4BA3-B663-F33014FD21D9}.Release|x86.ActiveCfg = Release|Win32
                {5E1D4E5F-E10C-4BA3-B663-F33014FD21D9}.Release|x86.Build.0 = Release|Win32
                {5E1D4E5F-E10C-4BA3-B663-F33014FD21D9}.Test|ARM.ActiveCfg = Debug|ARM
-               {5E1D4E5F-E10C-4BA3-B663-F33014FD21D9}.Test|ARM.Build.0 = Debug|ARM
                {5E1D4E5F-E10C-4BA3-B663-F33014FD21D9}.Test|ARM64.ActiveCfg = Debug|ARM64
                {5E1D4E5F-E10C-4BA3-B663-F33014FD21D9}.Test|x64.ActiveCfg = Debug|x64
                {5E1D4E5F-E10C-4BA3-B663-F33014FD21D9}.Test|x86.ActiveCfg = Debug|Win32
@@ -923,7 +920,6 @@ Global
                {244455E0-5F25-4451-9540-F317883E52A8}.Release|x86.ActiveCfg = Release|Win32
                {244455E0-5F25-4451-9540-F317883E52A8}.Release|x86.Build.0 = Release|Win32
                {244455E0-5F25-4451-9540-F317883E52A8}.Test|ARM.ActiveCfg = Debug|ARM
-               {244455E0-5F25-4451-9540-F317883E52A8}.Test|ARM.Build.0 = Debug|ARM
                {244455E0-5F25-4451-9540-F317883E52A8}.Test|ARM64.ActiveCfg = Debug|ARM64
                {244455E0-5F25-4451-9540-F317883E52A8}.Test|x64.ActiveCfg = Debug|x64
                {244455E0-5F25-4451-9540-F317883E52A8}.Test|x86.ActiveCfg = Debug|Win32
@@ -944,7 +940,6 @@ Global
                {E3536C28-A7F1-4B53-8E52-7D2232F9E098}.Release|x86.ActiveCfg = Release|Win32
                {E3536C28-A7F1-4B53-8E52-7D2232F9E098}.Release|x86.Build.0 = Release|Win32
                {E3536C28-A7F1-4B53-8E52-7D2232F9E098}.Test|ARM.ActiveCfg = Debug|ARM
-               {E3536C28-A7F1-4B53-8E52-7D2232F9E098}.Test|ARM.Build.0 = Debug|ARM
                {E3536C28-A7F1-4B53-8E52-7D2232F9E098}.Test|ARM64.ActiveCfg = Debug|ARM64
                {E3536C28-A7F1-4B53-8E52-7D2232F9E098}.Test|x64.ActiveCfg = Debug|x64
                {E3536C28-A7F1-4B53-8E52-7D2232F9E098}.Test|x86.ActiveCfg = Debug|Win32
@@ -965,7 +960,6 @@ Global
                {7DB10B50-CE00-4D7A-B322-6824F05D2FCB}.Release|x86.ActiveCfg = Release|Win32
                {7DB10B50-CE00-4D7A-B322-6824F05D2FCB}.Release|x86.Build.0 = Release|Win32
                {7DB10B50-CE00-4D7A-B322-6824F05D2FCB}.Test|ARM.ActiveCfg = Debug|ARM
-               {7DB10B50-CE00-4D7A-B322-6824F05D2FCB}.Test|ARM.Build.0 = Debug|ARM
                {7DB10B50-CE00-4D7A-B322-6824F05D2FCB}.Test|ARM64.ActiveCfg = Debug|ARM64
                {7DB10B50-CE00-4D7A-B322-6824F05D2FCB}.Test|x64.ActiveCfg = Debug|x64
                {7DB10B50-CE00-4D7A-B322-6824F05D2FCB}.Test|x86.ActiveCfg = Debug|Win32
@@ -986,7 +980,6 @@ Global
                {07F662C1-1323-42AB-B6AF-FBFD34A7437A}.Release|x86.ActiveCfg = Release|Win32
                {07F662C1-1323-42AB-B6AF-FBFD34A7437A}.Release|x86.Build.0 = Release|Win32
                {07F662C1-1323-42AB-B6AF-FBFD34A7437A}.Test|ARM.ActiveCfg = Debug|ARM
-               {07F662C1-1323-42AB-B6AF-FBFD34A7437A}.Test|ARM.Build.0 = Debug|ARM
                {07F662C1-1323-42AB-B6AF-FBFD34A7437A}.Test|ARM64.ActiveCfg = Debug|ARM64
                {07F662C1-1323-42AB-B6AF-FBFD34A7437A}.Test|x64.ActiveCfg = Debug|x64
                {07F662C1-1323-42AB-B6AF-FBFD34A7437A}.Test|x86.ActiveCfg = Debug|Win32
@@ -1007,7 +1000,6 @@ Global
                {EC085CBD-E9C3-477F-9A97-CB9D5DA30E27}.Release|x86.ActiveCfg = Release|Win32
                {EC085CBD-E9C3-477F-9A97-CB9D5DA30E27}.Release|x86.Build.0 = Release|Win32
                {EC085CBD-E9C3-477F-9A97-CB9D5DA30E27}.Test|ARM.ActiveCfg = Debug|ARM
-               {EC085CBD-E9C3-477F-9A97-CB9D5DA30E27}.Test|ARM.Build.0 = Debug|ARM
                {EC085CBD-E9C3-477F-9A97-CB9D5DA30E27}.Test|ARM64.ActiveCfg = Debug|ARM64
                {EC085CBD-E9C3-477F-9A97-CB9D5DA30E27}.Test|x64.ActiveCfg = Debug|x64
                {EC085CBD-E9C3-477F-9A97-CB9D5DA30E27}.Test|x86.ActiveCfg = Debug|Win32
@@ -1028,7 +1020,6 @@ Global
                {097D9F6C-FD0E-4CBC-9676-009012AAECA8}.Release|x86.ActiveCfg = Release|Win32
                {097D9F6C-FD0E-4CBC-9676-009012AAECA8}.Release|x86.Build.0 = Release|Win32
                {097D9F6C-FD0E-4CBC-9676-009012AAECA8}.Test|ARM.ActiveCfg = Debug|ARM
-               {097D9F6C-FD0E-4CBC-9676-009012AAECA8}.Test|ARM.Build.0 = Debug|ARM
                {097D9F6C-FD0E-4CBC-9676-009012AAECA8}.Test|ARM64.ActiveCfg = Debug|ARM64
                {097D9F6C-FD0E-4CBC-9676-009012AAECA8}.Test|x64.ActiveCfg = Debug|x64
                {097D9F6C-FD0E-4CBC-9676-009012AAECA8}.Test|x86.ActiveCfg = Debug|Win32
@@ -1049,7 +1040,6 @@ Global
                {17A4874B-0606-4687-90B6-F91F8CB3B8AF}.Release|x86.ActiveCfg = Release|Win32
                {17A4874B-0606-4687-90B6-F91F8CB3B8AF}.Release|x86.Build.0 = Release|Win32
                {17A4874B-0606-4687-90B6-F91F8CB3B8AF}.Test|ARM.ActiveCfg = Debug|ARM
-               {17A4874B-0606-4687-90B6-F91F8CB3B8AF}.Test|ARM.Build.0 = Debug|ARM
                {17A4874B-0606-4687-90B6-F91F8CB3B8AF}.Test|ARM64.ActiveCfg = Debug|ARM64
                {17A4874B-0606-4687-90B6-F91F8CB3B8AF}.Test|x64.ActiveCfg = Debug|x64
                {17A4874B-0606-4687-90B6-F91F8CB3B8AF}.Test|x86.ActiveCfg = Debug|Win32
@@ -1070,7 +1060,6 @@ Global
                {33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|x86.ActiveCfg = Release|Win32
                {33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Release|x86.Build.0 = Release|Win32
                {33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Test|ARM.ActiveCfg = Debug|ARM
-               {33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Test|ARM.Build.0 = Debug|ARM
                {33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Test|ARM64.ActiveCfg = Debug|ARM64
                {33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Test|x64.ActiveCfg = Debug|x64
                {33134F61-C1AD-4B6F-9CEA-503A9F140C52}.Test|x86.ActiveCfg = Debug|Win32
@@ -1091,7 +1080,6 @@ Global
                {94F36908-A4E2-4533-939D-64FF6EADA5A1}.Release|x86.ActiveCfg = Release|Win32
                {94F36908-A4E2-4533-939D-64FF6EADA5A1}.Release|x86.Build.0 = Release|Win32
                {94F36908-A4E2-4533-939D-64FF6EADA5A1}.Test|ARM.ActiveCfg = Debug|ARM
-               {94F36908-A4E2-4533-939D-64FF6EADA5A1}.Test|ARM.Build.0 = Debug|ARM
                {94F36908-A4E2-4533-939D-64FF6EADA5A1}.Test|ARM64.ActiveCfg = Debug|ARM64
                {94F36908-A4E2-4533-939D-64FF6EADA5A1}.Test|x64.ActiveCfg = Debug|x64
                {94F36908-A4E2-4533-939D-64FF6EADA5A1}.Test|x86.ActiveCfg = Debug|Win32
@@ -1112,7 +1100,6 @@ Global
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}.Release|x86.ActiveCfg = Release|Win32
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}.Release|x86.Build.0 = Release|Win32
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}.Test|ARM.ActiveCfg = Debug|ARM
-               {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}.Test|ARM.Build.0 = Debug|ARM
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}.Test|ARM64.ActiveCfg = Debug|ARM64
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}.Test|x64.ActiveCfg = Debug|x64
                {C9101B3C-4CFE-4D3E-9708-5C0F55AC909A}.Test|x86.ActiveCfg = Debug|Win32
@@ -1133,7 +1120,6 @@ Global
                {49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}.Release|x86.ActiveCfg = Release|Win32
                {49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}.Release|x86.Build.0 = Release|Win32
                {49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}.Test|ARM.ActiveCfg = Debug|ARM
-               {49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}.Test|ARM.Build.0 = Debug|ARM
                {49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}.Test|ARM64.ActiveCfg = Debug|ARM64
                {49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}.Test|x64.ActiveCfg = Debug|x64
                {49A7104F-08CD-48B1-99E6-6A7C3FFB0EEC}.Test|x86.ActiveCfg = Debug|Win32
@@ -1154,7 +1140,6 @@ Global
                {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Release|x86.ActiveCfg = Release|Win32
                {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Release|x86.Build.0 = Release|Win32
                {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Test|ARM.ActiveCfg = Debug|ARM
-               {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Test|ARM.Build.0 = Debug|ARM
                {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Test|ARM64.ActiveCfg = Debug|ARM64
                {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Test|x64.ActiveCfg = Debug|x64
                {C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}.Test|x86.ActiveCfg = Debug|Win32
@@ -1175,7 +1160,6 @@ Global
                {139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|x86.ActiveCfg = Release|Win32
                {139D8239-98B4-4B29-A199-B27CDB8B4708}.Release|x86.Build.0 = Release|Win32
                {139D8239-98B4-4B29-A199-B27CDB8B4708}.Test|ARM.ActiveCfg = Debug|ARM
-               {139D8239-98B4-4B29-A199-B27CDB8B4708}.Test|ARM.Build.0 = Debug|ARM
                {139D8239-98B4-4B29-A199-B27CDB8B4708}.Test|ARM64.ActiveCfg = Debug|ARM64
                {139D8239-98B4-4B29-A199-B27CDB8B4708}.Test|x64.ActiveCfg = Debug|x64
                {139D8239-98B4-4B29-A199-B27CDB8B4708}.Test|x86.ActiveCfg = Debug|Win32
@@ -1196,7 +1180,6 @@ Global
                {488796F1-8E07-40FE-A006-B6252E958746}.Release|x86.ActiveCfg = Release|Win32
                {488796F1-8E07-40FE-A006-B6252E958746}.Release|x86.Build.0 = Release|Win32
                {488796F1-8E07-40FE-A006-B6252E958746}.Test|ARM.ActiveCfg = Debug|ARM
-               {488796F1-8E07-40FE-A006-B6252E958746}.Test|ARM.Build.0 = Debug|ARM
                {488796F1-8E07-40FE-A006-B6252E958746}.Test|ARM64.ActiveCfg = Debug|ARM64
                {488796F1-8E07-40FE-A006-B6252E958746}.Test|x64.ActiveCfg = Debug|x64
                {488796F1-8E07-40FE-A006-B6252E958746}.Test|x86.ActiveCfg = Debug|Win32
@@ -1215,7 +1198,6 @@ Global
                {D358EAE3-AE53-4292-9384-6DB97E8B8D40}.Release|x86.ActiveCfg = Release|Win32
                {D358EAE3-AE53-4292-9384-6DB97E8B8D40}.Release|x86.Build.0 = Release|Win32
                {D358EAE3-AE53-4292-9384-6DB97E8B8D40}.Test|ARM.ActiveCfg = Debug|ARM
-               {D358EAE3-AE53-4292-9384-6DB97E8B8D40}.Test|ARM.Build.0 = Debug|ARM
                {D358EAE3-AE53-4292-9384-6DB97E8B8D40}.Test|ARM64.ActiveCfg = Debug|ARM64
                {D358EAE3-AE53-4292-9384-6DB97E8B8D40}.Test|x64.ActiveCfg = Debug|x64
                {D358EAE3-AE53-4292-9384-6DB97E8B8D40}.Test|x86.ActiveCfg = Debug|Win32
@@ -1236,7 +1218,6 @@ Global
                {2710A368-ED56-4FB1-80C3-D93BA6483710}.Release|x86.ActiveCfg = Release|Win32
                {2710A368-ED56-4FB1-80C3-D93BA6483710}.Release|x86.Build.0 = Release|Win32
                {2710A368-ED56-4FB1-80C3-D93BA6483710}.Test|ARM.ActiveCfg = Debug|ARM
-               {2710A368-ED56-4FB1-80C3-D93BA6483710}.Test|ARM.Build.0 = Debug|ARM
                {2710A368-ED56-4FB1-80C3-D93BA6483710}.Test|ARM64.ActiveCfg = Debug|ARM64
                {2710A368-ED56-4FB1-80C3-D93BA6483710}.Test|x64.ActiveCfg = Debug|x64
                {2710A368-ED56-4FB1-80C3-D93BA6483710}.Test|x86.ActiveCfg = Debug|Win32
@@ -1257,7 +1238,6 @@ Global
                {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.ActiveCfg = Release|Win32
                {FFB6D02A-782B-48EF-8398-7F8862859616}.Release|x86.Build.0 = Release|Win32
                {FFB6D02A-782B-48EF-8398-7F8862859616}.Test|ARM.ActiveCfg = Debug|ARM
-               {FFB6D02A-782B-48EF-8398-7F8862859616}.Test|ARM.Build.0 = Debug|ARM
                {FFB6D02A-782B-48EF-8398-7F8862859616}.Test|ARM64.ActiveCfg = Debug|ARM64
                {FFB6D02A-782B-48EF-8398-7F8862859616}.Test|x64.ActiveCfg = Debug|x64
                {FFB6D02A-782B-48EF-8398-7F8862859616}.Test|x86.ActiveCfg = Debug|Win32
@@ -1278,7 +1258,6 @@ Global
                {AB827C6B-5116-408F-B453-E2075E9B73B4}.Release|x86.ActiveCfg = Release|Win32
                {AB827C6B-5116-408F-B453-E2075E9B73B4}.Release|x86.Build.0 = Release|Win32
                {AB827C6B-5116-408F-B453-E2075E9B73B4}.Test|ARM.ActiveCfg = Debug|ARM
-               {AB827C6B-5116-408F-B453-E2075E9B73B4}.Test|ARM.Build.0 = Debug|ARM
                {AB827C6B-5116-408F-B453-E2075E9B73B4}.Test|ARM64.ActiveCfg = Debug|ARM64
                {AB827C6B-5116-408F-B453-E2075E9B73B4}.Test|x64.ActiveCfg = Debug|x64
                {AB827C6B-5116-408F-B453-E2075E9B73B4}.Test|x86.ActiveCfg = Debug|Win32
@@ -1299,32 +1278,25 @@ Global
                {E11617CA-2D87-4571-B22A-48C922D9A0F9}.Release|x86.ActiveCfg = Release|Win32
                {E11617CA-2D87-4571-B22A-48C922D9A0F9}.Release|x86.Build.0 = Release|Win32
                {E11617CA-2D87-4571-B22A-48C922D9A0F9}.Test|ARM.ActiveCfg = Debug|ARM
-               {E11617CA-2D87-4571-B22A-48C922D9A0F9}.Test|ARM.Build.0 = Debug|ARM
                {E11617CA-2D87-4571-B22A-48C922D9A0F9}.Test|ARM64.ActiveCfg = Debug|ARM64
                {E11617CA-2D87-4571-B22A-48C922D9A0F9}.Test|x64.ActiveCfg = Release|x64
                {E11617CA-2D87-4571-B22A-48C922D9A0F9}.Test|x86.ActiveCfg = Release|Win32
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|ARM.ActiveCfg = Debug|ARM
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|ARM.Build.0 = Debug|ARM
+               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|ARM.ActiveCfg = Debug|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|ARM64.ActiveCfg = Debug|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|ARM64.Build.0 = Debug|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|x64.ActiveCfg = Debug|x64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|x64.Build.0 = Debug|x64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Debug|x86.ActiveCfg = Debug|x64
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|ARM.ActiveCfg = Release|ARM
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|ARM.Build.0 = Release|ARM
+               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|ARM.ActiveCfg = Release|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|ARM64.ActiveCfg = Release|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|ARM64.Build.0 = Release|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|x64.ActiveCfg = Release|x64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|x64.Build.0 = Release|x64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Release|x86.ActiveCfg = Release|x64
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|ARM.ActiveCfg = Debug|ARM
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|ARM.Build.0 = Debug|ARM
+               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|ARM.ActiveCfg = Debug|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|ARM64.ActiveCfg = Debug|ARM64
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|ARM64.Build.0 = Debug|ARM64
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|x64.ActiveCfg = Debug|x64
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|x64.Build.0 = Debug|x64
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|x86.ActiveCfg = Debug|ARM64
-               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|x86.Build.0 = Debug|ARM64
+               {16746B0C-5840-4ED4-AEDF-1ABB617827FD}.Test|x86.ActiveCfg = Debug|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -1398,6 +1370,9 @@ Global
                {16746B0C-5840-4ED4-AEDF-1ABB617827FD} = {578C2837-33B3-4F33-ABDC-CA588BE05983}
                {F4ED7659-7C4E-4962-B83A-A1F3E1F7B8DE} = {578C2837-33B3-4F33-ABDC-CA588BE05983}
                {14C9D43A-1727-4BEE-B2A2-A6BAED7E7154} = {578C2837-33B3-4F33-ABDC-CA588BE05983}
+               {235DAFAF-0236-4F18-B864-FEE6510B489D} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0}
+               {CC5DD45F-61D5-4A43-BBF5-E84509F3F3B6} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0}
+               {460A3D0C-F937-4E82-9F70-C79E158809B4} = {BB290B2D-F5B9-4552-AE32-9319C03E41C0}
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {CC2E4F75-FADC-4F44-BD62-47A321828081}
About OSDN
Find Software
Develop Software
Help