Skip to content

Commit

Permalink
Added support for .NET 4.5 & .NET Standard 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Latency committed Feb 1, 2018
1 parent 2b806a4 commit c4d494c
Show file tree
Hide file tree
Showing 6 changed files with 199 additions and 55 deletions.
191 changes: 168 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,34 +1,179 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
# User-specific files
*.suo
*.user
*.aps
*.pch
*.vspscc
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ncb
*.suo
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.bak
*.cache
*.ilk
*.tmp
*.tmp_proj
*.log
[Bb]in
[Dd]ebug*/
*.lib
*.sbr
obj/
[Rr]elease*/
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
[Tt]est[Rr]esult*
/packages/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml

# NuGet is used in bootstrap.exe to retrieve packages
nuget.exe

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf


#LightSwitch generated files
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml

# =========================
# Windows detritus
# =========================

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac desktop service store files
.DS_Store
Hearthstone Deck Tracker.sln.ide/*
packages/*
!packages/repositories.config

.github

# =========================
# Hearthstone DB
# =========================

_ReSharper*/
[Tt]est[Rr]esult*
HearthDb/CARD.xml
HearthDb/CardDefs.xml
HearthDb/hsdata/
HearthDb/hsdata/
17 changes: 10 additions & 7 deletions HearthDb.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2026
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HearthDb", "HearthDb\HearthDb.csproj", "{7ED14243-E02B-4B94-AF00-A67A62C282F0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HearthDb", "HearthDb\HearthDb.csproj", "{7ED14243-E02B-4B94-AF00-A67A62C282F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HearthDb.Tests", "HearthDb.Tests\HearthDb.Tests.csproj", "{CB4162D6-E64D-4D3A-9207-9C850B684183}"
EndProject
Expand All @@ -21,12 +21,12 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Debug|x86.ActiveCfg = Debug|x86
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Debug|x86.Build.0 = Debug|x86
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Debug|x86.ActiveCfg = Debug|Any CPU
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Debug|x86.Build.0 = Debug|Any CPU
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Release|Any CPU.Build.0 = Release|Any CPU
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Release|x86.ActiveCfg = Release|x86
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Release|x86.Build.0 = Release|x86
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Release|x86.ActiveCfg = Release|Any CPU
{7ED14243-E02B-4B94-AF00-A67A62C282F0}.Release|x86.Build.0 = Release|Any CPU
{CB4162D6-E64D-4D3A-9207-9C850B684183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CB4162D6-E64D-4D3A-9207-9C850B684183}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB4162D6-E64D-4D3A-9207-9C850B684183}.Debug|x86.ActiveCfg = Debug|x86
Expand Down Expand Up @@ -55,4 +55,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8A5BE15D-8113-4FAC-92AC-F65BED6EC0B8}
EndGlobalSection
EndGlobal
3 changes: 2 additions & 1 deletion HearthDb/Cards.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ 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;
Expand Down
1 change: 0 additions & 1 deletion HearthDb/Enums/Enums.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ReSharper disable InconsistentNaming
namespace HearthDb.Enums
{
/* THIS FILE WAS GENERATED BY HearthDb.EnumsGenerator. DO NOT EDIT. */
Expand Down
20 changes: 19 additions & 1 deletion HearthDb/HearthDb.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net471;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>net471;net45;netcoreapp2.0;netstandard2.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>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Company>HearthSim</Company>
<PackageProjectUrl>https://github.com/HearthSim/Hearthstone-Deck-Tracker</PackageProjectUrl>
<PackageIconUrl>https://github.com/HearthSim/Hearthstone-Deck-Tracker/blob/master/Hearthstone%20Deck%20Tracker/Images/HearthstoneDeckTracker.ico</PackageIconUrl>
<RepositoryUrl>https://github.com/HearthSim/HearthDb</RepositoryUrl>
<RepositoryType>GIT</RepositoryType>
<Authors />
<Product />
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
<DefineConstants>TRACE;DEBUG</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;RELEASE</DefineConstants>
</PropertyGroup>

<ItemGroup>
Expand Down
22 changes: 0 additions & 22 deletions HearthDb/verify.ps1

This file was deleted.

0 comments on commit c4d494c

Please sign in to comment.