Upgrade to .NET Core 1.0.0 and netstandart1.3

justdmitry · Jul 15, 2016 · e8e18af · e8e18af
1 parent ad0bbb1
commit e8e18af
Show file tree

Hide file tree

Showing 10 changed files with 9,810 additions and 1,061 deletions.
diff --git a/NetTelegramBotApi/NetTelegramBotApi.xproj b/NetTelegramBotApi/NetTelegramBotApi.xproj
@@ -4,12 +4,12 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>0ca802ad-0f85-4314-8d70-2c5f182c9f42</ProjectGuid>
     <RootNamespace>NetTelegramBotApi</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
@@ -20,5 +20,5 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
   </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
diff --git a/NetTelegramBotApi/project.json b/NetTelegramBotApi/project.json
@@ -1,41 +1,28 @@
 {
-  "version": "3.7.50926",
+  "version": "3.8.0",
   "title": "NetTelegramBotApi",
   "description": "Telegram Bot API library",
-  "authors": [ "Dmitry Popov" ],
-  "tags": [ "telegram", "bot", "api" ],
-  "projectUrl": "https://github.com/justdmitry/NetTelegramBotApi",
-  "iconUrl": "https://raw.githubusercontent.com/justdmitry/NetTelegramBotApi/master/package-icon.gif",
-  "copyright": "Copyright © Dmitry Popov, 2015",
-  "releaseNotes": "New! Support files download (sent by users)! Also, proxy support included. Other API changes implemented too.",
+
+  "packOptions": {
+    "summary": "Telegram Bot API library",
+    "owners": [ "Dmitry Popov" ],
+    "tags": [ "telegram", "bot", "api" ],
+    "projectUrl": "https://github.com/justdmitry/NetTelegramBotApi",
+    "iconUrl": "https://raw.githubusercontent.com/justdmitry/NetTelegramBotApi/master/package-icon.gif",
+    "copyright": "Copyright © Dmitry Popov, 2015",
+    "releaseNotes": "Upgrade to .NET Core RTM and netstandard1.3",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/justdmitry/NetTelegramBotApi.git"
+    }
+  },
 
   "dependencies": {
-    "Newtonsoft.Json": "7.0.1"
+    "Newtonsoft.Json": "9.0.1",
+    "System.Net.Http": "4.1.0"
   },
 
   "frameworks": {
-    "net45": {
-      "frameworkAssemblies": {
-        "System.Net.Http": "4.0.0"
-      }
-    },
-    "dnx45": {
-      "frameworkAssemblies": {
-        "System.Net.Http": "4.0.0"
-      }
-    },
-    "dnx50": {
-      "frameworkAssemblies": {
-        "System.Net.Http": "4.0.0"
-      }
-    },
-    "dnxcore50": {
-      "dependencies": {
-        "System.Linq": "4.0.0",
-        "System.Net.Http": "4.0.0",
-        "System.Collections": "4.0.10",
-        "System.Text.RegularExpressions": "4.0.10"
-      }
-    }
+    "netstandard1.3": {}
   }
 }