From 6106f8e7eaf662b79bcdf360aed45e3de2bb338f Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Mon, 24 Sep 2018 14:43:32 +0200
Subject: [PATCH] update to .NET Standard 2

---
 Common.props                                  |  8 ++++----
 .../UnicodeCharacterInspector.csproj          |  2 +-
 .../UnicodeInformation.Builder.csproj         |  2 +-
 .../UnicodeInformation.Tests.csproj           |  8 ++++----
 UnicodeInformation/UnicodeInformation.csproj  | 20 +++++++++++--------
 appveyor.yml                                  |  2 +-
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Common.props b/Common.props
index 8af2295..f4e41f6 100644
--- a/Common.props
+++ b/Common.props
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
     <Product>.NET Unicode Information</Product>
-    <Authors>Fabien Barbier</Authors>
-    <Copyright>Copyright © Fabien Barbier 2014-2017</Copyright>
+    <Authors>Fabien Barbier, Tobias Klika</Authors>
+    <Copyright>Copyright © Fabien Barbier 2014-2017, © Tobias Klika 2018</Copyright>
     <NeutralLanguage>en</NeutralLanguage>
-    <Version>2.2.1</Version>
-    <PackageVersion>2.2.1</PackageVersion>
+    <Version>2.3.0</Version>
+    <PackageVersion>2.3.0</PackageVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/UnicodeCharacterInspector/UnicodeCharacterInspector.csproj b/UnicodeCharacterInspector/UnicodeCharacterInspector.csproj
index 28442f1..b62b2a2 100644
--- a/UnicodeCharacterInspector/UnicodeCharacterInspector.csproj
+++ b/UnicodeCharacterInspector/UnicodeCharacterInspector.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnicodeCharacterInspector</RootNamespace>
     <AssemblyName>UnicodeCharacterInspector</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/UnicodeInformation.Builder/UnicodeInformation.Builder.csproj b/UnicodeInformation.Builder/UnicodeInformation.Builder.csproj
index 0149dde..6159b64 100644
--- a/UnicodeInformation.Builder/UnicodeInformation.Builder.csproj
+++ b/UnicodeInformation.Builder/UnicodeInformation.Builder.csproj
@@ -2,7 +2,7 @@
   <Import Project="../Common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\System.Unicode.snk</AssemblyOriginatorKeyFile>
diff --git a/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj b/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj
index 3c912ec..0ba4e20 100644
--- a/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj
+++ b/UnicodeInformation.Tests/UnicodeInformation.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Net.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\System.Unicode.snk</AssemblyOriginatorKeyFile>
     <Description />
@@ -12,9 +12,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
   </ItemGroup>
   <ItemGroup>
diff --git a/UnicodeInformation/UnicodeInformation.csproj b/UnicodeInformation/UnicodeInformation.csproj
index 89906c8..228f26c 100644
--- a/UnicodeInformation/UnicodeInformation.csproj
+++ b/UnicodeInformation/UnicodeInformation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Net.Sdk">
   <Import Project="../Common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard1.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>System.Unicode</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,15 +10,19 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>
   <PropertyGroup Label="Package">
-    <PackageId>UnicodeInformation</PackageId>
-    <Title>.NET Unicode Information Library</Title>
-    <AssemblyTitle>.NET Unicode Information Library</AssemblyTitle>
+    <PackageId>UnicodeInfo</PackageId>
+    <Title>Unicode Information Library</Title>
+    <AssemblyTitle>Unicode Information Library</AssemblyTitle>
     <Description>Library providing access to Unicode data to .NET clients.</Description>
     <PackageTags>Unicode Unihan Data .NET C# String Text Char Character CodePoint Code Point</PackageTags>
     <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/GoldenCrystal/NetUnicodeInfo</PackageProjectUrl>
-    <PackageIconUrl>https://raw.githubusercontent.com/GoldenCrystal/NetUnicodeInfo/master/UnicodeCharacterInspector/UnicodeCharacterInspector.ico</PackageIconUrl>
-    <PackageReleaseNotes>Version 2.2.1
+    <PackageProjectUrl>https://github.com/ceee/NetUnicodeInfo/</PackageProjectUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/ceee/NetUnicodeInfo/master/UnicodeCharacterInspector/UnicodeCharacterInspector.ico</PackageIconUrl>
+    <PackageReleaseNotes>Version 2.3.0
+-------------
+Converted to .NET Standard 2.0 project.
+
+Version 2.2.1
 -------------
 Added DebuggerDisplay attributes on various types.
 
@@ -44,6 +48,6 @@ Following migration to Unicode 9.0.0, UnicodeRadicalStrokeCount.StrokeCount is n
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
index 5b8a300..38d36f7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.1.{build}
+version: 2.3.0.{build}
 image: Visual Studio 2017
 configuration: Release
 platform: Any CPU