From dc5e4baaa4652119b04cc6a39e488a4588f464ce Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 25 Sep 2017 14:03:58 -0700 Subject: [PATCH 1/8] fix path for loc files --- .../Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj | 2 +- GoogleTestAdapter/Core/Core.csproj | 2 +- GoogleTestAdapter/DiaResolver/DiaResolver.csproj | 2 +- GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj | 2 +- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 2 +- GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj b/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj index 8645dc620..55c2b9232 100644 --- a/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj +++ b/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj @@ -40,7 +40,7 @@ - $(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.lcl Microsoft diff --git a/GoogleTestAdapter/Core/Core.csproj b/GoogleTestAdapter/Core/Core.csproj index 70a98ea32..84f07cf53 100644 --- a/GoogleTestAdapter/Core/Core.csproj +++ b/GoogleTestAdapter/Core/Core.csproj @@ -42,7 +42,7 @@ - $(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.Core.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Core.lcl Microsoft diff --git a/GoogleTestAdapter/DiaResolver/DiaResolver.csproj b/GoogleTestAdapter/DiaResolver/DiaResolver.csproj index e088ecb45..db31bc745 100644 --- a/GoogleTestAdapter/DiaResolver/DiaResolver.csproj +++ b/GoogleTestAdapter/DiaResolver/DiaResolver.csproj @@ -44,7 +44,7 @@ - $(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.DiaResolver.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.DiaResolver.lcl Microsoft diff --git a/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj b/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj index 1cee0ec0e..4975a2c60 100644 --- a/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj +++ b/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj @@ -44,7 +44,7 @@ - $(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\NewProjectWizard.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\NewProjectWizard.lcl $(LSBuildRoot)\MCP_excludeBaml.lss diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index 4b5d254fd..30a1f7fba 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -44,7 +44,7 @@ - $(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.TestAdapter.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.TestAdapter.lcl Microsoft diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj index 008709c5d..5aeced5d7 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj +++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj @@ -211,7 +211,7 @@ - $(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\GoogleTestAdapter.VsPackage.TAfGT.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.VsPackage.TAfGT.lcl Microsoft From 8b8bb1a11a671030f980b26904814ea3f9d960ee Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Mon, 25 Sep 2017 14:14:46 -0700 Subject: [PATCH 2/8] fix path to lcl files --- .../Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj | 2 +- GoogleTestAdapter/Core/Core.csproj | 2 +- GoogleTestAdapter/DiaResolver/DiaResolver.csproj | 2 +- GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj | 2 +- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 2 +- GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj b/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj index 55c2b9232..f3ad945d6 100644 --- a/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj +++ b/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj @@ -40,7 +40,7 @@ - $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.dll.lcl Microsoft diff --git a/GoogleTestAdapter/Core/Core.csproj b/GoogleTestAdapter/Core/Core.csproj index 84f07cf53..f6396d155 100644 --- a/GoogleTestAdapter/Core/Core.csproj +++ b/GoogleTestAdapter/Core/Core.csproj @@ -42,7 +42,7 @@ - $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Core.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Core.dll.lcl Microsoft diff --git a/GoogleTestAdapter/DiaResolver/DiaResolver.csproj b/GoogleTestAdapter/DiaResolver/DiaResolver.csproj index db31bc745..92b94911f 100644 --- a/GoogleTestAdapter/DiaResolver/DiaResolver.csproj +++ b/GoogleTestAdapter/DiaResolver/DiaResolver.csproj @@ -44,7 +44,7 @@ - $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.DiaResolver.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.DiaResolver.dll.lcl Microsoft diff --git a/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj b/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj index 4975a2c60..4e176f362 100644 --- a/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj +++ b/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj @@ -44,7 +44,7 @@ - $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\NewProjectWizard.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\NewProjectWizard.dll.lcl $(LSBuildRoot)\MCP_excludeBaml.lss diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index 30a1f7fba..68fff4904 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -44,7 +44,7 @@ - $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.TestAdapter.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.TestAdapter.dll.lcl Microsoft diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj index 5aeced5d7..9cb3a9132 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj +++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj @@ -211,7 +211,7 @@ - $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.VsPackage.TAfGT.lcl + $(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.VsPackage.TAfGT.dll.lcl Microsoft From 5d53302f079638ad06bdb6625e5a2051b809ea32 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Sep 2017 13:23:51 -0700 Subject: [PATCH 3/8] mark vsix proj at not component --- GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj index aea1d8304..0b68cf812 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -26,7 +26,6 @@ true true false - true true From ab81d7f9e384cd15c2385f2fed786f552473ec45 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Sep 2017 17:46:13 -0700 Subject: [PATCH 4/8] add common dynamic projects to setversion --- GoogleTestAdapter/SetVersion.ps1 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/GoogleTestAdapter/SetVersion.ps1 b/GoogleTestAdapter/SetVersion.ps1 index a1524aef2..18dc86f67 100644 --- a/GoogleTestAdapter/SetVersion.ps1 +++ b/GoogleTestAdapter/SetVersion.ps1 @@ -2,6 +2,9 @@ Param([parameter(Mandatory=$true)] [string] $version) $common_assembly_info = "Common\Properties\AssemblyInfo.cs" +$common_dynamic_gta_assembly_info = "Common.Dynamic.GTA\Properties\AssemblyInfo" +$common_dynamic_tafgt_assembly_info = "Common.Dynamic.TAfGT\Properties\AssemblyInfo" + $core_assembly_info = "Core\Properties\AssemblyInfo.cs" $coretests_assembly_info = "Core.Tests\Properties\AssemblyInfo.cs" @@ -28,6 +31,9 @@ $wizard_assembly_info = "NewProjectWizard\Properties\AssemblyInfo.cs" (Get-Content $common_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $common_assembly_info +(Get-Content $common_dynamic_gta_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $common_dynamic_gta_assembly_info +(Get-Content $common_dynamic_tafgt_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $common_dynamic_tafgt_assembly_info + (Get-Content $core_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $core_assembly_info (Get-Content $coretests_assembly_info) | ForEach-Object { $_ -replace "0.1.0.0", $version } | Set-Content $coretests_assembly_info From df97d103a9a37468c0df3f067d9510e6a42714b6 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Sep 2017 17:49:00 -0700 Subject: [PATCH 5/8] fix path --- GoogleTestAdapter/SetVersion.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestAdapter/SetVersion.ps1 b/GoogleTestAdapter/SetVersion.ps1 index 18dc86f67..bef19a23c 100644 --- a/GoogleTestAdapter/SetVersion.ps1 +++ b/GoogleTestAdapter/SetVersion.ps1 @@ -2,8 +2,8 @@ Param([parameter(Mandatory=$true)] [string] $version) $common_assembly_info = "Common\Properties\AssemblyInfo.cs" -$common_dynamic_gta_assembly_info = "Common.Dynamic.GTA\Properties\AssemblyInfo" -$common_dynamic_tafgt_assembly_info = "Common.Dynamic.TAfGT\Properties\AssemblyInfo" +$common_dynamic_gta_assembly_info = "Common.Dynamic.GTA\Properties\AssemblyInfo.cs" +$common_dynamic_tafgt_assembly_info = "Common.Dynamic.TAfGT\Properties\AssemblyInfo.cs" $core_assembly_info = "Core\Properties\AssemblyInfo.cs" $coretests_assembly_info = "Core.Tests\Properties\AssemblyInfo.cs" From 4be1c597c6ea4e7732af5df138a35f13ee2f49c5 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Thu, 28 Sep 2017 16:42:15 -0700 Subject: [PATCH 6/8] remove unnecessary swix res and add option to set isproductcomonent for setup --- .../Packaging.TAfGT/Packaging.TAfGT.csproj | 1 + ...o.VC.Ide.TestAdapterForGoogleTest.swixproj | 42 ------------------- ...Studio.VC.Ide.TestAdapterForGoogleTest.swr | 14 ------- ....VC.Ide.TestAdapterForGoogleTest.vsmanproj | 24 ----------- 4 files changed, 1 insertion(+), 80 deletions(-) delete mode 100644 swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swixproj delete mode 100644 swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swr delete mode 100644 swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj index 0b68cf812..5436d0612 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -26,6 +26,7 @@ true true false + $(IsProductComponent) true diff --git a/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swixproj b/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swixproj deleted file mode 100644 index f3f032461..000000000 --- a/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swixproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - neutral - false - Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest - manifest - true - 15.0 - 16.0 - - - - $(OutputPath)..\Packaging.TAfGT - - - - - - - - - - - $(PackagePreprocessorDefinitions); - VsixOutDir=$(VsixOutDir); - Version=$(BuildVersion); - VSGeneralVersion=$(VSGeneralVersion); - VSNextGeneralVersion=$(VSNextGeneralVersion); - - - - - - - - diff --git a/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swr b/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swr deleted file mode 100644 index 5b9f0a956..000000000 --- a/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.swr +++ /dev/null @@ -1,14 +0,0 @@ -use vs - -package name=Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest - version=$(Version) - vs.package.type=vsix - vs.package.installSize=22265856 - vs.package.vsixId=GoogleTestAdapterVSIX.8486b54e-5768-482b-b224-7d069ca509d8 - -vs.payloads - vs.payload source=$(VsixOutDir)\Packaging.TAfGT.vsix - -vs.dependencies - vs.dependency id=Microsoft.VisualStudio.MinShell - version=[$(VSGeneralVersion),$(VSNextGeneralVersion)) diff --git a/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj b/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj deleted file mode 100644 index b50ad5f61..000000000 --- a/swix/res/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - true - true - - - false - - - - - - - - - - - - \ No newline at end of file From 74f6fcb507824da4ade1e23a22f188c738e6bbef Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 29 Sep 2017 15:10:21 -0700 Subject: [PATCH 7/8] check if property is set to true in microbuild before setting it --- 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 5436d0612..d13fbecce 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -26,7 +26,7 @@ true true false - $(IsProductComponent) + true true From e511f7b80c70a1280cfc2fb86941482fee850b05 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Fri, 29 Sep 2017 15:16:53 -0700 Subject: [PATCH 8/8] rename microbuild variable for clarity --- 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 d13fbecce..49996d3cf 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -26,7 +26,7 @@ true true false - true + true true