From e9dee145f0dc8eb41dfd13d1c11504b64922244b Mon Sep 17 00:00:00 2001
From: Kevin Pilch-Bisson <kevinpi@microsoft.com>
Date: Tue, 12 Jul 2016 16:40:21 -0700
Subject: [PATCH] Remove another place the telemetry VSIX was referenced

---
 ...ft.CodeAnalysis.LanguageServices.vsmanproj |  2 --
 ...deAnalysis.VisualStudio.Telemetry.swixproj | 25 -------------------
 ...ft.CodeAnalysis.VisualStudio.Telemetry.swr | 21 ----------------
 3 files changed, 48 deletions(-)
 delete mode 100644 src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swixproj
 delete mode 100644 src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr

diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj
index caa858cfada..116d87991ba 100644
--- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj
+++ b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj
@@ -21,7 +21,6 @@
     <MSBuild Projects="MicrosoftCodeAnalysisVisualStudioSetup\Microsoft.CodeAnalysis.VisualStudio.Setup.swixproj" Targets="Build" />
     <MSBuild Projects="MicrosoftCodeAnalysisVisualStudioSetupInteractive\Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.swixproj" Targets="Build" />
     <MSBuild Projects="MicrosoftCodeAnalysisVisualStudioSetupNext\Microsoft.CodeAnalysis.VisualStudio.Setup.Next.swixproj" Targets="Build" />
-    <MSBuild Projects="MicrosoftCodeAnalysisVisualStudioTelemetry\Microsoft.CodeAnalysis.VisualStudio.Telemetry.swixproj" Targets="Build" />
   </Target>
 
   <ItemGroup>
@@ -31,6 +30,5 @@
     <MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.json" />
     <MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.json" />
     <MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json" />
-    <MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Telemetry.json" />
   </ItemGroup>
 </Project>
diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swixproj b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swixproj
deleted file mode 100644
index a23ffd0c951..00000000000
--- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swixproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
-  <Import Project="..\..\..\..\..\build\Targets\VSL.Versions.targets" />
-
-  <PropertyGroup>
-    <OutputArchitecture>neutral</OutputArchitecture>
-    <OutputLocalized>false</OutputLocalized>
-    <OutputPath>$(OutDir)Insertion</OutputPath>
-    <OutputType>manifest</OutputType>
-  </PropertyGroup>
-
-  <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.props" />
-
-  <PropertyGroup>
-    <PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Version=$(AssemblyVersion);NextVersion=$(NextAssemblyVersion);OutputPath=$(OutDir);LicenseUri=http://www.microsoft.com</PackagePreprocessorDefinitions>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Package Include="Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr" />
-  </ItemGroup>
-
-  <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.targets" />
-</Project>
diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr
deleted file mode 100644
index 9545db9591f..00000000000
--- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr
+++ /dev/null
@@ -1,21 +0,0 @@
-use vs
-
-package name=Microsoft.CodeAnalysis.VisualStudio.Telemetry
-        version=$(Version)
-        vs.package.chip=neutral
-        vs.package.language=en-us
-        vs.package.type=vsix
-        vs.package.vsixId=28354cb8-c808-4138-bfce-33aa846bbd51
-
-vs.localizedResources
-  vs.localizedResource language=en-us
-                       title="Roslyn Telemetry"
-                       description="Telemetry implementation for Roslyn atop Visual Studio."
-
-vs.payloads
-  vs.payload source=$(OutputPath)Microsoft.VisualStudio.LanguageServices.Telemetry.vsix
-
-vs.dependencies
-  vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup
-                version=[$(Version),$(NextVersion))
-                type=Required
\ No newline at end of file
-- 
GitLab