diff --git a/.gitignore b/.gitignore index 2d007a45..44fae4fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,34 +1,176 @@ +## 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 +[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/ -!packages/repositories.config +*.[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 DB +# ========================= + HearthDb/CARD.xml HearthDb/CardDefs.xml HearthDb/hsdata/ + +HearthDb/[Bb]in/* + +!HearthDb/[Bb]in/Debug +HearthDb/[Bb]in/Debug/* +!HearthDb/[Bb]in/Debug/*.nupkg + +!HearthDb/[Bb]in/Release +HearthDb/[Bb]in/Release/* +!HearthDb/[Bb]in/Release/*.nupkg diff --git a/HearthDb.sln b/HearthDb.sln index 3b743cb8..7f4d8db4 100644 --- a/HearthDb.sln +++ b/HearthDb.sln @@ -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 @@ -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 @@ -55,4 +55,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8A5BE15D-8113-4FAC-92AC-F65BED6EC0B8} + EndGlobalSection EndGlobal diff --git a/HearthDb/Cards.cs b/HearthDb/Cards.cs index 2f130620..fcdc691a 100644 --- a/HearthDb/Cards.cs +++ b/HearthDb/Cards.cs @@ -17,7 +17,8 @@ public static class Cards public static readonly Dictionary Collectible = new Dictionary(); - static Cards() { + static Cards() + { var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("HearthDb.CardDefs.xml"); if(stream == null) return; diff --git a/HearthDb/Enums/Enums.cs b/HearthDb/Enums/Enums.cs index a12d5e12..10a6784d 100644 --- a/HearthDb/Enums/Enums.cs +++ b/HearthDb/Enums/Enums.cs @@ -1,4 +1,3 @@ -// ReSharper disable InconsistentNaming namespace HearthDb.Enums { /* THIS FILE WAS GENERATED BY HearthDb.EnumsGenerator. DO NOT EDIT. */ diff --git a/HearthDb/HearthDb.csproj b/HearthDb/HearthDb.csproj index eecc265d..e9b9caa4 100644 --- a/HearthDb/HearthDb.csproj +++ b/HearthDb/HearthDb.csproj @@ -1,13 +1,31 @@  - net471;netcoreapp2.0 + net471;net45;netcoreapp2.0;netstandard2.0 true snKey.snk 10.0.1.0 10.0.1.0 false 10.0.1 + true + HearthSim + https://github.com/HearthSim/Hearthstone-Deck-Tracker + https://github.com/HearthSim/Hearthstone-Deck-Tracker/blob/master/Hearthstone%20Deck%20Tracker/Images/HearthstoneDeckTracker.ico + https://github.com/HearthSim/HearthDb + GIT + + + + + + TRACE;DEBUG + bin\Debug\ + + + + bin\Release\ + TRACE;RELEASE diff --git a/HearthDb/bin/Debug/HearthDb.10.0.1.nupkg b/HearthDb/bin/Debug/HearthDb.10.0.1.nupkg new file mode 100644 index 00000000..6e8cceb7 Binary files /dev/null and b/HearthDb/bin/Debug/HearthDb.10.0.1.nupkg differ diff --git a/HearthDb/verify.ps1 b/HearthDb/verify.ps1 deleted file mode 100644 index 1974b75c..00000000 --- a/HearthDb/verify.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -$assemblyVersion = Get-Content ($args[0] + "Properties\AssemblyInfo.cs") | - where { $_ -match '\[assembly: AssemblyVersion\("([\d\.]+)"\)\]' } | - foreach { $matches[1] } - -$hsdataVersion = git -C ($args[0] + "hsdata") log -1 | - where { $_ -match "Update to patch ([\d\.]+)$" } | - foreach { $matches[1] } - -if ($assemblyVersion -ne $hsdataVersion) { - $versionRegex = [regex]"^(.+)\.\d+$" - $aVersion = $versionRegex.Match($assemblyVersion).Groups[1].Value - $hsdVersion = $versionRegex.Match($hsdataVersion).Groups[1].Value - if ($aVersion -ne $hsdVersion) { - echo "verify.ps1: verification error 1: assembly version ($assemblyVersion) does not match hsdata ($hsdataVersion)" - } - else { - echo "verify.ps1: verification warning 1: assembly version ($assemblyVersion) does not match hsdata ($hsdataVersion)" - } -} -else { - echo "verify.ps1: version up-to-date: ($assemblyVersion)" -}