update to .NET Standard 2

This commit is contained in:
2018-09-24 14:43:32 +02:00
parent cac4c9de8b
commit 6106f8e7ea
6 changed files with 23 additions and 19 deletions
+4 -4
View File
@@ -1,10 +1,10 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Product>.NET Unicode Information</Product> <Product>.NET Unicode Information</Product>
<Authors>Fabien Barbier</Authors> <Authors>Fabien Barbier, Tobias Klika</Authors>
<Copyright>Copyright © Fabien Barbier 2014-2017</Copyright> <Copyright>Copyright © Fabien Barbier 2014-2017, © Tobias Klika 2018</Copyright>
<NeutralLanguage>en</NeutralLanguage> <NeutralLanguage>en</NeutralLanguage>
<Version>2.2.1</Version> <Version>2.3.0</Version>
<PackageVersion>2.2.1</PackageVersion> <PackageVersion>2.3.0</PackageVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UnicodeCharacterInspector</RootNamespace> <RootNamespace>UnicodeCharacterInspector</RootNamespace>
<AssemblyName>UnicodeCharacterInspector</AssemblyName> <AssemblyName>UnicodeCharacterInspector</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@@ -2,7 +2,7 @@
<Import Project="../Common.props" /> <Import Project="../Common.props" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\System.Unicode.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\System.Unicode.snk</AssemblyOriginatorKeyFile>
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.Net.Sdk"> <Project Sdk="Microsoft.Net.Sdk">
<Import Project="../Common.props" /> <Import Project="../Common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\System.Unicode.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\System.Unicode.snk</AssemblyOriginatorKeyFile>
<Description /> <Description />
@@ -12,9 +12,9 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="xunit" Version="2.3.0-beta3-build3705" /> <PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" /> <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
+12 -8
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.Net.Sdk"> <Project Sdk="Microsoft.Net.Sdk">
<Import Project="../Common.props" /> <Import Project="../Common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard1.1</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>System.Unicode</RootNamespace> <RootNamespace>System.Unicode</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage> <DefaultLanguage>en-US</DefaultLanguage>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -10,15 +10,19 @@
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="Package"> <PropertyGroup Label="Package">
<PackageId>UnicodeInformation</PackageId> <PackageId>UnicodeInfo</PackageId>
<Title>.NET Unicode Information Library</Title> <Title>Unicode Information Library</Title>
<AssemblyTitle>.NET Unicode Information Library</AssemblyTitle> <AssemblyTitle>Unicode Information Library</AssemblyTitle>
<Description>Library providing access to Unicode data to .NET clients.</Description> <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> <PackageTags>Unicode Unihan Data .NET C# String Text Char Character CodePoint Code Point</PackageTags>
<PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl> <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/GoldenCrystal/NetUnicodeInfo</PackageProjectUrl> <PackageProjectUrl>https://github.com/ceee/NetUnicodeInfo/</PackageProjectUrl>
<PackageIconUrl>https://raw.githubusercontent.com/GoldenCrystal/NetUnicodeInfo/master/UnicodeCharacterInspector/UnicodeCharacterInspector.ico</PackageIconUrl> <PackageIconUrl>https://raw.githubusercontent.com/ceee/NetUnicodeInfo/master/UnicodeCharacterInspector/UnicodeCharacterInspector.ico</PackageIconUrl>
<PackageReleaseNotes>Version 2.2.1 <PackageReleaseNotes>Version 2.3.0
-------------
Converted to .NET Standard 2.0 project.
Version 2.2.1
------------- -------------
Added DebuggerDisplay attributes on various types. Added DebuggerDisplay attributes on various types.
@@ -44,6 +48,6 @@ Following migration to Unicode 9.0.0, UnicodeRadicalStrokeCount.StrokeCount is n
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
+1 -1
View File
@@ -1,4 +1,4 @@
version: 2.2.1.{build} version: 2.3.0.{build}
image: Visual Studio 2017 image: Visual Studio 2017
configuration: Release configuration: Release
platform: Any CPU platform: Any CPU