From 80affc4f67a44bc156bfee3a52658886801a360f Mon Sep 17 00:00:00 2001
From: Erik Zhang <erik@vcage.com>
Date: Fri, 26 May 2017 02:15:34 +0800
Subject: [PATCH] upgrade to vs2017

---
 AntShares.sln                  | 11 ++-----
 global.json                    |  6 ----
 src/AntShares/AntShares.csproj | 60 ++++++++++++++++++++++++++++++++++
 src/AntShares/AntShares.xproj  | 19 -----------
 src/AntShares/project.json     | 59 ---------------------------------
 5 files changed, 63 insertions(+), 92 deletions(-)
 delete mode 100644 global.json
 create mode 100644 src/AntShares/AntShares.csproj
 delete mode 100644 src/AntShares/AntShares.xproj
 delete mode 100644 src/AntShares/project.json

diff --git a/AntShares.sln b/AntShares.sln
index cb4f065560..01b20b5039 100644
--- a/AntShares.sln
+++ b/AntShares.sln
@@ -1,16 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.6
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{83696BE0-E444-44DD-9C0D-A61CACFC95E1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A0A81D5-44F5-45EB-BA2F-E1788CF917C8}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AntShares", "src\AntShares\AntShares.xproj", "{36447A9B-0311-4D4D-A3D5-AECBE9C15BBC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AntShares", "src\AntShares\AntShares.csproj", "{36447A9B-0311-4D4D-A3D5-AECBE9C15BBC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/global.json b/global.json
deleted file mode 100644
index 9d09ab54cb..0000000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "projects": [ "src", "test" ],
-  "sdk": {
-    "version": "1.0.0-preview2-003131"
-  }
-}
diff --git a/src/AntShares/AntShares.csproj b/src/AntShares/AntShares.csproj
new file mode 100644
index 0000000000..a82f2a9612
--- /dev/null
+++ b/src/AntShares/AntShares.csproj
@@ -0,0 +1,60 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Copyright>2015-2017 The Antshares team</Copyright>
+    <AssemblyTitle>AntShares</AssemblyTitle>
+    <VersionPrefix>1.6.1</VersionPrefix>
+    <Authors>The Antshares team</Authors>
+    <TargetFrameworks>netstandard1.6;net461</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AssemblyName>AntShares</AssemblyName>
+    <PackageId>AntShares</PackageId>
+    <PackageTags>AntShares;Blockchain;Smart Contract</PackageTags>
+    <PackageProjectUrl>https://github.com/AntShares/AntShares</PackageProjectUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/AntShares/AntShares.git</RepositoryUrl>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
+    <DefineConstants>RELEASE;NETSTANDARD1_6</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="protocol.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <PackagePath>content</PackagePath>
+      <Pack>true</Pack>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AntShares.VM" Version="1.6.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="1.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
+    <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
+    <PackageReference Include="System.Security.SecureString" Version="4.0.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="System.Linq.Parallel" Version="4.0.1" />
+    <PackageReference Include="System.Net.NameResolution" Version="4.0.0" />
+    <PackageReference Include="System.Net.NetworkInformation" Version="4.1.0" />
+    <PackageReference Include="System.Net.Requests" Version="4.0.11" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.0.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/AntShares/AntShares.xproj b/src/AntShares/AntShares.xproj
deleted file mode 100644
index a72883fd49..0000000000
--- a/src/AntShares/AntShares.xproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>36447a9b-0311-4d4d-a3d5-aecbe9c15bbc</ProjectGuid>
-    <RootNamespace>AntShares</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/AntShares/project.json b/src/AntShares/project.json
deleted file mode 100644
index a27cf59b12..0000000000
--- a/src/AntShares/project.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "authors": [ "The Antshares team" ],
-  "copyright": "2015-2017 The Antshares team",
-  "title": "AntShares",
-  "version": "1.6.1",
-  "buildOptions": {
-    "allowUnsafe": true,
-    "copyToOutput": {
-      "includeFiles": "protocol.json"
-    }
-  },
-  "packOptions": {
-    "owners": [ "The Antshares team" ],
-    "tags": [ "AntShares", "Blockchain", "Smart Contract" ],
-    "projectUrl": "https://github.com/AntShares/AntShares",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/AntShares/AntShares.git"
-    },
-    "files": {
-      "mappings": {
-        "content/protocol.json": {
-          "include": "protocol.json"
-        }
-      }
-    }
-  },
-
-  "dependencies": {
-    "AntShares.VM": "1.6.5",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.1.1",
-    "Microsoft.AspNetCore.Server.Kestrel.Https": "1.1.1",
-	"Microsoft.AspNetCore.WebSockets": "1.0.1",
-    "Microsoft.EntityFrameworkCore.Sqlite": "1.0.0",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0",
-    "System.Net.Sockets": "4.3.0",
-    "System.Security.SecureString": "4.0.0"
-  },
-
-  "frameworks": {
-    "netstandard1.6": {
-      "dependencies": {
-        "NETStandard.Library": "1.6.1",
-        "System.Linq.Parallel": "4.0.1",
-        "System.Net.NameResolution": "4.0.0",
-        "System.Net.NetworkInformation": "4.1.0",
-        "System.Net.Requests": "4.0.11",
-        "System.Xml.XPath.XmlDocument": "4.0.1"
-      }
-    },
-    "net461": {
-      "frameworkAssemblies": {
-        "System.Numerics": "4.0.0.0",
-        "System.Security": "4.0.0.0",
-        "System.Xml": "4.0.0.0"
-      }
-    }
-  }
-}