From 7673a63c83dc2f9e487f8f51e07a57324355d27d Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 4 Sep 2018 11:41:37 -0700 Subject: [PATCH 01/20] update googletest release to 1.8.1 --- ThirdParty/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f0931b95171210a088f66b759c58b1aec67cf785 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 5 Dec 2018 15:48:55 -0800 Subject: [PATCH 02/20] update vsix to install on dev16 --- .../Packaging.TAfGT/source.extension.vsixmanifest | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest index bcd9b6f78..b0bf7bb13 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 - - - - + + + + @@ -35,9 +35,9 @@ - - - + + + NuGet Package Manager From cf76f6ab8545c6ccdda107084b57a29e8d5286e3 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 5 Dec 2018 16:28:37 -0800 Subject: [PATCH 03/20] attempt to fix nuget build --- GoogleTestNuGet/Build.ps1 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index f8a363a0c..667ed4bae 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -252,12 +252,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 +266,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\Debug\gtestd.pdb" -Destination "$DestinationPath\Debug\gtestd.pdb" + 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.lib" -Destination "$DestinationPath\Release\gtest.lib" Copy-CreateItem -Path "$BuildPath\gtest.dir\RelWithDebInfo\gtest.pdb" -Destination "$DestinationPath\Release\gtest.pdb" From a44963befffec7aa0417242d4a6ee92c24898d58 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 5 Dec 2018 16:43:27 -0800 Subject: [PATCH 04/20] revert rename of pdbs --- GoogleTestNuGet/Build.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 667ed4bae..f2656cb9a 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -254,10 +254,10 @@ function Build-NuGet { if ($DynamicLibraryLinkage) { 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.pdb" -Destination "$DestinationPath\Debug\gtest.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\Debug\gtest_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.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" @@ -267,9 +267,9 @@ function Build-NuGet { Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest_main.pdb" -Destination "$DestinationPath\Release\gtest_main.pdb" } else { 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.pdb" -Destination "$DestinationPath\Debug\gtest.pdb" 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\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" From f41cd924ac38eb3d9bd91736a74781ab21ddd91e Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 6 Dec 2018 14:03:11 -0800 Subject: [PATCH 05/20] attempt to fix pdb paths --- GoogleTestNuGet/Build.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index f2656cb9a..19a7b323f 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -254,22 +254,22 @@ function Build-NuGet { if ($DynamicLibraryLinkage) { 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\gtest.pdb" -Destination "$DestinationPath\Debug\gtest.pdb" + Copy-CreateItem -Path "$BuildPath\gtest.dir\Debug\gtest.pdb" -Destination "$DestinationPath\Debug\gtest.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_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.pdb" + Copy-CreateItem -Path "$BuildPath\gtest_main.dir\Debug\gtest_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.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" - Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest.pdb" -Destination "$DestinationPath\Release\gtest.pdb" + Copy-CreateItem -Path "$BuildPath\gtest.dir\RelWithDebInfo\gtest.pdb" -Destination "$DestinationPath\Release\gtest.pdb" Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest_main.dll" -Destination "$DestinationPath\Release\gtest_main.dll" 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" + Copy-CreateItem -Path "$BuildPath\gtest_main.dir\RelWithDebInfo\gtest_main.pdb" -Destination "$DestinationPath\Release\gtest_main.pdb" } else { Copy-CreateItem -Path "$BuildPath\Debug\gtestd.lib" -Destination "$DestinationPath\Debug\gtestd.lib" - Copy-CreateItem -Path "$BuildPath\Debug\gtest.pdb" -Destination "$DestinationPath\Debug\gtest.pdb" + 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\Debug\gtest_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.pdb" + 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" From 82df75d1bdfb1c3d23c36fd9325d943c13157b35 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 6 Dec 2018 14:19:44 -0800 Subject: [PATCH 06/20] fix other pdb paths --- GoogleTestNuGet/Build.ps1 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 19a7b323f..70771f5a5 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -254,22 +254,22 @@ function Build-NuGet { if ($DynamicLibraryLinkage) { 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\gtest.dir\Debug\gtest.pdb" -Destination "$DestinationPath\Debug\gtest.pdb" + 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\gtest_main.dir\Debug\gtest_main.pdb" -Destination "$DestinationPath\Debug\gtest_main.pdb" + 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" - Copy-CreateItem -Path "$BuildPath\gtest.dir\RelWithDebInfo\gtest.pdb" -Destination "$DestinationPath\Release\gtest.pdb" + Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest.pdb" -Destination "$DestinationPath\Release\gtest.pdb" Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest_main.dll" -Destination "$DestinationPath\Release\gtest_main.dll" Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest_main.lib" -Destination "$DestinationPath\Release\gtest_main.lib" - Copy-CreateItem -Path "$BuildPath\gtest_main.dir\RelWithDebInfo\gtest_main.pdb" -Destination "$DestinationPath\Release\gtest_main.pdb" + Copy-CreateItem -Path "$BuildPath\RelWithDebInfo\gtest_main.pdb" -Destination "$DestinationPath\Release\gtest_main.pdb" } else { - 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\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" From e700a8ab5c1eea4d7eae0d4ba704b829522d1525 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 4 Jan 2019 16:18:57 -0800 Subject: [PATCH 07/20] fix signing for new dll names --- GoogleTestNuGet/Build.ps1 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 70771f5a5..f52ab99a4 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -141,16 +141,22 @@ 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'") + $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'") + $FilesToSignDebug = $xml.CreateElement("FilesToSign", "http://schemas.microsoft.com/developer/msbuild/2003") + $FilesToSignDebug.SetAttribute("Include", "`$(OutDir)\$ProjectNamed.dll") + $FilesToSignDebug.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll and '`$(Configuration)' == 'Debug''") $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.AppendChild($Authenticode) | Out-Null + $FilesToSignRel.AppendChild($StrongName) | Out-Null + $FilesToSignDebug.AppendChild($Authenticode) | Out-Null + $FilesToSignDebug.AppendChild($StrongName) | Out-Null + $FileSignGroup.AppendChild($FilesToSignRel) | 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") From 9dc7e3e7cbc57912c9e660eff0db394006206dd8 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 4 Jan 2019 16:30:31 -0800 Subject: [PATCH 08/20] fix debug dll name --- GoogleTestNuGet/Build.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index f52ab99a4..8eaa81aa9 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") @@ -145,7 +146,7 @@ function Add-Signing { $FilesToSignRel.SetAttribute("Include", "`$(OutDir)\$ProjectName.dll") $FilesToSignRel.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll' and '`$(Configuration)' == 'RelWithDebInfo'") $FilesToSignDebug = $xml.CreateElement("FilesToSign", "http://schemas.microsoft.com/developer/msbuild/2003") - $FilesToSignDebug.SetAttribute("Include", "`$(OutDir)\$ProjectNamed.dll") + $FilesToSignDebug.SetAttribute("Include", "`$(OutDir)\$ProjectNameDebug.dll") $FilesToSignDebug.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll and '`$(Configuration)' == 'Debug''") $Authenticode = $xml.CreateElement("Authenticode", "http://schemas.microsoft.com/developer/msbuild/2003") $Authenticode.set_InnerXML("Microsoft") From 3b7ec1af262767257a99ee5941803db408d4bd9d Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 4 Jan 2019 16:38:05 -0800 Subject: [PATCH 09/20] add back missing single quote --- GoogleTestNuGet/Build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 8eaa81aa9..36e2eaab0 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -147,7 +147,7 @@ function Add-Signing { $FilesToSignRel.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll' and '`$(Configuration)' == 'RelWithDebInfo'") $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''") + $FilesToSignDebug.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll' and '`$(Configuration)' == 'Debug''") $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") From 2a44a92ad7b553523ec7a288dbaab9e4077826f5 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 4 Jan 2019 16:44:43 -0800 Subject: [PATCH 10/20] remove extra quote --- GoogleTestNuGet/Build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 36e2eaab0..9d8c4032f 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -147,7 +147,7 @@ function Add-Signing { $FilesToSignRel.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll' and '`$(Configuration)' == 'RelWithDebInfo'") $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''") + $FilesToSignDebug.SetAttribute("Condition", "'`$(RealSign)' == 'True' and '`$(TargetExt)' == '.dll' and '`$(Configuration)' == 'Debug'") $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") From 6c19320e8dcc04596fd0c15faba8b39a6eaf4e12 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 4 Jan 2019 17:11:27 -0800 Subject: [PATCH 11/20] write to output to help debug signing failure --- GoogleTestNuGet/Build.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 9d8c4032f..ab505bb15 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -169,6 +169,8 @@ function Add-Signing { $xml.Project.AppendChild($MicroBuildTargets) | Out-Null $xml.Save("$Directory\$ProjectName.vcxproj") + + Write-Output $xml } function Build-Binaries { From fa89fc415a761a422302ea2cf03b400b81f980f1 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 4 Jan 2019 17:21:00 -0800 Subject: [PATCH 12/20] try to fix signing --- GoogleTestNuGet/Build.ps1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index ab505bb15..ecaebf409 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -156,8 +156,8 @@ function Add-Signing { $FilesToSignRel.AppendChild($StrongName) | Out-Null $FilesToSignDebug.AppendChild($Authenticode) | Out-Null $FilesToSignDebug.AppendChild($StrongName) | Out-Null - $FileSignGroup.AppendChild($FilesToSignRel) | Out-Null $FileSignGroup.AppendChild($FilesToSignDebug) | Out-Null + $FileSignGroup.AppendChild($FilesToSignRel) | 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") @@ -169,8 +169,6 @@ function Add-Signing { $xml.Project.AppendChild($MicroBuildTargets) | Out-Null $xml.Save("$Directory\$ProjectName.vcxproj") - - Write-Output $xml } function Build-Binaries { From a340e2efcdeb825a26bf271de525261da210724f Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 7 Jan 2019 14:47:25 -0800 Subject: [PATCH 13/20] attempt to fix signing --- GoogleTestNuGet/Build.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index ecaebf409..5fe71f24d 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -152,10 +152,10 @@ function Add-Signing { $Authenticode.set_InnerXML("Microsoft") $StrongName = $xml.CreateElement("StrongName", "http://schemas.microsoft.com/developer/msbuild/2003") $StrongName.set_InnerXML("StrongName") - $FilesToSignRel.AppendChild($Authenticode) | Out-Null - $FilesToSignRel.AppendChild($StrongName) | Out-Null $FilesToSignDebug.AppendChild($Authenticode) | Out-Null $FilesToSignDebug.AppendChild($StrongName) | Out-Null + $FilesToSignRel.AppendChild($Authenticode) | Out-Null + $FilesToSignRel.AppendChild($StrongName) | Out-Null $FileSignGroup.AppendChild($FilesToSignDebug) | Out-Null $FileSignGroup.AppendChild($FilesToSignRel) | Out-Null From c34ae5949c951f4c8a303525a3f5121777d0c774 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 7 Jan 2019 14:57:21 -0800 Subject: [PATCH 14/20] fix missing cert signing error --- GoogleTestNuGet/Build.ps1 | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 5fe71f24d..e86c8570a 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -145,19 +145,23 @@ function Add-Signing { $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'") - $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") - $FilesToSignDebug.AppendChild($Authenticode) | Out-Null - $FilesToSignDebug.AppendChild($StrongName) | Out-Null - $FilesToSignRel.AppendChild($Authenticode) | Out-Null - $FilesToSignRel.AppendChild($StrongName) | Out-Null + $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 - $FileSignGroup.AppendChild($FilesToSignRel) | 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") From d3ced1e7ab14297c837ece8ba00b279e5e03f6c5 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 7 Jan 2019 16:43:56 -0800 Subject: [PATCH 15/20] update targets for new google test version --- GoogleTestNuGet/googletest.nuspec.tt | 2 +- GoogleTestNuGet/googletest.targets.tt | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) 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..198de4236 100644 --- a/GoogleTestNuGet/googletest.targets.tt +++ b/GoogleTestNuGet/googletest.targets.tt @@ -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") { #> - - + + <# } #> From 8a0f84a1433547f90a7e44fd316b32300dae4173 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 7 Jan 2019 16:54:07 -0800 Subject: [PATCH 16/20] update nuget package references to 1.8.1 and add 2019 as supported version --- .../GoogleTestProjectTemplate/GoogleTest.vstemplate | 2 +- .../Packaging.TAfGT/source.extension.vsixmanifest | 6 +++--- GoogleTestAdapter/TestAdapter/Framework/VsVersion.cs | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) 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/source.extension.vsixmanifest b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest index b0bf7bb13..82b8c6516 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest +++ b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest @@ -28,9 +28,9 @@ - - - + + + 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(); } From a4fbb95f8fda863a7afc939bf2f02822205e4131 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 7 Jan 2019 17:20:58 -0800 Subject: [PATCH 17/20] update nuget references in project to latest version --- GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From 214371f46eec6450e703e7512b969b70b7bfb775 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 8 Jan 2019 10:32:26 -0800 Subject: [PATCH 18/20] remove flag that is being removed --- GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj index 2b6f47d1d..87e75f0a4 100644 --- a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj +++ b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj @@ -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 From 89dbffb2a776fccbc782f25aa919e85098358c84 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 10 Jan 2019 15:48:43 -0800 Subject: [PATCH 19/20] fix debug build and update default toolset for project template --- GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj | 2 +- GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj index 87e75f0a4..ae8fa98f2 100644 --- a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj +++ b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj @@ -23,7 +23,7 @@ Win32Proj $targetplatformversion$ Application - v141 + v142 Unicode 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 From 37aebd23c0bd8ea97e292ce9fa96328fc418eef1 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 10 Jan 2019 17:31:55 -0800 Subject: [PATCH 20/20] allow v142 toolset --- GoogleTestNuGet/googletest.targets.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestNuGet/googletest.targets.tt b/GoogleTestNuGet/googletest.targets.tt index 198de4236..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>