diff --git a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate index be4f30ab6..2ae418988 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 945072566..fb24efc11 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 266e6a3a7..bf389d22e 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest +++ b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest @@ -28,9 +28,9 @@ - - - + + + diff --git a/GoogleTestNuGet/1029/googletest.propertiesui.xml b/GoogleTestNuGet/1029/googletest.propertiesui.xml new file mode 100644 index 000000000..98aec3923 --- /dev/null +++ b/GoogleTestNuGet/1029/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1031/googletest.propertiesui.xml b/GoogleTestNuGet/1031/googletest.propertiesui.xml new file mode 100644 index 000000000..9edb0579e --- /dev/null +++ b/GoogleTestNuGet/1031/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/googletest.propertiesui.xml b/GoogleTestNuGet/1033/googletest.propertiesui.xml similarity index 100% rename from GoogleTestNuGet/googletest.propertiesui.xml rename to GoogleTestNuGet/1033/googletest.propertiesui.xml diff --git a/GoogleTestNuGet/1034/googletest.propertiesui.xml b/GoogleTestNuGet/1034/googletest.propertiesui.xml new file mode 100644 index 000000000..c506d0401 --- /dev/null +++ b/GoogleTestNuGet/1034/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1036/googletest.propertiesui.xml b/GoogleTestNuGet/1036/googletest.propertiesui.xml new file mode 100644 index 000000000..a21c05685 --- /dev/null +++ b/GoogleTestNuGet/1036/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1040/googletest.propertiesui.xml b/GoogleTestNuGet/1040/googletest.propertiesui.xml new file mode 100644 index 000000000..19a3fd521 --- /dev/null +++ b/GoogleTestNuGet/1040/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1041/googletest.propertiesui.xml b/GoogleTestNuGet/1041/googletest.propertiesui.xml new file mode 100644 index 000000000..28926d993 --- /dev/null +++ b/GoogleTestNuGet/1041/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1042/googletest.propertiesui.xml b/GoogleTestNuGet/1042/googletest.propertiesui.xml new file mode 100644 index 000000000..e4afd1165 --- /dev/null +++ b/GoogleTestNuGet/1042/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1045/googletest.propertiesui.xml b/GoogleTestNuGet/1045/googletest.propertiesui.xml new file mode 100644 index 000000000..640a4e967 --- /dev/null +++ b/GoogleTestNuGet/1045/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1046/googletest.propertiesui.xml b/GoogleTestNuGet/1046/googletest.propertiesui.xml new file mode 100644 index 000000000..39725f55b --- /dev/null +++ b/GoogleTestNuGet/1046/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1049/googletest.propertiesui.xml b/GoogleTestNuGet/1049/googletest.propertiesui.xml new file mode 100644 index 000000000..e478bebfb --- /dev/null +++ b/GoogleTestNuGet/1049/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1055/googletest.propertiesui.xml b/GoogleTestNuGet/1055/googletest.propertiesui.xml new file mode 100644 index 000000000..7679dbd9f --- /dev/null +++ b/GoogleTestNuGet/1055/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/31748/googletest.propertiesui.xml b/GoogleTestNuGet/31748/googletest.propertiesui.xml new file mode 100644 index 000000000..ae604fd99 --- /dev/null +++ b/GoogleTestNuGet/31748/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/4/googletest.propertiesui.xml b/GoogleTestNuGet/4/googletest.propertiesui.xml new file mode 100644 index 000000000..408798590 --- /dev/null +++ b/GoogleTestNuGet/4/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 4b3afe173..1304c31ff 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -247,7 +247,21 @@ function Build-NuGet { $TargetsTTArgs += "googletest.targets.tt.proj" Invoke-Executable msbuild $TargetsTTArgs - Copy-Item -Path "googletest.propertiesui.xml" -Destination "$Dir\build\native\googletest.propertiesui.xml" + # Copy all the locale ID folders with the localized versions of googletest.propertiesui.xml + Copy-Item -Path "4" -Destination "$Dir\build\native\4" -Recurse + Copy-Item -Path "1029" -Destination "$Dir\build\native\1029" -Recurse + Copy-Item -Path "1031" -Destination "$Dir\build\native\1031" -Recurse + Copy-Item -Path "1033" -Destination "$Dir\build\native\1033" -Recurse + Copy-Item -Path "1034" -Destination "$Dir\build\native\1034" -Recurse + Copy-Item -Path "1036" -Destination "$Dir\build\native\1036" -Recurse + Copy-Item -Path "1040" -Destination "$Dir\build\native\1040" -Recurse + Copy-Item -Path "1041" -Destination "$Dir\build\native\1041" -Recurse + Copy-Item -Path "1042" -Destination "$Dir\build\native\1042" -Recurse + Copy-Item -Path "1045" -Destination "$Dir\build\native\1045" -Recurse + Copy-Item -Path "1046" -Destination "$Dir\build\native\1046" -Recurse + Copy-Item -Path "1049" -Destination "$Dir\build\native\1049" -Recurse + Copy-Item -Path "1055" -Destination "$Dir\build\native\1055" -Recurse + Copy-Item -Path "31748" -Destination "$Dir\build\native\31748" -Recurse Copy-Item -Recurse -Path "..\ThirdParty\googletest\googletest\include" -Destination "$Dir\build\native\include" diff --git a/GoogleTestNuGet/googletest.nuspec.tt b/GoogleTestNuGet/googletest.nuspec.tt index dc54f301e..398d4cd92 100644 --- a/GoogleTestNuGet/googletest.nuspec.tt +++ b/GoogleTestNuGet/googletest.nuspec.tt @@ -5,7 +5,7 @@ <#= PackageName #> - 1.8.1.3 + 1.8.1.4 Microsoft microsoft,visualcpp https://github.com/Microsoft/TestAdapterForGoogleTest diff --git a/GoogleTestNuGet/googletest.targets.tt b/GoogleTestNuGet/googletest.targets.tt index 2fc019814..3bffd5bee 100644 --- a/GoogleTestNuGet/googletest.targets.tt +++ b/GoogleTestNuGet/googletest.targets.tt @@ -12,7 +12,7 @@ >true> - +