Skip to content

Update Google Test reference to 1.8.1 + fixes to support VS2019 #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spebl merged 21 commits into from
Jan 11, 2019
Merged

Update Google Test reference to 1.8.1 + fixes to support VS2019 #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7673a63
update googletest release to 1.8.1
spebl Sep 4, 2018
05ac26a
Merge branch 'dev15' of https://github.com/Microsoft/TestAdapterForGo…
spebl Oct 30, 2018
f0931b9
update vsix to install on dev16
spebl Dec 5, 2018
cf76f6a
attempt to fix nuget build
spebl Dec 6, 2018
a44963b
revert rename of pdbs
spebl Dec 6, 2018
f41cd92
attempt to fix pdb paths
spebl Dec 6, 2018
82df75d
fix other pdb paths
spebl Dec 6, 2018
e700a8a
fix signing for new dll names
spebl Jan 5, 2019
9dc7e3e
fix debug dll name
spebl Jan 5, 2019
3b7ec1a
add back missing single quote
spebl Jan 5, 2019
2a44a92
remove extra quote
spebl Jan 5, 2019
6c19320
write to output to help debug signing failure
spebl Jan 5, 2019
fa89fc4
try to fix signing
spebl Jan 5, 2019
a340e2e
attempt to fix signing
spebl Jan 7, 2019
c34ae59
fix missing cert signing error
spebl Jan 7, 2019
d3ced1e
update targets for new google test version
spebl Jan 8, 2019
8a0f84a
update nuget package references to 1.8.1 and add 2019 as supported ve…
spebl Jan 8, 2019
a4fbb95
update nuget references in project to latest version
spebl Jan 8, 2019
214371f
remove flag that is being removed
spebl Jan 8, 2019
89dbffb
fix debug build and update default toolset for project template
spebl Jan 10, 2019
37aebd2
allow v142 toolset
spebl Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>$targetplatformversion$</WindowsTargetPlatformVersion>
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down Expand Up @@ -53,7 +53,6 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>$rtdebug$</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -69,7 +68,6 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>$rtdebug$</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</WizardExtension>
<WizardData>
<packages repository="extension" repositoryId="GoogleTestAdapterVSIX.d3b8e668-8582-4be9-ab42-aaf872704ef3">
<package id="$nugetpackage$" version="1.8.0" />
<package id="$nugetpackage$" version="1.8.1" />
</packages>
</WizardData>
</VSTemplate>
6 changes: 3 additions & 3 deletions GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="..\Packages\Microsoft.googletest.v140.windesktop.msvcstl.dyn.rt-dyn.1.8.0.nupkg">
<Content Include="..\Packages\Microsoft.googletest.v140.windesktop.msvcstl.dyn.rt-dyn.1.8.1.nupkg">
<CopyToOutputDirectory>CopyIfNewer</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0.nupkg">
<Content Include="..\Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.nupkg">
<CopyToOutputDirectory>CopyIfNewer</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="..\Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0.nupkg">
<Content Include="..\Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.nupkg">
<CopyToOutputDirectory>CopyIfNewer</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
Expand Down
20 changes: 10 additions & 10 deletions GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<Tags>Unit Test, C++, Google Test, GoogleTest, GTest, Test Explorer, Testing</Tags>
</Metadata>
<Installation InstalledByMsi="false">
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,4.6]" />
Expand All @@ -28,16 +28,16 @@
<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|" />
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="NewProjectWizard" Path="|NewProjectWizard|" AssemblyName="|NewProjectWizard;AssemblyName|" />
<Asset Type="Microsoft.googletest.v140.windesktop.msvcstl.dyn.rt-dyn.1.8.0.nupkg" d:Source="File" Path="Packages\Microsoft.googletest.v140.windesktop.msvcstl.dyn.rt-dyn.1.8.0.nupkg" d:VsixSubPath="Packages" />
<Asset Type="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0.nupkg" d:Source="File" Path="Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.0.nupkg" d:VsixSubPath="Packages" />
<Asset Type="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0.nupkg" d:Source="File" Path="Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0.nupkg" d:VsixSubPath="Packages" />
<Asset Type="Microsoft.googletest.v140.windesktop.msvcstl.dyn.rt-dyn.1.8.1.nupkg" d:Source="File" Path="Packages\Microsoft.googletest.v140.windesktop.msvcstl.dyn.rt-dyn.1.8.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.nupkg" d:Source="File" Path="Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.nupkg" d:Source="File" Path="Packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1.nupkg" d:VsixSubPath="Packages" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="GoogleTestProjectTemplate" d:TargetPath="|GoogleTestProjectTemplate;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
<Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" d:ProjectName="GoogleTestItemTemplate" d:TargetPath="|GoogleTestItemTemplate;TemplateProjectOutputGroup|" Path="ItemTemplates" d:VsixSubPath="ItemTemplates" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26004.1,16.0)" DisplayName="Visual Studio core editor" />
<Prerequisite Id="Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core" Version="[15.0.26004.1,16.0)" DisplayName="Visual Studio C++ core features" />
<Prerequisite Id="Microsoft.VisualStudio.Component.NuGet" Version="[15.0.26208.0,16.0)" DisplayName="NuGet package manager" />
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.8.27729.1,17.0)" DisplayName="Visual Studio core editor" />
<Prerequisite Id="Microsoft.VisualStudio.Component.VC.CoreIde" Version="[15.6.27406.0,17.0)" DisplayName="Visual Studio C++ core features" />
<Prerequisite Id="Microsoft.VisualStudio.Component.NuGet" Version="[15.9.28016.0,17.0)" DisplayName="NuGet package manager" />
</Prerequisites>
<Reference Id="NuPackToolsVsix.Microsoft.67e54e40-0ae3-42c5-a949-fddf5739e7a5" MinVersion="1.7.30402.9028">
<Name>NuGet Package Manager</Name>
Expand Down
4 changes: 3 additions & 1 deletion GoogleTestAdapter/TestAdapter/Framework/VsVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<TargetFrameworkVersion>$(FlavoredTargetFrameworkVersion)</TargetFrameworkVersion>
<GeneratePkgDefFile>true</GeneratePkgDefFile>
<CreateVsixContainer>false</CreateVsixContainer>
<DeployExtension>False</DeployExtension>
</PropertyGroup>
<PropertyGroup Condition="'$(RealSign)' == 'True'">
<SignAssembly>true</SignAssembly>
Expand All @@ -70,7 +71,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<RunCodeAnalysis>true</RunCodeAnalysis>
<DeployExtension>False</DeployExtension>
</PropertyGroup>
<ItemGroup>
<Compile Include="GoogleTestExtensionOptionsPage.cs" />
Expand Down
51 changes: 31 additions & 20 deletions GoogleTestNuGet/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion GoogleTestNuGet/googletest.nuspec.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package>
<metadata>
<id><#= PackageName #></id>
<version>1.8.0</version>
<version>1.8.1</version>
<authors>Microsoft</authors>
<owners>microsoft,visualcpp</owners>
<projectUrl>https://github.com/Microsoft/TestAdapterForGoogleTest</projectUrl>
Expand Down
Loading