Added support for .NET Core 2.0 + .NET 4.7.1.

Updated new msbuild configurations. Cleaned up validation and NPE hotpoints. Added signed key signature for GAC (.NET Core/Std 2.0/Net471).
HearthSim · Jan 8, 2018 · 2b806a4 · 2b806a4
1 parent 4461dc6
commit 2b806a4
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 144 deletions.
diff --git a/HearthDb/Card.cs b/HearthDb/Card.cs
@@ -1,6 +1,5 @@
 #region
 
-using System;
 using System.Linq;
 using HearthDb.CardDefs;
 using HearthDb.Enums;
@@ -69,7 +68,7 @@ public string[] Mechanics
 
 		public Locale DefaultLanguage { get; set; } = Locale.enUS;
 
-		public bool Collectible => Convert.ToBoolean(Entity.GetTag(COLLECTIBLE));
+		public bool Collectible => Entity.GetTag(COLLECTIBLE) != 0;
 
 		public string GetLocName(Locale lang) => Entity.GetLocString(CARDNAME, lang);
 

diff --git a/HearthDb/CardIds.cs b/HearthDb/CardIds.cs
@@ -1,3 +1,4 @@
+// ReSharper disable InconsistentNaming
 namespace HearthDb
 {
     /* THIS CLASS WAS GENERATED BY HearthDb.CardIdGenerator. DO NOT EDIT. */
@@ -4184,4 +4185,4 @@ public class DreamCards
             }
         }
     }
-}
+}
diff --git a/HearthDb/Cards.cs b/HearthDb/Cards.cs
@@ -1,6 +1,5 @@
 #region
 
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -18,11 +17,11 @@ public static class Cards
 
 		public static readonly Dictionary<string, Card> Collectible = new Dictionary<string, Card>();
 
-		static Cards()
-		{
+		static Cards() {
 			var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HearthDb.CardDefs.xml");
 			if(stream == null)
 				return;
+
 			using(TextReader tr = new StreamReader(stream))
 			{
 				var xml = new XmlSerializer(typeof(CardDefs.CardDefs));
@@ -38,9 +37,9 @@ static Cards()
 		}
 
 		public static Card GetFromName(string name, Locale lang, bool collectible = true)
-			=> (collectible ? Collectible : All).Values.FirstOrDefault(x => x.GetLocName(lang)?.Equals(name, StringComparison.InvariantCultureIgnoreCase) ?? false);
+			=> (collectible ? Collectible : All).Values.FirstOrDefault(x => x.GetLocName(lang)?.Equals(name) ?? false);
 
 		public static Card GetFromDbfId(int dbfId, bool collectibe = true)
 			=> (collectibe ? Collectible : All).Values.FirstOrDefault(x => x.DbfId == dbfId);
 	}
-}
+}
diff --git a/HearthDb/Enums/Enums.cs b/HearthDb/Enums/Enums.cs
@@ -1,3 +1,4 @@
+// ReSharper disable InconsistentNaming
 namespace HearthDb.Enums
 {
     /* THIS FILE WAS GENERATED BY HearthDb.EnumsGenerator. DO NOT EDIT. */
@@ -912,4 +913,4 @@ public enum Zone
         SETASIDE = 6,
         SECRET = 7,
     }
-}
+}
diff --git a/HearthDb/HearthDb.csproj b/HearthDb/HearthDb.csproj
@@ -1,105 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7ED14243-E02B-4B94-AF00-A67A62C282F0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>HearthDb</RootNamespace>
-    <AssemblyName>HearthDb</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>snKey.snk</AssemblyOriginatorKeyFile>
+    <AssemblyVersion>10.0.1.0</AssemblyVersion>
+    <FileVersion>10.0.1.0</FileVersion>
+    <DelaySign>false</DelaySign>
+    <Version>10.0.1</Version>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Card.cs" />
-    <Compile Include="CardDefs\CardDefs.cs" />
-    <Compile Include="CardDefs\Entity.cs" />
-    <Compile Include="CardDefs\EntourageCard.cs" />
-    <Compile Include="CardDefs\PlayRequirement.cs" />
-    <Compile Include="CardDefs\Power.cs" />
-    <Compile Include="CardDefs\Tag.cs" />
-    <Compile Include="CardDefs\TriggeredPowerHistoryInfo.cs" />
-    <Compile Include="CardIds.cs" />
-    <Compile Include="Cards.cs" />
-    <Compile Include="Deckstrings\Deck.cs" />
-    <Compile Include="Deckstrings\DeckSerializer.cs" />
-    <Compile Include="Deckstrings\InvalidDeckException.cs" />
-    <Compile Include="Deckstrings\VarInt.cs" />
-    <Compile Include="Enums\Converters.cs" />
-    <Compile Include="Enums\Dictionaries.cs" />
-    <Compile Include="Enums\Enums.cs" />
-    <Compile Include="Info.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Remove="Convert.cs" />
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="CardDefs.xml" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>if exist $(ProjectDir)hsdata (
-  git -C "$(ProjectDir)hsdata" fetch
-  git -C "$(ProjectDir)hsdata" reset --hard origin/master
-) else (
-  git clone --depth=1 https://github.com/HearthSim/hsdata.git "$(ProjectDir)hsdata"
-)
-if "$(ConfigurationName)" == "Release" (
-  powershell -ExecutionPolicy Unrestricted -file "$(ProjectDir)verify.ps1" "$(ProjectDir)\"
-)
-xcopy /Y "$(ProjectDir)hsdata\CardDefs.xml" "$(ProjectDir)CardDefs.xml*"</PreBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/HearthDb/Info.cs b/HearthDb/Info.cs
@@ -11,4 +11,4 @@ public static class Info
 	{
 		public static Version HearthDbVersion => Assembly.GetExecutingAssembly().GetName().Version;
 	}
-}
+}
diff --git a/HearthDb/Properties/AssemblyInfo.cs b/HearthDb/Properties/AssemblyInfo.cs
diff --git a/HearthDb/snKey.snk b/HearthDb/snKey.snk
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ public static class Info @@
     	{
     		public static Version HearthDbVersion => Assembly.GetExecutingAssembly().GetName().Version;
     	}
-    }
+    }