diff --git a/google_googlemock_main.props b/google_googlemock_main.props index 79981e8c11..0d1bbf8de0 100644 --- a/google_googlemock_main.props +++ b/google_googlemock_main.props @@ -7,7 +7,7 @@ $(SolutionDir)..\Google\googletest\googlemock\include;%(AdditionalIncludeDirectories) - $(SolutionDir)..\Google\googletest\googlemock\msvc\2015\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)..\Google\googletest\googlemock\msvc\2017\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) gmock.lib;gmock_main.lib;%(AdditionalDependencies) diff --git a/google_googletest.props b/google_googletest.props index e748807d8a..e8fccdf840 100644 --- a/google_googletest.props +++ b/google_googletest.props @@ -10,7 +10,7 @@ $(SolutionDir)..\Google\googletest\googletest\include;%(AdditionalIncludeDirectories) - $(SolutionDir)..\Google\googletest\googletest\msvc\2015\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)..\Google\googletest\googletest\msvc\2017\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) gtest.lib;%(AdditionalDependencies) diff --git a/rebuild_all_solutions.ps1 b/rebuild_all_solutions.ps1 index d9e5dade15..26b25fe06a 100644 --- a/rebuild_all_solutions.ps1 +++ b/rebuild_all_solutions.ps1 @@ -1,7 +1,7 @@ $msbuild = join-path -path (Get-ItemProperty "HKLM:\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7")."15.0" -childpath "MSBuild\15.0\Bin\msbuild.exe" $dependencies = @(".\Google\glog\google-glog.sln", ".\Google\googletest\googletest\msvc\2017\gtest.sln", - ".\Google\googletest\googlemock\msvc\2015\gmock.sln", + ".\Google\googletest\googlemock\msvc\2017\gmock.sln", ".\Google\protobuf\vsprojects\protobuf.sln", ".\Google\benchmark\msvc\google-benchmark.sln") diff --git a/run_all_third_party_tests.ps1 b/run_all_third_party_tests.ps1 index bdde629b3c..c80ffd502d 100644 --- a/run_all_third_party_tests.ps1 +++ b/run_all_third_party_tests.ps1 @@ -6,12 +6,12 @@ ForEach ($configuration in $configurations) { & $_.FullName } - Get-ChildItem ".\Google\googletest\msvc\gtest\$configuration\*" -Include *test.exe | ` + Get-ChildItem ".\Google\googletest\googletest\msvc\2017\$configuration\*" -Include *test.exe | ` Foreach-Object { & $_.FullName } - Get-ChildItem ".\Google\googlemock\msvc\2015\$configuration\*" -Include *test.exe | ` + Get-ChildItem ".\Google\googletest\googlemock\msvc\2017\$configuration\*" -Include *test.exe | ` Foreach-Object { & $_.FullName }