Remove ApiPort.VisualStudio.2015 (#624)

microsoft · May 2, 2018 · 9aed82f · 9aed82f
1 parent a2cfdca
commit 9aed82f
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 292 deletions.
diff --git a/PortabilityTools.VisualStudio.Imports.targets b/PortabilityTools.VisualStudio.Imports.targets
@@ -13,7 +13,6 @@
   -->
   <Target Name="AddToVsixSources" AfterTargets="GetVsixSourceItems">
     <ItemGroup>
-      <VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.2015.dll" />
       <VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.2017.dll" />
       <VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.Common.dll" />
       <VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.dll" />

diff --git a/PortabilityTools.sln b/PortabilityTools.sln
@@ -66,8 +66,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Cc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Html.Tests", "tests\lib\Microsoft.Fx.Portability.Reports.Html.Tests\Microsoft.Fx.Portability.Reports.Html.Tests.csproj", "{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2015", "src\ApiPort\ApiPort.VisualStudio.2015\ApiPort.VisualStudio.2015.csproj", "{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2017", "src\ApiPort\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj", "{C0629A8D-7107-46CF-83B8-408E1886AB36}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.Common", "src\ApiPort\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj", "{60798B82-B273-4D39-AA52-021C7228A0AD}"
@@ -808,54 +806,6 @@ Global
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x64.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x86.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x64.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x86.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|ARM.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x64.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x64.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x86.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x86.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|ARM.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x64.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x64.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x86.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x86.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
 		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1118,7 +1068,6 @@ Global
 		{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}
 		{6917BF09-E416-43F9-B184-4691AF473271} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
 		{4EDE5B41-A4AD-4BFB-9986-F566FB887A34} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
-		{9DEF460B-6383-4665-839B-C0B5E6BB6A5F} = {0D1724F6-078E-4576-9680-6B9334D562DC}
 		{C0629A8D-7107-46CF-83B8-408E1886AB36} = {0D1724F6-078E-4576-9680-6B9334D562DC}
 		{60798B82-B273-4D39-AA52-021C7228A0AD} = {0D1724F6-078E-4576-9680-6B9334D562DC}
 		{EE708186-6345-486D-9810-17D98439DAAE} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ For a quick introduction, check out [this video on Channel 9][Channel 9 Video]:
 ## Using this Repository
 
 ### Windows
-There is a Visual Studio extension available for VS2017 and VS2015: [.NET Portability Analyzer](https://marketplace.visualstudio.com/items?itemName=ConnieYau.NETPortabilityAnalyzer)
+There is a Visual Studio extension available for VS2017: [.NET Portability Analyzer](https://marketplace.visualstudio.com/items?itemName=ConnieYau.NETPortabilityAnalyzer)
 
 Download and build for yourself:
 1. Install [Visual Studio 2017 with .NET Core Workload][Visual Studio 2017]

diff --git a/docs/HowTo/README.md b/docs/HowTo/README.md
@@ -28,4 +28,4 @@ for another. For details, see [Breaking Changes](BreakingChanges.md).
 
 * [Console Application (.NET Framework)](../Console/README.md)
 * [.NET Core Application](../Console/README.md#using-net-core-application)
-* [Visual Studio 2015 Extension](../VSExtension/README.md)
+* [Visual Studio 2017 Extension](../VSExtension/README.md)
diff --git a/src/ApiPort/ApiPort.VisualStudio.2015/ApiPort.VisualStudio.2015.csproj b/src/ApiPort/ApiPort.VisualStudio.2015/ApiPort.VisualStudio.2015.csproj
diff --git a/src/ApiPort/ApiPort.VisualStudio.2015/ProjectBuilder2015.cs b/src/ApiPort/ApiPort.VisualStudio.2015/ProjectBuilder2015.cs
diff --git a/src/ApiPort/ApiPort.VisualStudio.2015/ServiceProvider.cs b/src/ApiPort/ApiPort.VisualStudio.2015/ServiceProvider.cs
diff --git a/src/ApiPort/ApiPort.VisualStudio.2015/VSThreadingService.cs b/src/ApiPort/ApiPort.VisualStudio.2015/VSThreadingService.cs
diff --git a/src/ApiPort/ApiPort.VisualStudio.Common/ApiPort.VisualStudio.Common.csproj b/src/ApiPort/ApiPort.VisualStudio.Common/ApiPort.VisualStudio.Common.csproj
@@ -16,14 +16,14 @@
 
   <ItemGroup>
     <PackageReference Include="EnvDTE100" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Build" Version="14.3.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="14.0.25424" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
+    <PackageReference Include="Microsoft.Build" Version="15.6.85" />
+    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="15.4.27004" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.4.27004" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.4.4" />
     <PackageReference Include="NuGet.VisualStudio" Version="4.4.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="StreamJsonRpc" Version="1.3.23" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ApiPort/ApiPort.VisualStudio/AnalyzeMenu.cs b/src/ApiPort/ApiPort.VisualStudio/AnalyzeMenu.cs
@@ -35,7 +35,7 @@ public AnalyzeMenu(ILifetimeScope scope, DTE dte, IOutputWindowWriter output)
             _productInfo = new ProductInformation("AnalyzeMenu");
         }
 
-        public async void AnalyzeSelectedProjectsAsync(bool includeDependencies)
+        public async Task AnalyzeSelectedProjectsAsync(bool includeDependencies)
         {
             var projects = GetSelectedProjects();
 

diff --git a/src/ApiPort/ApiPort.VisualStudio/ApiPort.VisualStudio.csproj b/src/ApiPort/ApiPort.VisualStudio/ApiPort.VisualStudio.csproj
@@ -64,9 +64,10 @@
     <PackageReference Include="Autofac" Version="4.6.2" />
     <PackageReference Include="Microsoft.Composition" Version="1.0.31" />
     <PackageReference Include="Microsoft.Tpl.Dataflow" Version="4.5.24" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.5.100" />
-    <PackageReference Include="VSLangProj140" Version="14.0.25029" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.4.27004" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.6.170" />
+    <PackageReference Include="VSLangProj140" Version="14.0.25030" />
+    <PackageReference Include="VSLangProj150" Version="15.0.26229" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyRedirectResolver.cs" />
@@ -120,10 +121,6 @@
     <None Include="Resources\Images.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\ApiPort.VisualStudio.2015\ApiPort.VisualStudio.2015.csproj">
-      <Project>{9def460b-6383-4665-839b-c0b5e6bb6a5f}</Project>
-      <Name>ApiPort.VisualStudio.2015</Name>
-    </ProjectReference>
     <ProjectReference Include="..\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj">
       <Project>{c0629a8d-7107-46cf-83b8-408e1886ab36}</Project>
       <Name>ApiPort.VisualStudio.2017</Name>

diff --git a/src/ApiPort/ApiPort.VisualStudio/ApiPortVSPackage.cs b/src/ApiPort/ApiPort.VisualStudio/ApiPortVSPackage.cs
@@ -73,12 +73,12 @@ protected override void Initialize()
 
                 // Add menu items for Project context menus
                 CommandID projectContextMenuCmdId = new CommandID(Guids.ProjectContextMenuItemCmdSet, (int)PkgCmdIDList.CmdIdProjectContextMenuItem);
-                OleMenuCommand contextMenuItem = new OleMenuCommand((_, __) => menuInitializer.AnalyzeSelectedProjectsAsync(false), projectContextMenuCmdId);
+                OleMenuCommand contextMenuItem = new OleMenuCommand(async (_, __) => await menuInitializer.AnalyzeSelectedProjectsAsync(false), projectContextMenuCmdId);
                 contextMenuItem.BeforeQueryStatus += menuInitializer.ProjectContextMenuItemBeforeQueryStatus;
                 mcs.AddCommand(contextMenuItem);
 
                 CommandID projectContextMenuDependentsCmdId = new CommandID(Guids.ProjectContextMenuItemCmdSet, (int)PkgCmdIDList.CmdIdProjectContextDependentsMenuItem);
-                OleMenuCommand contextMenuDependentsItem = new OleMenuCommand((_, __) => menuInitializer.AnalyzeSelectedProjectsAsync(true), projectContextMenuDependentsCmdId);
+                OleMenuCommand contextMenuDependentsItem = new OleMenuCommand(async (_, __) => await menuInitializer.AnalyzeSelectedProjectsAsync(true), projectContextMenuDependentsCmdId);
                 contextMenuDependentsItem.BeforeQueryStatus += menuInitializer.ProjectContextMenuDependenciesItemBeforeQueryStatus;
                 mcs.AddCommand(contextMenuDependentsItem);
 

diff --git a/src/ApiPort/ApiPort.VisualStudio/ServiceProvider.cs b/src/ApiPort/ApiPort.VisualStudio/ServiceProvider.cs
@@ -132,14 +132,7 @@ public ServiceProvider(ApiPortVSPackage serviceProvider)
             var dte = Package.GetGlobalService(typeof(DTE)) as DTE;
             var version = new Version(dte.Version);
 
-            if (version.Major == 14)
-            {
-                builder.RegisterModule(new VS2015.ServiceProvider());
-            }
-            else
-            {
-                builder.RegisterModule(new VS2017.ServiceProvider());
-            }
+            builder.RegisterModule(new VS2017.ServiceProvider());
 
             _container = builder.Build();
         }