From 79bbce8439ead72012cda06198f3dd7f245851e9 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@gmail.com>
Date: Sun, 10 Dec 2017 08:37:06 -0800
Subject: [PATCH] Replace project.json with PackageReference in C# projects

---
 src/GitLink.Tests/GitLink.Tests.csproj |  8 +++++++-
 src/GitLink.Tests/project.json         | 14 --------------
 src/GitLink/GitLink.csproj             | 12 +++++++++++-
 src/GitLink/project.json               | 25 -------------------------
 src/GitLinkTask/GitLinkTask.csproj     |  4 ++++
 src/GitLinkTask/project.json           | 12 ------------
 6 files changed, 22 insertions(+), 53 deletions(-)
 delete mode 100644 src/GitLink.Tests/project.json
 delete mode 100644 src/GitLink/project.json
 delete mode 100644 src/GitLinkTask/project.json

diff --git a/src/GitLink.Tests/GitLink.Tests.csproj b/src/GitLink.Tests/GitLink.Tests.csproj
index d008f77..b746535 100644
--- a/src/GitLink.Tests/GitLink.Tests.csproj
+++ b/src/GitLink.Tests/GitLink.Tests.csproj
@@ -47,6 +47,12 @@
     <Reference Include="System" />
     <Reference Include="System.Net" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ApprovalTests" Version="3.0.8" />
+    <PackageReference Include="ApprovalUtilities" Version="3.0.8" />
+    <PackageReference Include="NUnit" Version="3.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.4.1" />
+  </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
       <ItemGroup>
@@ -123,7 +129,7 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
diff --git a/src/GitLink.Tests/project.json b/src/GitLink.Tests/project.json
deleted file mode 100644
index 556abd5..0000000
--- a/src/GitLink.Tests/project.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "dependencies": {
-    "ApprovalTests": "3.0.8",
-    "ApprovalUtilities": "3.0.8",
-    "NUnit": "3.5.0",
-    "NUnit3TestAdapter": "3.4.1"
-  },
-  "frameworks": {
-    "net45": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}
\ No newline at end of file
diff --git a/src/GitLink/GitLink.csproj b/src/GitLink/GitLink.csproj
index 62c6935..587fb23 100644
--- a/src/GitLink/GitLink.csproj
+++ b/src/GitLink/GitLink.csproj
@@ -57,6 +57,17 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Catel.Core" Version="4.5.3" />
+    <PackageReference Include="EnlistmentInfo" Version="1.0.4" />
+    <PackageReference Include="GitTools.Core" Version="1.0.0-unstable0021" />
+    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0009" />
+    <PackageReference Include="ImpromptuInterface" Version="6.2.2" />
+    <PackageReference Include="LibGit2Sharp" Version="0.21.0.176" />
+    <PackageReference Include="NuProj.Common" Version="0.11.14-beta" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.0.0" />
+    <PackageReference Include="System.CommandLine" Version="0.1.0-e161008-1" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="Extensions\BinaryReaderExtensions.cs" />
     <Compile Include="Extensions\PdbExtensions.cs" />
@@ -97,7 +108,6 @@
     <None Include="winsdk.redist.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Logo.ico" />
diff --git a/src/GitLink/project.json b/src/GitLink/project.json
deleted file mode 100644
index 2c78d6f..0000000
--- a/src/GitLink/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "dependencies": {
-    "Catel.Core": "4.5.3",
-    "EnlistmentInfo": {
-      "version": "1.0.4",
-      "suppressParent": "none"
-    },
-    "GitTools.Core": "1.0.0-unstable0021",
-    "GitVersionTask": "4.0.0-beta0009",
-    "ImpromptuInterface": "6.2.2",
-    "LibGit2Sharp": "0.21.0.176",
-    "NuProj.Common": "0.11.14-beta",
-    "StyleCop.Analyzers": {
-      "version": "1.0.0",
-      "type": "build"
-    },
-    "System.CommandLine": "0.1.0-e161008-1"
-  },
-  "frameworks": {
-    "net45": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}
\ No newline at end of file
diff --git a/src/GitLinkTask/GitLinkTask.csproj b/src/GitLinkTask/GitLinkTask.csproj
index d427497..966e4ae 100644
--- a/src/GitLinkTask/GitLinkTask.csproj
+++ b/src/GitLinkTask/GitLinkTask.csproj
@@ -55,6 +55,10 @@
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="System" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0009" />
+    <PackageReference Include="NuProj.Common" Version="0.11.14-beta" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="GitLink.props">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/GitLinkTask/project.json b/src/GitLinkTask/project.json
deleted file mode 100644
index 6c9ca4f..0000000
--- a/src/GitLinkTask/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "GitVersionTask": "4.0.0-beta0009",
-    "NuProj.Common": "0.11.14-beta"
-  },
-  "frameworks": {
-    "net45": {}
-  },
-  "runtimes": {
-    "win": {}
-  }
-}
\ No newline at end of file