Skip to content

Commit

Permalink
first steps to supporting VS 2017 (#93), not working yet (at all :-) …
Browse files Browse the repository at this point in the history
…) - note that solution can only be opened with VS2017 by now
  • Loading branch information
csoltenborn committed Jan 4, 2017
1 parent 92becb2 commit 4f8d8aa
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 69 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,6 @@ $RECYCLE.BIN/

*.gta_testdurations
OpenCover/
/GoogleTestAdapter/.vs/GoogleTestAdapter/v15
/GoogleTestAdapter/.vs
/SampleTests/.vs/SampleTests/v15
52 changes: 26 additions & 26 deletions GoogleTestAdapter/GoogleTestAdapter.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,30 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26014.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1F754A4D-BD42-4368-8B90-F3C03F24A2F3}"
ProjectSection(SolutionItems) = preProject
Resources\AllTestSettings.gta.runsettings = Resources\AllTestSettings.gta.runsettings
..\appveyor.yml = ..\appveyor.yml
..\codecov.yml = ..\codecov.yml
..\LICENSE.md = ..\LICENSE.md
..\README.md = ..\README.md
SetVersion.bat = SetVersion.bat
SetVersion.ps1 = SetVersion.ps1
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleTests", "SampleTests", "{1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleTests Solution Items", "SampleTests Solution Items", "{64AF842B-3041-4A46-8A6A-E947284E8454}"
ProjectSection(SolutionItems) = preProject
..\SampleTests\No.runsettings = ..\SampleTests\No.runsettings
..\SampleTests\NonDeterministic.runsettings = ..\SampleTests\NonDeterministic.runsettings
..\SampleTests\SampleTests.gta.runsettings = ..\SampleTests\SampleTests.gta.runsettings
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsPackage", "VsPackage\VsPackage.csproj", "{E6276CAD-E4C3-4B25-876A-65B265EBFF1A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAdapter", "TestAdapter\TestAdapter.csproj", "{44C04E51-D543-4155-A57E-BBEB73D3F8E5}"
Expand All @@ -16,17 +38,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Tests", "Core.Tests\Co
{FDC95D92-5E1E-4BDF-AA35-181851FCE755} = {FDC95D92-5E1E-4BDF-AA35-181851FCE755}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1F754A4D-BD42-4368-8B90-F3C03F24A2F3}"
ProjectSection(SolutionItems) = preProject
Resources\AllTestSettings.gta.runsettings = Resources\AllTestSettings.gta.runsettings
..\appveyor.yml = ..\appveyor.yml
..\codecov.yml = ..\codecov.yml
..\LICENSE.md = ..\LICENSE.md
..\README.md = ..\README.md
SetVersion.bat = SetVersion.bat
SetVersion.ps1 = SetVersion.ps1
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiaResolver", "DiaResolver\DiaResolver.csproj", "{FDC95D92-5E1E-4BDF-AA35-181851FCE755}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestAdapter.Tests", "TestAdapter.Tests\TestAdapter.Tests.csproj", "{A3ADB538-F3DF-4C5F-960D-11B6DF66A1A3}"
Expand Down Expand Up @@ -62,17 +73,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsPackage.Tests.Unit", "VsP
{12952B24-C70B-4A26-839A-EE4183BE8CC0} = {12952B24-C70B-4A26-839A-EE4183BE8CC0}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleTestsBuilder", "SampleTestsBuilder\SampleTestsBuilder.csproj", "{12952B24-C70B-4A26-839A-EE4183BE8CC0}"
ProjectSection(ProjectDependencies) = postProject
{04990B2A-C7B5-40DA-A856-230E1E062FF1} = {04990B2A-C7B5-40DA-A856-230E1E062FF1}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Common", "Tests.Common\Tests.Common.csproj", "{2F0E4458-6C1C-461F-A60A-B731AD97E839}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleTests", "SampleTests", "{1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "..\SampleTests\Tests\Tests.vcxproj", "{04990B2A-C7B5-40DA-A856-230E1E062FF1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LongRunningTests", "..\SampleTests\LongRunningTests\LongRunningTests.vcxproj", "{A5AA0879-9511-420A-9025-1AB87FAB7348}"
Expand All @@ -87,13 +94,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Common.EndToEnd", "Te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.Common.UI", "Tests.Common.UI\Tests.Common.UI.csproj", "{C6AC8E0B-DE31-4F0E-BE9D-837D9A2CA828}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SampleTests Solution Items", "SampleTests Solution Items", "{64AF842B-3041-4A46-8A6A-E947284E8454}"
ProjectSection(SolutionItems) = preProject
..\SampleTests\No.runsettings = ..\SampleTests\No.runsettings
..\SampleTests\NonDeterministic.runsettings = ..\SampleTests\NonDeterministic.runsettings
..\SampleTests\SampleTests.gta.runsettings = ..\SampleTests\SampleTests.gta.runsettings
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -339,6 +339,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1FF56AF6-0ACE-4FE8-B802-4832703EC2DC} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{64AF842B-3041-4A46-8A6A-E947284E8454} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
{B06C696E-E458-490A-AC44-9E4F460DBAFE} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{A3ADB538-F3DF-4C5F-960D-11B6DF66A1A3} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{941BA1B7-2CF4-4D5C-8680-5C73CD6FE197} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
Expand All @@ -347,14 +349,12 @@ Global
{87F26371-0005-4301-9C49-A6DF4F06B81C} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{12952B24-C70B-4A26-839A-EE4183BE8CC0} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
{2F0E4458-6C1C-461F-A60A-B731AD97E839} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{1FF56AF6-0ACE-4FE8-B802-4832703EC2DC} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{04990B2A-C7B5-40DA-A856-230E1E062FF1} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
{A5AA0879-9511-420A-9025-1AB87FAB7348} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
{446DA549-6EEF-4C48-A73C-F35B79C0BDE9} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
{1F2C133F-B7BD-4446-A65C-3F7EF9A22CE0} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
{4A4606CD-6D7B-4F76-8981-46D3C74E18BD} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
{C3F11E93-2EFF-4BB6-ADC9-3B42727E4816} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{C6AC8E0B-DE31-4F0E-BE9D-837D9A2CA828} = {DF889D8C-7879-48EE-811D-7D8D1EEF6F0A}
{64AF842B-3041-4A46-8A6A-E947284E8454} = {1FF56AF6-0ACE-4FE8-B802-4832703EC2DC}
EndGlobalSection
EndGlobal
48 changes: 23 additions & 25 deletions GoogleTestAdapter/VsPackage/VsPackage.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" />
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
<OldToolsVersion>12.0</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<UseCodebase>true</UseCodebase>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -22,13 +27,8 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<UseCodebase>true</UseCodebase>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
Expand Down Expand Up @@ -136,6 +136,7 @@
</None>
<None Include="VsPackage.nuspec">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>
<None Include="VsPackage.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down Expand Up @@ -281,21 +282,18 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DiaResolver\DiaResolver.csproj">
<Project>{fdc95d92-5e1e-4bdf-aa35-181851fce755}</Project>
<Name>DiaResolver</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\TestAdapter\TestAdapter.csproj">
<Project>{44c04e51-d543-4155-a57e-bbeb73d3f8e5}</Project>
<Name>TestAdapter</Name>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
<ProjectReference Include="..\Common\Common.csproj">
<Project>{bc05d210-68cd-47d0-ae8c-0f3168d1be73}</Project>
<Name>Common</Name>
</ProjectReference>
<ProjectReference Include="..\Core\Core.csproj">
<Project>{7f4372da-70e2-48d0-bee2-8043528428d0}</Project>
<Name>Core</Name>
</ProjectReference>
<ProjectReference Include="..\TestAdapter\TestAdapter.csproj">
<Project>{44c04e51-d543-4155-a57e-bbeb73d3f8e5}</Project>
<Name>TestAdapter</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
Expand Down Expand Up @@ -323,16 +321,16 @@
<StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
<StartArguments>/rootsuffix Exp</StartArguments>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>$(SolutionDir)packages\NuGet.CommandLine.3.4.3\tools\nuget pack VsPackage.nuspec -NonInteractive
</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25420\build\Microsoft.VSSDK.BuildTools.targets')" />
<PropertyGroup>
<PostBuildEvent>$(SolutionDir)packages\NuGet.CommandLine.3.4.3\tools\nuget pack VsPackage.nuspec -NonInteractive
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.0.25929-RC2\build\Microsoft.VSSDK.BuildTools.targets')" />
</Project>
2 changes: 1 addition & 1 deletion GoogleTestAdapter/VsPackage/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonMark.NET" version="0.14.0" targetFramework="net45" />
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net45" developmentDependency="true" />
<package id="Microsoft.VSSDK.BuildTools" version="15.0.25929-RC2" targetFramework="net45" developmentDependency="true" />
<package id="NuGet.CommandLine" version="3.4.3" targetFramework="net45" developmentDependency="true" />
<package id="VSSDK.ComponentModelHost" version="11.0.4" targetFramework="net45" />
<package id="VSSDK.ComponentModelHost.11" version="11.0.4" targetFramework="net45" />
Expand Down
12 changes: 8 additions & 4 deletions GoogleTestAdapter/VsPackage/source.extension.vsixmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<Tags>Unit Test, C++, Google Test, GoogleTest, GTest, Test Explorer, Testing</Tags>
</Metadata>
<Installation InstalledByMsi="false">
<InstallationTarget Version="[12.0,14.0]" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0,14.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0,14.0]" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[12.0,14.0]" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[12.0,15.0]" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0,15.0]" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0,15.0]" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[12.0,15.0]" Id="Microsoft.VisualStudio.Ultimate" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,4.6]" />
Expand All @@ -26,4 +26,8 @@
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26004.1,16.0)" DisplayName="Visual Studio core editor" />
<Prerequisite Id="Microsoft.VisualStudio.Component.TestTools.Core" Version="[15.0.25904.2,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
6 changes: 5 additions & 1 deletion SampleTests/CrashingTests/CrashingTests.vcxproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand Down Expand Up @@ -36,23 +36,27 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
6 changes: 5 additions & 1 deletion SampleTests/LibProject/LibProject.vcxproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand Down Expand Up @@ -36,23 +36,27 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
Loading

0 comments on commit 4f8d8aa

Please sign in to comment.