Retire VsixCreator (microsoft#481)

* Retire VsixCreator * Sign vsix
navin22 · Feb 14, 2017 · 9dbd216 · 9dbd216
1 parent 48a62d2
commit 9dbd216
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 1,107 deletions.
diff --git a/TestPlatform.sln b/TestPlatform.sln
@@ -39,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost.x86", "src\testhos
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console", "src\vstest.console\vstest.console.csproj", "{10B6ADE1-F808-4612-801D-4452F5B52242}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.VSIXCreator", "src\Microsoft.TestPlatform.VSIXCreator\Microsoft.TestPlatform.VSIXCreator.csproj", "{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{46250E12-4CF1-4051-B4A7-80C8C06E0068}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{020E15EA-731F-4667-95AF-226671E0C3AE}"
@@ -322,18 +320,6 @@ Global
 		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.Build.0 = Release|x64
 		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.ActiveCfg = Release|x86
 		{10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.Build.0 = Release|x86
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x86.Build.0 = Debug|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x64.Build.0 = Release|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x86.Build.0 = Release|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x64.ActiveCfg = Debug|x64
@@ -751,7 +737,6 @@ Global
 		{27DFBD04-64B2-4F1B-82B2-006620CCA6F8} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{71CB42FF-E750-4A3B-9C3A-AC938853CC89} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{10B6ADE1-F808-4612-801D-4452F5B52242} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{46250E12-4CF1-4051-B4A7-80C8C06E0068} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{020E15EA-731F-4667-95AF-226671E0C3AE} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{595BE9C1-E10F-4E50-938A-E6C248D3F950} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
@@ -788,8 +773,8 @@ Global
 		{9549C1A4-CB57-4689-B3EB-F752F65F863F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
 		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{CAE652AF-6801-425E-AAF3-AB20DE7DF88E} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
-		{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{FF80D706-8309-4E02-BAC0-D28B4CBCF600} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
+		{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{CB6FA3C6-38E2-4DD1-AAB7-A705EFE114BC} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
 	EndGlobalSection
 EndGlobal
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -289,35 +289,33 @@ function Publish-Package-Internal($packagename, $framework, $output)
 function Create-VsixPackage
 {
     Write-Log "Create-VsixPackage: Started."
+    $timer = Start-Timer
+
+    $packageDir = Get-FullCLRPackageDirectory
+
+    # Copy legacy dependencies
+    $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\15.0.0\contentFiles\any\any"
+    Copy-Item -Recurse $legacyDir\* $packageDir -Force
+
+    # Copy COM Components and their manifests over
+    $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\14.0.0\contentFiles\any\any"
+    Copy-Item -Recurse $comComponentsDirectory\* $packageDir -Force
+
+    $fileToCopy = Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt"
+    Copy-Item $fileToCopy $packageDir -Force
 
     Write-Verbose "Locating MSBuild install path..."
     $msbuildPath = Locate-MSBuildPath
 
     # Create vsix only when msbuild is installed.
     if(![string]::IsNullOrEmpty($msbuildPath))
     {
-        $timer = Start-Timer
-
-        $packageDir = Get-FullCLRPackageDirectory
-
-        # Copy legacy dependencies
-        $legacyDir = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Extensions\15.0.0\contentFiles\any\any"
-        Copy-Item -Recurse $legacyDir\* $packageDir -Force
-
-        # Copy COM Components and their manifests over
-        $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\14.0.0\contentFiles\any\any"
-        Copy-Item -Recurse $comComponentsDirectory\* $packageDir -Force
-
-        $fileToCopy = Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt"
-        Copy-Item $fileToCopy $packageDir -Force
-
         #update version of VSIX
         Update-VsixVersion
 
         # Build vsix project to get TestPlatform.vsix
         Write-Verbose "$msbuildPath\msbuild.exe $TPB_VSIX_DIR\TestPlatform.csproj -p:Configuration=$Configuration"
         & $msbuildPath\msbuild.exe "$TPB_VSIX_DIR\TestPlatform.csproj" -p:Configuration=$Configuration
-
     }
     else
     {

diff --git a/src/Microsoft.TestPlatform.VSIXCreator/CopyTrxToExtension.cmd b/src/Microsoft.TestPlatform.VSIXCreator/CopyTrxToExtension.cmd