diff --git a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj index 2b6f47d1d..ae8fa98f2 100644 --- a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj +++ b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj @@ -23,7 +23,7 @@ Win32Proj $targetplatformversion$ Application - v141 + v142 Unicode @@ -53,7 +53,6 @@ pch.h Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks $rtdebug$ Level3 @@ -69,7 +68,6 @@ pch.h Disabled X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true EnableFastChecks $rtdebug$ Level3 diff --git a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate index 4f1188b2a..470b68558 100644 --- a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate +++ b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate @@ -26,7 +26,7 @@ - + diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj index 13feddd62..1f21716fe 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -49,15 +49,15 @@ - + CopyIfNewer true - + CopyIfNewer true - + CopyIfNewer true diff --git a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest index bcd9b6f78..82b8c6516 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest +++ b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest @@ -13,10 +13,10 @@ Unit Test, C++, Google Test, GoogleTest, GTest, Test Explorer, Testing - - - - + + + + @@ -28,16 +28,16 @@ - - - + + + - - - + + + NuGet Package Manager diff --git a/GoogleTestAdapter/TestAdapter/Framework/VsVersion.cs b/GoogleTestAdapter/TestAdapter/Framework/VsVersion.cs index f0085cea1..fee9f1515 100644 --- a/GoogleTestAdapter/TestAdapter/Framework/VsVersion.cs +++ b/GoogleTestAdapter/TestAdapter/Framework/VsVersion.cs @@ -16,7 +16,7 @@ namespace GoogleTestAdapter.TestAdapter.Framework [SuppressMessage("ReSharper", "InconsistentNaming")] public enum VsVersion { - Unknown = -1, VS2012 = 0, VS2012_1 = 11, VS2013 = 12, VS2015 = 14, VS2017 = 15 + Unknown = -1, VS2012 = 0, VS2012_1 = 11, VS2013 = 12, VS2015 = 14, VS2017 = 15, VS2019 = 16 } public static class VsVersionExtensions @@ -36,6 +36,8 @@ public static int Year(this VsVersion version) return 2015; case VsVersion.VS2017: return 2017; + case VsVersion.VS2019: + return 2019; default: throw new InvalidOperationException(); } diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj index ed3a341f3..67f7c2a00 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj +++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj @@ -44,6 +44,7 @@ $(FlavoredTargetFrameworkVersion) true false + False true @@ -70,7 +71,6 @@ prompt 4 true - False diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index f8a363a0c..e86c8570a 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -126,6 +126,7 @@ function Add-Signing { ) $xml = [xml](Get-Content "$Directory\$ProjectName.vcxproj") + $ProjectNameDebug = -join("$ProjectName", "d") $MicroBuildProps = $xml.CreateElement("Import", "http://schemas.microsoft.com/developer/msbuild/2003") $MicroBuildProps.SetAttribute("Project", "$PSScriptRoot\..\NuGetPackages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props") @@ -141,16 +142,26 @@ function Add-Signing { $RealSignGroup.AppendChild($DelaySign) | Out-Null $FileSignGroup = $xml.CreateElement("ItemGroup", "http://schemas.microsoft.com/developer/msbuild/2003") - $FilesToSign = $xml.CreateElement("FilesToSign", "http://schemas.microsoft.com/developer/msbuild/2003") - $FilesToSign.SetAttribute("Include", "`$(OutDir)\$ProjectName.dll") - $FilesToSign.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll'") - $Authenticode = $xml.CreateElement("Authenticode", "http://schemas.microsoft.com/developer/msbuild/2003") - $Authenticode.set_InnerXML("Microsoft") - $StrongName = $xml.CreateElement("StrongName", "http://schemas.microsoft.com/developer/msbuild/2003") - $StrongName.set_InnerXML("StrongName") - $FilesToSign.AppendChild($Authenticode) | Out-Null - $FilesToSign.AppendChild($StrongName) | Out-Null - $FileSignGroup.AppendChild($FilesToSign) | Out-Null + $FilesToSignRel = $xml.CreateElement("FilesToSign", "http://schemas.microsoft.com/developer/msbuild/2003") + $FilesToSignRel.SetAttribute("Include", "`$(OutDir)\$ProjectName.dll") + $FilesToSignRel.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll' and '`$(Configuration)' == 'RelWithDebInfo'") + $AuthenticodeRel = $xml.CreateElement("Authenticode", "http://schemas.microsoft.com/developer/msbuild/2003") + $AuthenticodeRel.set_InnerXML("Microsoft") + $StrongNameRel = $xml.CreateElement("StrongName", "http://schemas.microsoft.com/developer/msbuild/2003") + $StrongNameRel.set_InnerXML("StrongName") + $FilesToSignRel.AppendChild($AuthenticodeRel) | Out-Null + $FilesToSignRel.AppendChild($StrongNameRel) | Out-Null + $FileSignGroup.AppendChild($FilesToSignRel) | Out-Null + $FilesToSignDebug = $xml.CreateElement("FilesToSign", "http://schemas.microsoft.com/developer/msbuild/2003") + $FilesToSignDebug.SetAttribute("Include", "`$(OutDir)\$ProjectNameDebug.dll") + $FilesToSignDebug.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll' and '`$(Configuration)' == 'Debug'") + $AuthenticodeDebug = $xml.CreateElement("Authenticode", "http://schemas.microsoft.com/developer/msbuild/2003") + $AuthenticodeDebug.set_InnerXML("Microsoft") + $StrongNameDebug = $xml.CreateElement("StrongName", "http://schemas.microsoft.com/developer/msbuild/2003") + $StrongNameDebug.set_InnerXML("StrongName") + $FilesToSignDebug.AppendChild($AuthenticodeDebug) | Out-Null + $FilesToSignDebug.AppendChild($StrongNameDebug) | Out-Null + $FileSignGroup.AppendChild($FilesToSignDebug) | Out-Null $MicroBuildTargets = $xml.CreateElement("Import", "http://schemas.microsoft.com/developer/msbuild/2003") $MicroBuildTargets.SetAttribute("Project", "$PSScriptRoot\..\NuGetPackages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets") @@ -252,12 +263,12 @@ function Build-NuGet { $DestinationPath = $_[1] if ($DynamicLibraryLinkage) { - Copy-CreateItem -Path "$BuildPath\Debug\gtest.dll" -Destination "$DestinationPath\Debug\gtest.dll" - Copy-CreateItem -Path "$BuildPath\Debug\gtest.lib" -Destination "$DestinationPath\Debug\gtest.lib" - Copy-CreateItem -Path "$BuildPath\Debug\gtest.pdb" -Destination "$DestinationPath\Debug\gtest.pdb" - Copy-CreateItem -Path "$BuildPath\Debug\gtest_main.dll" -Destination "$DestinationPath\Debug\gtest_main.dll" - Copy-CreateItem -Path "$BuildPath\Debug\gtest_main.lib" -Destination "$DestinationPath\Debug\gtest_main.lib" - Copy-CreateItem -Path "$BuildPath\Debug\gtest_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.pdb" + Copy-CreateItem -Path "$BuildPath\Debug\gtestd.dll" -Destination "$DestinationPath\Debug\gtestd.dll" + Copy-CreateItem -Path "$BuildPath\Debug\gtestd.lib" -Destination "$DestinationPath\Debug\gtestd.lib" + Copy-CreateItem -Path "$BuildPath\Debug\gtestd.pdb" -Destination "$DestinationPath\Debug\gtestd.pdb" + Copy-CreateItem -Path "$BuildPath\Debug\gtest_maind.dll" -Destination "$DestinationPath\Debug\gtest_maind.dll" + Copy-CreateItem -Path "$BuildPath\Debug\gtest_maind.lib" -Destination "$DestinationPath\Debug\gtest_maind.lib" + Copy-CreateItem -Path "$BuildPath\Debug\gtest_maind.pdb" -Destination "$DestinationPath\Debug\gtest_maind.pdb" Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest.dll" -Destination "$DestinationPath\Release\gtest.dll" Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest.lib" -Destination "$DestinationPath\Release\gtest.lib" @@ -266,10 +277,10 @@ function Build-NuGet { Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest_main.lib" -Destination "$DestinationPath\Release\gtest_main.lib" Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest_main.pdb" -Destination "$DestinationPath\Release\gtest_main.pdb" } else { - Copy-CreateItem -Path "$BuildPath\Debug\gtest.lib" -Destination "$DestinationPath\Debug\gtest.lib" - Copy-CreateItem -Path "$BuildPath\Debug\gtest.pdb" -Destination "$DestinationPath\Debug\gtest.pdb" - Copy-CreateItem -Path "$BuildPath\Debug\gtest_main.lib" -Destination "$DestinationPath\Debug\gtest_main.lib" - Copy-CreateItem -Path "$BuildPath\Debug\gtest_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.pdb" + Copy-CreateItem -Path "$BuildPath\Debug\gtestd.lib" -Destination "$DestinationPath\Debug\gtestd.lib" + Copy-CreateItem -Path "$BuildPath\gtest.dir\Debug\gtest.pdb" -Destination "$DestinationPath\Debug\gtest.pdb" + Copy-CreateItem -Path "$BuildPath\Debug\gtest_maind.lib" -Destination "$DestinationPath\Debug\gtest_maind.lib" + Copy-CreateItem -Path "$BuildPath\gtest_main.dir\Debug\gtest_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.pdb" Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest.lib" -Destination "$DestinationPath\Release\gtest.lib" Copy-CreateItem -Path "$BuildPath\gtest.dir\RelWithDebInfo\gtest.pdb" -Destination "$DestinationPath\Release\gtest.pdb" diff --git a/GoogleTestNuGet/googletest.nuspec.tt b/GoogleTestNuGet/googletest.nuspec.tt index d3a8a4a68..097e38c68 100644 --- a/GoogleTestNuGet/googletest.nuspec.tt +++ b/GoogleTestNuGet/googletest.nuspec.tt @@ -5,7 +5,7 @@ <#= PackageName #> - 1.8.0 + 1.8.1 Microsoft microsoft,visualcpp https://github.com/Microsoft/TestAdapterForGoogleTest diff --git a/GoogleTestNuGet/googletest.targets.tt b/GoogleTestNuGet/googletest.targets.tt index 9c9e67062..232474fed 100644 --- a/GoogleTestNuGet/googletest.targets.tt +++ b/GoogleTestNuGet/googletest.targets.tt @@ -5,7 +5,7 @@ <#@ parameter type="System.String" name="PathToBinaries" #> <#@ parameter type="System.String" name="ConfigurationType" #> - + >true> @@ -16,12 +16,12 @@ - $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x64\Debug\gtest.lib;%(AdditionalDependencies) - $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x64\Debug\gtest_main.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x64\Debug\gtestd.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x64\Debug\gtest_maind.lib;%(AdditionalDependencies) $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x64\Release\gtest.lib;%(AdditionalDependencies) $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x64\Release\gtest_main.lib;%(AdditionalDependencies) - $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x86\Debug\gtest.lib;%(AdditionalDependencies) - $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x86\Debug\gtest_main.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x86\Debug\gtestd.lib;%(AdditionalDependencies) + $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x86\Debug\gtest_maind.lib;%(AdditionalDependencies) $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x86\Release\gtest.lib;%(AdditionalDependencies) $(MSBuildThisFileDirectory)..\..\\<#= PathToBinaries #>\x86\Release\gtest_main.lib;%(AdditionalDependencies) @@ -31,8 +31,8 @@ <# if (ConfigurationType == "dyn") { #> - - + + <# } #> @@ -47,8 +47,8 @@ <# if (ConfigurationType == "dyn") { #> - - + + <# } #> diff --git a/ThirdParty/googletest b/ThirdParty/googletest index ec44c6c16..2fe3bd994 160000 --- a/ThirdParty/googletest +++ b/ThirdParty/googletest @@ -1 +1 @@ -Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780 +Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2