From 7dd9e1fac81eb1b4f922ecb3ac3676c741d25be1 Mon Sep 17 00:00:00 2001
From: chaowlert <chaowlert@gmail.com>
Date: Thu, 12 Nov 2020 19:08:49 +0700
Subject: [PATCH] add NET5.0 and bump version

---
 .config/dotnet-tools.json            | 2 +-
 src/Mapster.Tool/Mapster.Tool.csproj | 4 ++--
 src/Mapster.sln                      | 1 -
 src/Mapster/Mapster.csproj           | 2 +-
 src/global.json                      | 5 -----
 5 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 src/global.json

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ba0e2f43..f2559746 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "mapster.tool": {
-      "version": "6.5.2",
+      "version": "7.0.0",
       "commands": [
         "dotnet-mapster"
       ]
diff --git a/src/Mapster.Tool/Mapster.Tool.csproj b/src/Mapster.Tool/Mapster.Tool.csproj
index adc5a450..67ac7f05 100644
--- a/src/Mapster.Tool/Mapster.Tool.csproj
+++ b/src/Mapster.Tool/Mapster.Tool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <IsPackable>true</IsPackable>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>dotnet-mapster</ToolCommandName>
@@ -15,7 +15,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Mapster.Tool.snk</AssemblyOriginatorKeyFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>6.5.2</Version>
+    <Version>7.0.0</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright (c) 2020 Chaowlert Chaisrichalermpol</Copyright>
     <PackageIcon>icon.png</PackageIcon>
diff --git a/src/Mapster.sln b/src/Mapster.sln
index ee5a0957..2fd8a0cd 100644
--- a/src/Mapster.sln
+++ b/src/Mapster.sln
@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		..\.config\dotnet-tools.json = ..\.config\dotnet-tools.json
-		global.json = global.json
 		..\LICENSE = ..\LICENSE
 		..\README.md = ..\README.md
 	EndProjectSection
diff --git a/src/Mapster/Mapster.csproj b/src/Mapster/Mapster.csproj
index f80d5c7c..d0ef30de 100644
--- a/src/Mapster/Mapster.csproj
+++ b/src/Mapster/Mapster.csproj
@@ -20,7 +20,7 @@
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <RootNamespace>Mapster</RootNamespace>
-    <Version>6.5.1</Version>
+    <Version>7.0.0</Version>
     <LangVersion>8.0</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>1701;1702;8618</NoWarn>
diff --git a/src/global.json b/src/global.json
deleted file mode 100644
index 9731311d..00000000
--- a/src/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "3.1.403"
-  }
-}
\ No newline at end of file