From 4094e8b8f3bbd507d85133db2954cd7bb97bfb63 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Thu, 24 Aug 2017 09:30:29 -0700
Subject: [PATCH] Use PackageReference instead of project.json in the VSIX
 project (#1642)

---
 build/dependencies.props                           |  5 ++++-
 .../Microsoft.VisualStudio.RazorExtension.csproj   | 10 +++++++++-
 .../project.json                                   | 14 --------------
 3 files changed, 13 insertions(+), 16 deletions(-)
 delete mode 100644 tooling/Microsoft.VisualStudio.RazorExtension/project.json

diff --git a/build/dependencies.props b/build/dependencies.props
index 91e0035544..a587261e6f 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -22,7 +22,10 @@
     <StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion>
     <TestSdkVersion>15.3.0</TestSdkVersion>
 
-    <!-- Must keep in sync with tooling\Microsoft.VisualStudio.RazorExtension\project.json -->
+    <!--
+      Must keep in sync with tooling\Microsoft.VisualStudio.RazorExtension\ until we can use this MSBuild property.
+      See https://github.com/dotnet/project-system/issues/2129
+     -->
     <VsShellVersion>15.0.26606</VsShellVersion>
 
     <XunitAnalyzersVersion>0.6.1</XunitAnalyzersVersion>
diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
index 2d8861c322..798fa06a7c 100644
--- a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -95,7 +95,6 @@
     <Content Include="WebConfiguration.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <None Include="project.json" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -208,6 +207,15 @@
       </IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <!--
+      Versions must be written here instead of being set as MSBuild variable.
+      See https://github.com/dotnet/project-system/issues/2129.
+    -->
+    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="15.0.26606" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.0.26606" />
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.1.192" />
+  </ItemGroup>
   <ItemDefinitionGroup>
     <SuppressFromVsix>
       <Visible>false</Visible>
diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/project.json b/tooling/Microsoft.VisualStudio.RazorExtension/project.json
deleted file mode 100644
index 219be312d6..0000000000
--- a/tooling/Microsoft.VisualStudio.RazorExtension/project.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "frameworks": {
-    "net46": {
-      "dependencies": {
-        "Microsoft.VisualStudio.ComponentModelHost": "15.0.26606",
-        "Microsoft.VisualStudio.Shell.15.0": "15.0.26606",
-        "Microsoft.VSSDK.BuildTools": "15.1.192"
-      }
-    }
-  },
-  "runtimes": {
-    "win": { }
-  }
-}