From 1f0d63ec75217573c546f52c2925179549eb5210 Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Fri, 15 Jan 2021 15:03:23 -0800 Subject: [PATCH 1/4] Speculatively fix nuget packages --- .../Common.Dynamic.GTA/Common.Dynamic.GTA.csproj | 4 ++-- .../Common.Dynamic.TAfGT.csproj | 4 ++-- GoogleTestAdapter/Common/Common.csproj | 4 ++-- GoogleTestAdapter/Core/Core.csproj | 4 ++-- GoogleTestAdapter/DiaResolver/DiaResolver.csproj | 4 ++-- .../NewProjectWizard/NewProjectWizard.csproj | 8 ++++---- .../Packaging.GTA/Packaging.GTA.csproj | 4 ++-- .../Packaging.TAfGT/Packaging.TAfGT.csproj | 4 ++-- .../TestAdapter.Tests/TestAdapter.Tests.csproj | 6 +++--- .../TestAdapter.Tests/packages.config.tt | 4 ++-- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 10 +++++----- GoogleTestAdapter/TestAdapter/packages.config.tt | 4 ++-- .../VsPackage.GTA/VsPackage.GTA.csproj | 10 +++++----- GoogleTestAdapter/VsPackage.GTA/packages.config | 2 +- .../VsPackage.TAfGT/VsPackage.TAfGT.csproj | 14 +++++++------- GoogleTestAdapter/VsPackage.TAfGT/packages.config | 6 +++--- GoogleTestNuGet/Build.ps1 | 8 ++++---- GoogleTestNuGet/googletest.SignNuGet.proj | 4 ++-- NuGet.config | 4 +++- ...tudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj | 4 ++-- swix/packages.config | 2 +- 21 files changed, 58 insertions(+), 56 deletions(-) diff --git a/GoogleTestAdapter/Common.Dynamic.GTA/Common.Dynamic.GTA.csproj b/GoogleTestAdapter/Common.Dynamic.GTA/Common.Dynamic.GTA.csproj index 042f88e2d..c6bb845f2 100644 --- a/GoogleTestAdapter/Common.Dynamic.GTA/Common.Dynamic.GTA.csproj +++ b/GoogleTestAdapter/Common.Dynamic.GTA/Common.Dynamic.GTA.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -63,7 +63,7 @@ - + if exist "$(SolutionDir)Keys\Key_Release.snk" ( echo Using Release key for signing assembly diff --git a/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj b/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj index 165c44fd7..c9ee97eef 100644 --- a/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj +++ b/GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -80,7 +80,7 @@ - + if exist "$(SolutionDir)Keys\Key_Release.snk" ( echo Using Release key for signing assembly diff --git a/GoogleTestAdapter/Common/Common.csproj b/GoogleTestAdapter/Common/Common.csproj index 8513c215d..7a147b77e 100644 --- a/GoogleTestAdapter/Common/Common.csproj +++ b/GoogleTestAdapter/Common/Common.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -63,7 +63,7 @@ - + if exist "$(SolutionDir)Keys\Key_Release.snk" ( echo Using Release key for signing assembly diff --git a/GoogleTestAdapter/Core/Core.csproj b/GoogleTestAdapter/Core/Core.csproj index 437ebf1c9..6b62aa9ca 100644 --- a/GoogleTestAdapter/Core/Core.csproj +++ b/GoogleTestAdapter/Core/Core.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -145,7 +145,7 @@ - + if exist "$(SolutionDir)Keys\Key_Release.snk" ( echo Using Release key for signing assembly diff --git a/GoogleTestAdapter/DiaResolver/DiaResolver.csproj b/GoogleTestAdapter/DiaResolver/DiaResolver.csproj index 0893300d3..6ee7c2275 100644 --- a/GoogleTestAdapter/DiaResolver/DiaResolver.csproj +++ b/GoogleTestAdapter/DiaResolver/DiaResolver.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -108,7 +108,7 @@ - + if exist "$(SolutionDir)Keys\Key_Release.snk" ( echo Using Release key for signing assembly diff --git a/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj b/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj index c3f05a264..673d962db 100644 --- a/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj +++ b/GoogleTestAdapter/NewProjectWizard/NewProjectWizard.csproj @@ -1,7 +1,7 @@  - + Debug @@ -165,13 +165,13 @@ - + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + diff --git a/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj b/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj index 74cbe5529..7e099e968 100644 --- a/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj +++ b/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj @@ -2,7 +2,7 @@ - + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -109,7 +109,7 @@ - + diff --git a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj index b185fa349..07ddc7c66 100644 --- a/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj +++ b/GoogleTestAdapter/Packaging.TAfGT/Packaging.TAfGT.csproj @@ -2,7 +2,7 @@ - + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -181,7 +181,7 @@ - + \ No newline at end of file diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj index 32791190b..9b27592b2 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj +++ b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj @@ -53,14 +53,14 @@ True - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll True - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll True @@ -68,7 +68,7 @@ True - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.15.0.26510-d15rel\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll True diff --git a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt index 359d9adf7..49677e154 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter.Tests/packages.config.tt @@ -10,8 +10,8 @@ <# } else if (TestAdapterFlavor == "TAfGT") { #> - - + + <# } #> \ No newline at end of file diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index b74f57aef..f6bbc6cff 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -2,7 +2,7 @@ - + Debug AnyCPU @@ -134,14 +134,14 @@ False - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.11.0.0\lib\net35\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False @@ -149,7 +149,7 @@ False - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.15.0.26510-d15rel\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll False @@ -256,7 +256,7 @@ - + if exist "$(SolutionDir)Keys\Key_Release.snk" ( echo Using Release key for signing assembly diff --git a/GoogleTestAdapter/TestAdapter/packages.config.tt b/GoogleTestAdapter/TestAdapter/packages.config.tt index 732cda6be..e0bb10aa1 100644 --- a/GoogleTestAdapter/TestAdapter/packages.config.tt +++ b/GoogleTestAdapter/TestAdapter/packages.config.tt @@ -30,7 +30,7 @@ <# } else if (TestAdapterFlavor == "TAfGT") { #> - - + + <# } #> \ No newline at end of file diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index f9b9c0288..cf98669f9 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -1,7 +1,7 @@  - + 15.0 11.0 @@ -101,7 +101,7 @@ - + @@ -323,8 +323,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + \ No newline at end of file diff --git a/GoogleTestAdapter/VsPackage.GTA/packages.config b/GoogleTestAdapter/VsPackage.GTA/packages.config index cb463d7a3..5cd1b84d5 100644 --- a/GoogleTestAdapter/VsPackage.GTA/packages.config +++ b/GoogleTestAdapter/VsPackage.GTA/packages.config @@ -1,7 +1,7 @@  - + diff --git a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj index 28fe6af27..af7f25e49 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj +++ b/GoogleTestAdapter/VsPackage.TAfGT/VsPackage.TAfGT.csproj @@ -1,7 +1,7 @@  - + 15.0 11.0 @@ -183,14 +183,14 @@ False - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.TestPlatform.CoreUtilities.dll - $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.1\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + $(NuGetPackages)Microsoft.TestPlatform.ObjectModel.15.0.0\lib\net46\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll False - $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.15.0.26510-d15rel\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll False @@ -284,10 +284,10 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + diff --git a/GoogleTestAdapter/VsPackage.TAfGT/packages.config b/GoogleTestAdapter/VsPackage.TAfGT/packages.config index 832b99531..f3a3af0ab 100644 --- a/GoogleTestAdapter/VsPackage.TAfGT/packages.config +++ b/GoogleTestAdapter/VsPackage.TAfGT/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/GoogleTestNuGet/Build.ps1 b/GoogleTestNuGet/Build.ps1 index 6fba22b85..4b3afe173 100644 --- a/GoogleTestNuGet/Build.ps1 +++ b/GoogleTestNuGet/Build.ps1 @@ -129,8 +129,8 @@ function Add-Signing { $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") - $MicroBuildProps.SetAttribute("Condition", "Exists('$PSScriptRoot\..\NuGetPackages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')") + $MicroBuildProps.SetAttribute("Project", "$PSScriptRoot\..\NuGetPackages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props") + $MicroBuildProps.SetAttribute("Condition", "Exists('$PSScriptRoot\..\NuGetPackages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.props')") $RealSignGroup = $xml.CreateElement("PropertyGroup", "http://schemas.microsoft.com/developer/msbuild/2003") $RealSignGroup.SetAttribute("Condition", "'`$(RealSign)' == 'True'") @@ -164,8 +164,8 @@ function Add-Signing { $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") - $MicroBuildTargets.SetAttribute("Condition", "Exists('$PSScriptRoot\..\NuGetPackages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')") + $MicroBuildTargets.SetAttribute("Project", "$PSScriptRoot\..\NuGetPackages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets") + $MicroBuildTargets.SetAttribute("Condition", "Exists('$PSScriptRoot\..\NuGetPackages\Microsoft.VisualStudioEng.MicroBuild.Core.0.4.1\build\Microsoft.VisualStudioEng.MicroBuild.Core.targets')") $xml.Project.AppendChild($MicroBuildProps) | Out-Null $xml.Project.AppendChild($RealSignGroup) | Out-Null diff --git a/GoogleTestNuGet/googletest.SignNuGet.proj b/GoogleTestNuGet/googletest.SignNuGet.proj index 10015327a..1ab92d0ea 100644 --- a/GoogleTestNuGet/googletest.SignNuGet.proj +++ b/GoogleTestNuGet/googletest.SignNuGet.proj @@ -1,7 +1,7 @@ - + {9C5FB75F-BE2A-4358-A2C8-E950EB2A027A} $(FlavoredTargetFrameworkVersion) @@ -20,5 +20,5 @@ - + \ No newline at end of file diff --git a/NuGet.config b/NuGet.config index 990da8be2..30b076424 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,9 @@ - + + + diff --git a/swix/core/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj b/swix/core/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj index 760f2c1b3..c7f5c654c 100644 --- a/swix/core/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj +++ b/swix/core/Microsoft.VisualStudio.VC.Ide.TestAdapterForGoogleTest.vsmanproj @@ -11,11 +11,11 @@ - + - + \ No newline at end of file diff --git a/swix/packages.config b/swix/packages.config index 263143fe4..1654c4f41 100644 --- a/swix/packages.config +++ b/swix/packages.config @@ -1,5 +1,5 @@ - + \ No newline at end of file From aa5e1030c69d5e2b9bceb6592b694189db74a0cc Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Fri, 15 Jan 2021 15:08:06 -0800 Subject: [PATCH 2/4] missing nuget.config change --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 30b076424..5d6912c2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,6 @@ - - From da205670df8f1b8c8008ddfb019fe1fba91b7a35 Mon Sep 17 00:00:00 2001 From: Tristan Labelle Date: Fri, 15 Jan 2021 16:11:47 -0800 Subject: [PATCH 3/4] Fix extra replace --- GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj index cf98669f9..3f6da46b6 100644 --- a/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj +++ b/GoogleTestAdapter/VsPackage.GTA/VsPackage.GTA.csproj @@ -101,7 +101,7 @@ - + From 4a3e4bb8b51baa5f2f469d3bae215dd1a2469e61 Mon Sep 17 00:00:00 2001 From: Spencer Bloom Date: Wed, 27 Jan 2021 13:40:12 -0800 Subject: [PATCH 4/4] update testwindow interfaces version for tafgt --- GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj | 2 +- GoogleTestAdapter/TestAdapter/TestAdapter.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj index 9b27592b2..e84816874 100644 --- a/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj +++ b/GoogleTestAdapter/TestAdapter.Tests/TestAdapter.Tests.csproj @@ -67,7 +67,7 @@ $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll True - + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll True diff --git a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj index f6bbc6cff..4a2be1911 100644 --- a/GoogleTestAdapter/TestAdapter/TestAdapter.csproj +++ b/GoogleTestAdapter/TestAdapter/TestAdapter.csproj @@ -148,7 +148,7 @@ $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll False - + $(NuGetPackages)Microsoft.VisualStudio.TestWindow.Interfaces.11.0.61030\lib\net45\Microsoft.VisualStudio.TestWindow.Interfaces.dll False