From 53fd48682860cdbc1aff8c5a9f720b253f8d3e34 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 22 Mar 2021 15:33:43 -0700 Subject: [PATCH 1/7] Add extra xml files to be localized --- .../{ => 1029}/googletest.propertiesui.xml | 0 GoogleTestNuGet/1031/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1033/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1034/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1036/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1040/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1041/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1042/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1045/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1046/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1049/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/1055/googletest.propertiesui.xml | 16 ++++++++++++++++ .../31748/googletest.propertiesui.xml | 16 ++++++++++++++++ GoogleTestNuGet/4/googletest.propertiesui.xml | 16 ++++++++++++++++ 14 files changed, 208 insertions(+) rename GoogleTestNuGet/{ => 1029}/googletest.propertiesui.xml (100%) create mode 100644 GoogleTestNuGet/1031/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1033/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1034/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1036/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1040/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1041/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1042/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1045/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1046/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1049/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/1055/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/31748/googletest.propertiesui.xml create mode 100644 GoogleTestNuGet/4/googletest.propertiesui.xml diff --git a/GoogleTestNuGet/googletest.propertiesui.xml b/GoogleTestNuGet/1029/googletest.propertiesui.xml similarity index 100% rename from GoogleTestNuGet/googletest.propertiesui.xml rename to GoogleTestNuGet/1029/googletest.propertiesui.xml diff --git a/GoogleTestNuGet/1031/googletest.propertiesui.xml b/GoogleTestNuGet/1031/googletest.propertiesui.xml new file mode 100644 index 00000000..830aa831 --- /dev/null +++ b/GoogleTestNuGet/1031/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1033/googletest.propertiesui.xml b/GoogleTestNuGet/1033/googletest.propertiesui.xml new file mode 100644 index 00000000..830aa831 --- /dev/null +++ b/GoogleTestNuGet/1033/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GoogleTestNuGet/1034/googletest.propertiesui.xml b/GoogleTestNuGet/1034/googletest.propertiesui.xml new file mode 100644 index 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /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 00000000..830aa831 --- /dev/null +++ b/GoogleTestNuGet/4/googletest.propertiesui.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file From 9ed72f6b6ae600fefa35eaf86d36f568d91b5a89 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 23 Mar 2021 14:32:38 -0700 Subject: [PATCH 2/7] copy new localized folders to packaging location during build --- GoogleTestNuGet/Build.ps1 | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 4b3afe17..1304c31f 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" From ea44b9e13fe37fafa3bda106e20403ceb02feb92 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 30 Mar 2021 15:13:36 -0700 Subject: [PATCH 3/7] don't try to deploy as part of build --- GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj index 07ddc7c6..94507256 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -25,7 +25,7 @@ true true true - false + false true From 12864f261a47dc918829d6723eb3a741cf54d177 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 30 Mar 2021 17:08:43 -0700 Subject: [PATCH 4/7] add LangID to targets file to make sure we get the right xml --- 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 2fc01981..3bffd5be 100644 --- a/GoogleTestNuGet/googletest.targets.tt +++ b/GoogleTestNuGet/googletest.targets.tt @@ -12,7 +12,7 @@ >true> - + From 026f10c35fab673c2d7b586b8b60d0ec377e7b55 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 20 Apr 2021 15:32:59 -0700 Subject: [PATCH 5/7] translate strings in localized xml files and bump nuget version --- GoogleTestNuGet/1029/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1031/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1034/googletest.propertiesui.xml | 6 +++--- GoogleTestNuGet/1036/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1040/googletest.propertiesui.xml | 6 +++--- GoogleTestNuGet/1041/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1042/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1045/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1046/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1049/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/1055/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/31748/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/4/googletest.propertiesui.xml | 8 ++++---- GoogleTestNuGet/googletest.nuspec.tt | 2 +- 14 files changed, 51 insertions(+), 51 deletions(-) diff --git a/GoogleTestNuGet/1029/googletest.propertiesui.xml b/GoogleTestNuGet/1029/googletest.propertiesui.xml index 830aa831..98aec392 100644 --- a/GoogleTestNuGet/1029/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1029/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1031/googletest.propertiesui.xml b/GoogleTestNuGet/1031/googletest.propertiesui.xml index 830aa831..9edb0579 100644 --- a/GoogleTestNuGet/1031/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1031/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1034/googletest.propertiesui.xml b/GoogleTestNuGet/1034/googletest.propertiesui.xml index 830aa831..c506d040 100644 --- a/GoogleTestNuGet/1034/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1034/googletest.propertiesui.xml @@ -1,15 +1,15 @@ - + - + - + diff --git a/GoogleTestNuGet/1036/googletest.propertiesui.xml b/GoogleTestNuGet/1036/googletest.propertiesui.xml index 830aa831..a21c0568 100644 --- a/GoogleTestNuGet/1036/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1036/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1040/googletest.propertiesui.xml b/GoogleTestNuGet/1040/googletest.propertiesui.xml index 830aa831..19a3fd52 100644 --- a/GoogleTestNuGet/1040/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1040/googletest.propertiesui.xml @@ -1,15 +1,15 @@ - + - + - + diff --git a/GoogleTestNuGet/1041/googletest.propertiesui.xml b/GoogleTestNuGet/1041/googletest.propertiesui.xml index 830aa831..28926d99 100644 --- a/GoogleTestNuGet/1041/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1041/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1042/googletest.propertiesui.xml b/GoogleTestNuGet/1042/googletest.propertiesui.xml index 830aa831..e4afd116 100644 --- a/GoogleTestNuGet/1042/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1042/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1045/googletest.propertiesui.xml b/GoogleTestNuGet/1045/googletest.propertiesui.xml index 830aa831..640a4e96 100644 --- a/GoogleTestNuGet/1045/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1045/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1046/googletest.propertiesui.xml b/GoogleTestNuGet/1046/googletest.propertiesui.xml index 830aa831..39725f55 100644 --- a/GoogleTestNuGet/1046/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1046/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1049/googletest.propertiesui.xml b/GoogleTestNuGet/1049/googletest.propertiesui.xml index 830aa831..e478bebf 100644 --- a/GoogleTestNuGet/1049/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1049/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/1055/googletest.propertiesui.xml b/GoogleTestNuGet/1055/googletest.propertiesui.xml index 830aa831..7679dbd9 100644 --- a/GoogleTestNuGet/1055/googletest.propertiesui.xml +++ b/GoogleTestNuGet/1055/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/31748/googletest.propertiesui.xml b/GoogleTestNuGet/31748/googletest.propertiesui.xml index 830aa831..ae604fd9 100644 --- a/GoogleTestNuGet/31748/googletest.propertiesui.xml +++ b/GoogleTestNuGet/31748/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/4/googletest.propertiesui.xml b/GoogleTestNuGet/4/googletest.propertiesui.xml index 830aa831..40879859 100644 --- a/GoogleTestNuGet/4/googletest.propertiesui.xml +++ b/GoogleTestNuGet/4/googletest.propertiesui.xml @@ -1,16 +1,16 @@ - + - + - - + + \ No newline at end of file diff --git a/GoogleTestNuGet/googletest.nuspec.tt b/GoogleTestNuGet/googletest.nuspec.tt index dc54f301..398d4cd9 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 From 0a112dcc3c1a484efda2c3c279b9a8a94b44e924 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 20 Apr 2021 17:22:49 -0700 Subject: [PATCH 6/7] update references to the nuget packages with new version --- GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj | 6 +++--- .../Packaging.TAfGT/source.extension.vsixmanifest | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj index 94507256..fb24efc1 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 266e6a3a..bf389d22 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest +++ b/GoogleTestAdapter/Packaging.TAfGT/source.extension.vsixmanifest @@ -28,9 +28,9 @@ - - - + + + From c4fa2b830bfa6100d7da6f4a5bafffb7cb0757ec Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Tue, 20 Apr 2021 17:26:54 -0700 Subject: [PATCH 7/7] update nuget reference in template to new version --- .../GoogleTestProjectTemplate/GoogleTest.vstemplate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate index be4f30ab..2ae41898 100644 --- a/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate +++ b/GoogleTestAdapter/GoogleTestProjectTemplate/GoogleTest.vstemplate @@ -26,7 +26,7 @@ - +