Using nuget pkg for ms build

StefanKert · Apr 6, 2019 · c5cc157 · c5cc157
1 parent dcde1ae
commit c5cc157
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/BuildVision/BuildVision.csproj b/src/BuildVision/BuildVision.csproj
@@ -60,10 +60,6 @@
     <DeployExtension>False</DeployExtension>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="PresentationFramework.Aero" />
@@ -81,12 +77,6 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="UIAutomationTypes" />
-    <Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="VSLangProj2, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="System.Xaml" />
   </ItemGroup>
@@ -231,6 +221,18 @@
     <PackageReference Include="Madskristensen.VisualStudio.SDK">
       <Version>14.3.81-pre</Version>
     </PackageReference>
+    <PackageReference Include="Microsoft.Build">
+      <Version>16.0.461</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Engine">
+      <Version>16.0.461</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Framework">
+      <Version>16.0.461</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Utilities.Core">
+      <Version>16.0.461</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
       <Version>15.8.36</Version>
     </PackageReference>

diff --git a/src/BuildVision/Services/WindowStateService.cs b/src/BuildVision/Services/WindowStateService.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel.Composition;
 using BuildVision.UI.Settings.Models.ToolWindow;
 using EnvDTE;
+using Microsoft;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
@@ -130,8 +131,7 @@ public void Initialize(ToolWindowPane toolWindowPane)
             {
                 ThreadHelper.ThrowIfNotOnUIThread();
                 _dte = _serviceProvider.GetService(typeof(DTE)) as DTE;
-                if (_dte == null)
-                    throw new InvalidOperationException("Unable to get DTE instance.");
+                Assumes.Present(_dte);
                 _windowFrame = (IVsWindowFrame)toolWindowPane.Frame;
                 _window = GetWindowInstance(_dte, typeof(BuildVisionPane).GUID);
                 if (_window == null)