From 403bd26a5dada788f362d26637c6691f85b6f0f5 Mon Sep 17 00:00:00 2001
From: Jimmy Lewis <jimmy.lewis@live.com>
Date: Sun, 23 Mar 2025 15:07:19 -0700
Subject: [PATCH] Align test project names and paths

* Renamed the IntegrationTests project to Vsix.IntegrationTests to emphasize that it tests the VSIX functionality
* Changed the path to the Build.Test and Vsix.Test projects to match the other projects (removed Microsoft.Web. prefix from folder name)
---
 LibraryManager.sln                            | 118 +++++++++---------
 .../Properties/AssemblyInfo.cs                |   2 +-
 src/LibraryManager/Properties/AssemblyInfo.cs |   1 -
 src/LibraryManager/SemanticVersion.cs         |   2 +-
 ...osoft.Web.LibraryManager.Build.Test.csproj |   0
 .../MockEngine.cs                             |   0
 .../RestoreTaskTest.cs                        |   0
 .../TaskItem.cs                               |   0
 .../FileSaveRestoreTests.cs                   |   0
 .../Helpers/CompletionHelper.cs               |   0
 .../Helpers/FileIOHelper.cs                   |   0
 .../Helpers/HelperWrapper.cs                  |   0
 .../InstallDialogTests.cs                     |   0
 .../LibmanCompletionTests.cs                  |   0
 ...ibraryManager.Vsix.IntegrationTest.csproj} |   0
 .../Services/InstallDialogTestExtension.cs    |   0
 .../Services/InstallDialogTestService.cs      |   0
 .../Services/InstallDialogVerifier.cs         |   0
 .../SuggestedActionTests.cs                   |   0
 .../Suppressions.cs                           |   0
 .../TestSolution/LooseFiles/filesystem.js     |   0
 .../TestSolution/TestProjectCore20/Program.cs |   0
 .../Properties/launchSettings.json            |   0
 .../TestSolution/TestProjectCore20/Startup.cs |   0
 .../TestProjectCore20.csproj                  |   0
 .../TestProjectCore20/libman.json             |   0
 .../TestProjectCore20/wwwroot/js/site.js      |   0
 .../TestProjectCore20/wwwroot/js/site.min.js  |   0
 .../TestSolution/TestSolution.sln             |   0
 .../VisualStudioLibmanHostTests.cs            |   0
 .../JSONHelpersTest.cs                        |   0
 ...rosoft.Web.LibraryManager.Vsix.Test.csproj |   0
 .../Mocks/NullSearchService.cs                |   0
 .../Search/LocationSearchServiceTests.cs      |   0
 .../ProviderCatalogSearchServiceTests.cs      |   0
 .../Shared/LibraryCommandServiceTest.cs       |   0
 .../CheckBoxAutomationNameConverterTests.cs   |   0
 .../WatermarkVisibilityConverterTests.cs      |   0
 .../UI/Models/InstallDialogViewModelTest.cs   |   0
 .../UI/Models/LibraryIdViewModelTests.cs      |   0
 .../UI/Models/TargetLocationViewModelTests.cs |   0
 41 files changed, 61 insertions(+), 62 deletions(-)
 rename test/{Microsoft.Web.LibraryManager.Build.Test => LibraryManager.Build.Test}/Microsoft.Web.LibraryManager.Build.Test.csproj (100%)
 rename test/{Microsoft.Web.LibraryManager.Build.Test => LibraryManager.Build.Test}/MockEngine.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Build.Test => LibraryManager.Build.Test}/RestoreTaskTest.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Build.Test => LibraryManager.Build.Test}/TaskItem.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/FileSaveRestoreTests.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/Helpers/CompletionHelper.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/Helpers/FileIOHelper.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/Helpers/HelperWrapper.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/InstallDialogTests.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/LibmanCompletionTests.cs (100%)
 rename test/{LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj => LibraryManager.Vsix.IntegrationTest/Microsoft.Web.LibraryManager.Vsix.IntegrationTest.csproj} (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/Services/InstallDialogTestExtension.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/Services/InstallDialogTestService.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/Services/InstallDialogVerifier.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/SuggestedActionTests.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/Suppressions.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/LooseFiles/filesystem.js (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestProjectCore20/Program.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestProjectCore20/Properties/launchSettings.json (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestProjectCore20/Startup.cs (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestProjectCore20/TestProjectCore20.csproj (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestProjectCore20/libman.json (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestProjectCore20/wwwroot/js/site.js (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestProjectCore20/wwwroot/js/site.min.js (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/TestSolution/TestSolution.sln (100%)
 rename test/{LibraryManager.IntegrationTest => LibraryManager.Vsix.IntegrationTest}/VisualStudioLibmanHostTests.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/JSONHelpersTest.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/Microsoft.Web.LibraryManager.Vsix.Test.csproj (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/Mocks/NullSearchService.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/Search/LocationSearchServiceTests.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/Search/ProviderCatalogSearchServiceTests.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/Shared/LibraryCommandServiceTest.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/UI/Converters/CheckBoxAutomationNameConverterTests.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/UI/Converters/WatermarkVisibilityConverterTests.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/UI/Models/InstallDialogViewModelTest.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/UI/Models/LibraryIdViewModelTests.cs (100%)
 rename test/{Microsoft.Web.LibraryManager.Vsix.Test => LibraryManager.Vsix.Test}/UI/Models/TargetLocationViewModelTests.cs (100%)

diff --git a/LibraryManager.sln b/LibraryManager.sln
index b9453fa2a..b453e8c15 100644
--- a/LibraryManager.sln
+++ b/LibraryManager.sln
@@ -45,16 +45,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManage
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Build", "src\LibraryManager.Build\Microsoft.Web.LibraryManager.Build.csproj", "{7536DF26-B808-4AC2-A9DA-58E408A1E05B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Build.Test", "test\Microsoft.Web.LibraryManager.Build.Test\Microsoft.Web.LibraryManager.Build.Test.csproj", "{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libman", "src\libman\libman.csproj", "{E98B5AB3-E58F-482A-8A81-829CFEA63E31}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libman.Test", "Test\libman.Test\libman.Test.csproj", "{AD605AA7-6E43-47F1-A096-1ACDF67BF1DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.IntegrationTest", "test\LibraryManager.IntegrationTest\Microsoft.Web.LibraryManager.IntegrationTest.csproj", "{E9BE3307-5F07-4757-BB06-3460813D7B9D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Vsix.Test", "test\Microsoft.Web.LibraryManager.Vsix.Test\Microsoft.Web.LibraryManager.Vsix.Test.csproj", "{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.LibraryManager.Contracts.Test", "test\LibraryManager.Contracts.Test\Microsoft.Web.LibraryManager.Contracts.Test.csproj", "{514120AD-8F89-476A-8AB3-F582E6CA8697}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "schema", "schema", "{4B76692E-EF61-499F-900F-752FFC08D6E9}"
@@ -62,6 +56,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "schema", "schema", "{4B7669
 		src\schema\libman.json = src\schema\libman.json
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix.IntegrationTest", "test\LibraryManager.Vsix.IntegrationTest\Microsoft.Web.LibraryManager.Vsix.IntegrationTest.csproj", "{F01D971D-AA93-60A2-2D84-05AF9AB1566F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Vsix.Test", "test\LibraryManager.Vsix.Test\Microsoft.Web.LibraryManager.Vsix.Test.csproj", "{E199195A-7EE8-9273-37B1-3726BCEAB87A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Web.LibraryManager.Build.Test", "test\LibraryManager.Build.Test\Microsoft.Web.LibraryManager.Build.Test.csproj", "{C8979E80-F4D3-3F21-D966-1B317CA64C23}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,18 +72,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x64.Build.0 = Debug|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x86.Build.0 = Debug|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x64.ActiveCfg = Release|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x64.Build.0 = Release|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x86.Build.0 = Release|Any CPU
 		{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -96,6 +84,18 @@ Global
 		{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}.Release|x64.Build.0 = Release|Any CPU
 		{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}.Release|x86.ActiveCfg = Release|Any CPU
 		{EDA2179C-D952-449F-9A3D-8B3A152D6E5A}.Release|x86.Build.0 = Release|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x64.Build.0 = Debug|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Debug|x86.Build.0 = Debug|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x64.ActiveCfg = Release|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x64.Build.0 = Release|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x86.ActiveCfg = Release|Any CPU
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2}.Release|x86.Build.0 = Release|Any CPU
 		{08C91CC3-4057-4D76-8B9A-B6A0557B64EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08C91CC3-4057-4D76-8B9A-B6A0557B64EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08C91CC3-4057-4D76-8B9A-B6A0557B64EB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -144,18 +144,6 @@ Global
 		{7536DF26-B808-4AC2-A9DA-58E408A1E05B}.Release|x64.Build.0 = Release|Any CPU
 		{7536DF26-B808-4AC2-A9DA-58E408A1E05B}.Release|x86.ActiveCfg = Release|Any CPU
 		{7536DF26-B808-4AC2-A9DA-58E408A1E05B}.Release|x86.Build.0 = Release|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Debug|x64.Build.0 = Debug|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Debug|x86.Build.0 = Debug|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Release|x64.ActiveCfg = Release|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Release|x64.Build.0 = Release|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Release|x86.ActiveCfg = Release|Any CPU
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34}.Release|x86.Build.0 = Release|Any CPU
 		{E98B5AB3-E58F-482A-8A81-829CFEA63E31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E98B5AB3-E58F-482A-8A81-829CFEA63E31}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E98B5AB3-E58F-482A-8A81-829CFEA63E31}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -180,30 +168,6 @@ Global
 		{AD605AA7-6E43-47F1-A096-1ACDF67BF1DB}.Release|x64.Build.0 = Release|Any CPU
 		{AD605AA7-6E43-47F1-A096-1ACDF67BF1DB}.Release|x86.ActiveCfg = Release|Any CPU
 		{AD605AA7-6E43-47F1-A096-1ACDF67BF1DB}.Release|x86.Build.0 = Release|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Debug|x64.Build.0 = Debug|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Debug|x86.Build.0 = Debug|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Release|x64.ActiveCfg = Release|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Release|x64.Build.0 = Release|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Release|x86.ActiveCfg = Release|Any CPU
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D}.Release|x86.Build.0 = Release|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Debug|x64.Build.0 = Debug|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Debug|x86.Build.0 = Debug|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Release|x64.ActiveCfg = Release|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Release|x64.Build.0 = Release|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Release|x86.ActiveCfg = Release|Any CPU
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB}.Release|x86.Build.0 = Release|Any CPU
 		{514120AD-8F89-476A-8AB3-F582E6CA8697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{514120AD-8F89-476A-8AB3-F582E6CA8697}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{514120AD-8F89-476A-8AB3-F582E6CA8697}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -216,24 +180,60 @@ Global
 		{514120AD-8F89-476A-8AB3-F582E6CA8697}.Release|x64.Build.0 = Release|Any CPU
 		{514120AD-8F89-476A-8AB3-F582E6CA8697}.Release|x86.ActiveCfg = Release|Any CPU
 		{514120AD-8F89-476A-8AB3-F582E6CA8697}.Release|x86.Build.0 = Release|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Debug|x64.Build.0 = Debug|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Debug|x86.Build.0 = Debug|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Release|x64.ActiveCfg = Release|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Release|x64.Build.0 = Release|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F}.Release|x86.Build.0 = Release|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Debug|x86.Build.0 = Debug|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Release|x64.Build.0 = Release|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A}.Release|x86.Build.0 = Release|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Debug|x86.Build.0 = Debug|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Release|x64.Build.0 = Release|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{707356DD-96B9-49F6-AF2A-9D23B857A1E2} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
 		{EDA2179C-D952-449F-9A3D-8B3A152D6E5A} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
+		{707356DD-96B9-49F6-AF2A-9D23B857A1E2} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
 		{08C91CC3-4057-4D76-8B9A-B6A0557B64EB} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
 		{FF466454-426B-4AD7-8B00-D50011BE716F} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
 		{18F82568-446D-4729-B65E-EB9DF21C3636} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
 		{7536DF26-B808-4AC2-A9DA-58E408A1E05B} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
-		{E6AAC5E4-91A3-40D7-9917-B50CB16F0B34} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
 		{E98B5AB3-E58F-482A-8A81-829CFEA63E31} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
 		{AD605AA7-6E43-47F1-A096-1ACDF67BF1DB} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
-		{E9BE3307-5F07-4757-BB06-3460813D7B9D} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
-		{00EE7B7F-EDA3-49E6-AA38-118C15B58CDB} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
-		{4B76692E-EF61-499F-900F-752FFC08D6E9} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
 		{514120AD-8F89-476A-8AB3-F582E6CA8697} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
+		{4B76692E-EF61-499F-900F-752FFC08D6E9} = {A72570B1-99EF-4BDD-B629-321CD56C9F7F}
+		{F01D971D-AA93-60A2-2D84-05AF9AB1566F} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
+		{E199195A-7EE8-9273-37B1-3726BCEAB87A} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
+		{C8979E80-F4D3-3F21-D966-1B317CA64C23} = {FFCD12F4-5CE2-4CC2-A2C4-EACC8F387D7A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {720C6A7F-67F7-4D00-881F-D3CDEA7ABE69}
diff --git a/src/LibraryManager.Vsix/Properties/AssemblyInfo.cs b/src/LibraryManager.Vsix/Properties/AssemblyInfo.cs
index ab12e5e5c..34d80f907 100644
--- a/src/LibraryManager.Vsix/Properties/AssemblyInfo.cs
+++ b/src/LibraryManager.Vsix/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
 [assembly: ComVisible(false)]
 
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-[assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.IntegrationTest")]
+[assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.Vsix.IntegrationTest")]
 [assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.Vsix.Test")]
 
 // TODO: Setting the NeutralResourcesLanguage attribute breaks our menu commands.
diff --git a/src/LibraryManager/Properties/AssemblyInfo.cs b/src/LibraryManager/Properties/AssemblyInfo.cs
index b6dc89eab..ac1d1b6eb 100644
--- a/src/LibraryManager/Properties/AssemblyInfo.cs
+++ b/src/LibraryManager/Properties/AssemblyInfo.cs
@@ -7,7 +7,6 @@
 [assembly: NeutralResourcesLanguage("en")]
 [assembly: InternalsVisibleTo("libman")]
 [assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.Build")]
-[assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.IntegrationTest")]
 [assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.Test")]
 [assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.Vsix")]
 [assembly: InternalsVisibleTo("Microsoft.Web.LibraryManager.Vsix.Test")]
diff --git a/src/LibraryManager/SemanticVersion.cs b/src/LibraryManager/SemanticVersion.cs
index 625099359..713270ebd 100644
--- a/src/LibraryManager/SemanticVersion.cs
+++ b/src/LibraryManager/SemanticVersion.cs
@@ -48,7 +48,7 @@ private SemanticVersion(string originalText)
             OriginalText = originalText;
         }
 
-        internal static SemanticVersion Parse(string value)
+        public static SemanticVersion Parse(string value)
         {
             SemanticVersion ver = new SemanticVersion(value);
 
diff --git a/test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj b/test/LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj
rename to test/LibraryManager.Build.Test/Microsoft.Web.LibraryManager.Build.Test.csproj
diff --git a/test/Microsoft.Web.LibraryManager.Build.Test/MockEngine.cs b/test/LibraryManager.Build.Test/MockEngine.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Build.Test/MockEngine.cs
rename to test/LibraryManager.Build.Test/MockEngine.cs
diff --git a/test/Microsoft.Web.LibraryManager.Build.Test/RestoreTaskTest.cs b/test/LibraryManager.Build.Test/RestoreTaskTest.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Build.Test/RestoreTaskTest.cs
rename to test/LibraryManager.Build.Test/RestoreTaskTest.cs
diff --git a/test/Microsoft.Web.LibraryManager.Build.Test/TaskItem.cs b/test/LibraryManager.Build.Test/TaskItem.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Build.Test/TaskItem.cs
rename to test/LibraryManager.Build.Test/TaskItem.cs
diff --git a/test/LibraryManager.IntegrationTest/FileSaveRestoreTests.cs b/test/LibraryManager.Vsix.IntegrationTest/FileSaveRestoreTests.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/FileSaveRestoreTests.cs
rename to test/LibraryManager.Vsix.IntegrationTest/FileSaveRestoreTests.cs
diff --git a/test/LibraryManager.IntegrationTest/Helpers/CompletionHelper.cs b/test/LibraryManager.Vsix.IntegrationTest/Helpers/CompletionHelper.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Helpers/CompletionHelper.cs
rename to test/LibraryManager.Vsix.IntegrationTest/Helpers/CompletionHelper.cs
diff --git a/test/LibraryManager.IntegrationTest/Helpers/FileIOHelper.cs b/test/LibraryManager.Vsix.IntegrationTest/Helpers/FileIOHelper.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Helpers/FileIOHelper.cs
rename to test/LibraryManager.Vsix.IntegrationTest/Helpers/FileIOHelper.cs
diff --git a/test/LibraryManager.IntegrationTest/Helpers/HelperWrapper.cs b/test/LibraryManager.Vsix.IntegrationTest/Helpers/HelperWrapper.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Helpers/HelperWrapper.cs
rename to test/LibraryManager.Vsix.IntegrationTest/Helpers/HelperWrapper.cs
diff --git a/test/LibraryManager.IntegrationTest/InstallDialogTests.cs b/test/LibraryManager.Vsix.IntegrationTest/InstallDialogTests.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/InstallDialogTests.cs
rename to test/LibraryManager.Vsix.IntegrationTest/InstallDialogTests.cs
diff --git a/test/LibraryManager.IntegrationTest/LibmanCompletionTests.cs b/test/LibraryManager.Vsix.IntegrationTest/LibmanCompletionTests.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/LibmanCompletionTests.cs
rename to test/LibraryManager.Vsix.IntegrationTest/LibmanCompletionTests.cs
diff --git a/test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj b/test/LibraryManager.Vsix.IntegrationTest/Microsoft.Web.LibraryManager.Vsix.IntegrationTest.csproj
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Microsoft.Web.LibraryManager.IntegrationTest.csproj
rename to test/LibraryManager.Vsix.IntegrationTest/Microsoft.Web.LibraryManager.Vsix.IntegrationTest.csproj
diff --git a/test/LibraryManager.IntegrationTest/Services/InstallDialogTestExtension.cs b/test/LibraryManager.Vsix.IntegrationTest/Services/InstallDialogTestExtension.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Services/InstallDialogTestExtension.cs
rename to test/LibraryManager.Vsix.IntegrationTest/Services/InstallDialogTestExtension.cs
diff --git a/test/LibraryManager.IntegrationTest/Services/InstallDialogTestService.cs b/test/LibraryManager.Vsix.IntegrationTest/Services/InstallDialogTestService.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Services/InstallDialogTestService.cs
rename to test/LibraryManager.Vsix.IntegrationTest/Services/InstallDialogTestService.cs
diff --git a/test/LibraryManager.IntegrationTest/Services/InstallDialogVerifier.cs b/test/LibraryManager.Vsix.IntegrationTest/Services/InstallDialogVerifier.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Services/InstallDialogVerifier.cs
rename to test/LibraryManager.Vsix.IntegrationTest/Services/InstallDialogVerifier.cs
diff --git a/test/LibraryManager.IntegrationTest/SuggestedActionTests.cs b/test/LibraryManager.Vsix.IntegrationTest/SuggestedActionTests.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/SuggestedActionTests.cs
rename to test/LibraryManager.Vsix.IntegrationTest/SuggestedActionTests.cs
diff --git a/test/LibraryManager.IntegrationTest/Suppressions.cs b/test/LibraryManager.Vsix.IntegrationTest/Suppressions.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/Suppressions.cs
rename to test/LibraryManager.Vsix.IntegrationTest/Suppressions.cs
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/LooseFiles/filesystem.js b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/LooseFiles/filesystem.js
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/LooseFiles/filesystem.js
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/LooseFiles/filesystem.js
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/Program.cs b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/Program.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/Program.cs
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/Program.cs
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/Properties/launchSettings.json b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/Properties/launchSettings.json
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/Properties/launchSettings.json
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/Properties/launchSettings.json
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/Startup.cs b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/Startup.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/Startup.cs
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/Startup.cs
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/TestProjectCore20.csproj b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/TestProjectCore20.csproj
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/TestProjectCore20.csproj
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/TestProjectCore20.csproj
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/libman.json b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/libman.json
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/libman.json
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/libman.json
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.js b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.js
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.js
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.js
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.min.js b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.min.js
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.min.js
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestProjectCore20/wwwroot/js/site.min.js
diff --git a/test/LibraryManager.IntegrationTest/TestSolution/TestSolution.sln b/test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestSolution.sln
similarity index 100%
rename from test/LibraryManager.IntegrationTest/TestSolution/TestSolution.sln
rename to test/LibraryManager.Vsix.IntegrationTest/TestSolution/TestSolution.sln
diff --git a/test/LibraryManager.IntegrationTest/VisualStudioLibmanHostTests.cs b/test/LibraryManager.Vsix.IntegrationTest/VisualStudioLibmanHostTests.cs
similarity index 100%
rename from test/LibraryManager.IntegrationTest/VisualStudioLibmanHostTests.cs
rename to test/LibraryManager.Vsix.IntegrationTest/VisualStudioLibmanHostTests.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/JSONHelpersTest.cs b/test/LibraryManager.Vsix.Test/JSONHelpersTest.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/JSONHelpersTest.cs
rename to test/LibraryManager.Vsix.Test/JSONHelpersTest.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj b/test/LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj
rename to test/LibraryManager.Vsix.Test/Microsoft.Web.LibraryManager.Vsix.Test.csproj
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/Mocks/NullSearchService.cs b/test/LibraryManager.Vsix.Test/Mocks/NullSearchService.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/Mocks/NullSearchService.cs
rename to test/LibraryManager.Vsix.Test/Mocks/NullSearchService.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/Search/LocationSearchServiceTests.cs b/test/LibraryManager.Vsix.Test/Search/LocationSearchServiceTests.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/Search/LocationSearchServiceTests.cs
rename to test/LibraryManager.Vsix.Test/Search/LocationSearchServiceTests.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/Search/ProviderCatalogSearchServiceTests.cs b/test/LibraryManager.Vsix.Test/Search/ProviderCatalogSearchServiceTests.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/Search/ProviderCatalogSearchServiceTests.cs
rename to test/LibraryManager.Vsix.Test/Search/ProviderCatalogSearchServiceTests.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/Shared/LibraryCommandServiceTest.cs b/test/LibraryManager.Vsix.Test/Shared/LibraryCommandServiceTest.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/Shared/LibraryCommandServiceTest.cs
rename to test/LibraryManager.Vsix.Test/Shared/LibraryCommandServiceTest.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Converters/CheckBoxAutomationNameConverterTests.cs b/test/LibraryManager.Vsix.Test/UI/Converters/CheckBoxAutomationNameConverterTests.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Converters/CheckBoxAutomationNameConverterTests.cs
rename to test/LibraryManager.Vsix.Test/UI/Converters/CheckBoxAutomationNameConverterTests.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Converters/WatermarkVisibilityConverterTests.cs b/test/LibraryManager.Vsix.Test/UI/Converters/WatermarkVisibilityConverterTests.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Converters/WatermarkVisibilityConverterTests.cs
rename to test/LibraryManager.Vsix.Test/UI/Converters/WatermarkVisibilityConverterTests.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Models/InstallDialogViewModelTest.cs b/test/LibraryManager.Vsix.Test/UI/Models/InstallDialogViewModelTest.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Models/InstallDialogViewModelTest.cs
rename to test/LibraryManager.Vsix.Test/UI/Models/InstallDialogViewModelTest.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Models/LibraryIdViewModelTests.cs b/test/LibraryManager.Vsix.Test/UI/Models/LibraryIdViewModelTests.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Models/LibraryIdViewModelTests.cs
rename to test/LibraryManager.Vsix.Test/UI/Models/LibraryIdViewModelTests.cs
diff --git a/test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Models/TargetLocationViewModelTests.cs b/test/LibraryManager.Vsix.Test/UI/Models/TargetLocationViewModelTests.cs
similarity index 100%
rename from test/Microsoft.Web.LibraryManager.Vsix.Test/UI/Models/TargetLocationViewModelTests.cs
rename to test/LibraryManager.Vsix.Test/UI/Models/TargetLocationViewModelTests.cs