diff --git a/.gitignore b/.gitignore index 4724077..e645270 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,353 @@ -ColorSharp/obj/* -ColorSharp\obj\* -ColorSharp/bin/* -ColorSharp\bin\* -ColorSharpTests/obj/* -ColorSharpTests\obj\* -ColorSharpTests/bin/* -ColorSharpTests\bin\* -ColorSharp/colorsharp.snk -ColorSharp\colorsharp.snk -packages/* -packages\* -ColorSharp.userprefs -ColorSharp*.nupkg +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# 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 +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# 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 +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/.travis.yml b/.travis.yml index d78681e..587795d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ solution: ColorSharp.sln install: - nuget restore ColorSharp.sln - - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner + - nuget install NUnit.Console -Version 3.10.0 -OutputDirectory testrunner script: - - xbuild /p:Configuration=Release ColorSharp.sln - - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./ColorSharpTests/bin/Release/ColorSharpTests.dll + - msbuild /p:Configuration=Release ColorSharp.sln + - mono ./testrunner/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe ./ColorSharpTests/bin/Release/ColorSharpTests.dll diff --git a/ColorSharp.sln b/ColorSharp.sln index cfa12dd..2748336 100644 --- a/ColorSharp.sln +++ b/ColorSharp.sln @@ -1,29 +1,37 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorSharp", "ColorSharp\ColorSharp.csproj", "{960524F3-F375-4CDE-A82A-609CC32048E4}" +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29418.71 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorSharp", "ColorSharp\ColorSharp.csproj", "{960524F3-F375-4CDE-A82A-609CC32048E4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorSharpTests", "ColorSharpTests\ColorSharpTests.csproj", "{1EC57B2E-C96F-411B-A238-B8E490634009}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU Release_x86_64|Any CPU = Release_x86_64|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {960524F3-F375-4CDE-A82A-609CC32048E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {960524F3-F375-4CDE-A82A-609CC32048E4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {960524F3-F375-4CDE-A82A-609CC32048E4}.Release_x86_64|Any CPU.ActiveCfg = Release|Any CPU + {960524F3-F375-4CDE-A82A-609CC32048E4}.Release_x86_64|Any CPU.Build.0 = Release|Any CPU + {960524F3-F375-4CDE-A82A-609CC32048E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {960524F3-F375-4CDE-A82A-609CC32048E4}.Release|Any CPU.Build.0 = Release|Any CPU {1EC57B2E-C96F-411B-A238-B8E490634009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1EC57B2E-C96F-411B-A238-B8E490634009}.Debug|Any CPU.Build.0 = Debug|Any CPU {1EC57B2E-C96F-411B-A238-B8E490634009}.Release_x86_64|Any CPU.ActiveCfg = Release|Any CPU {1EC57B2E-C96F-411B-A238-B8E490634009}.Release_x86_64|Any CPU.Build.0 = Release|Any CPU {1EC57B2E-C96F-411B-A238-B8E490634009}.Release|Any CPU.ActiveCfg = Release|Any CPU {1EC57B2E-C96F-411B-A238-B8E490634009}.Release|Any CPU.Build.0 = Release|Any CPU - {960524F3-F375-4CDE-A82A-609CC32048E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {960524F3-F375-4CDE-A82A-609CC32048E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {960524F3-F375-4CDE-A82A-609CC32048E4}.Release_x86_64|Any CPU.ActiveCfg = Release_x86_64|Any CPU - {960524F3-F375-4CDE-A82A-609CC32048E4}.Release_x86_64|Any CPU.Build.0 = Release_x86_64|Any CPU - {960524F3-F375-4CDE-A82A-609CC32048E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {960524F3-F375-4CDE-A82A-609CC32048E4}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {772A88B2-3CC7-41C5-B019-FC41D5174A5C} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/ColorSharp/ColorSharp.csproj b/ColorSharp/ColorSharp.csproj index 853a601..96142fb 100644 --- a/ColorSharp/ColorSharp.csproj +++ b/ColorSharp/ColorSharp.csproj @@ -1,97 +1,16 @@ - - + + - Debug - AnyCPU - {960524F3-F375-4CDE-A82A-609CC32048E4} - Library - Litipk.ColorSharp - ColorSharp - A .NET/Mono library to handle color spaces (and light spectrums!) - true - true - colorsharp.pub - 0.11.0 + netstandard2.0 + + + false + false - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - false - - - true - bin\Release - prompt - 4 - false - bin\Release\ColorSharp.xml - - - true - bin\Release_x86_64 - prompt - 4 - bin\Release\ColorSharp.xml - x64 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - \ No newline at end of file + diff --git a/ColorSharpTests/ColorSharpTests.csproj b/ColorSharpTests/ColorSharpTests.csproj index b2268f8..b244591 100644 --- a/ColorSharpTests/ColorSharpTests.csproj +++ b/ColorSharpTests/ColorSharpTests.csproj @@ -1,5 +1,5 @@ - - + + Debug AnyCPU @@ -8,6 +8,8 @@ Litipk.ColorSharpTests ColorSharpTests 0.11.0 + v4.7 + true @@ -18,6 +20,7 @@ prompt 4 false + false full @@ -26,12 +29,10 @@ prompt 4 false + false - - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll - @@ -45,7 +46,6 @@ - @@ -54,6 +54,11 @@ - + + 3.12.0 + + + 3.15.1 + \ No newline at end of file diff --git a/ColorSharpTests/packages.config b/ColorSharpTests/packages.config deleted file mode 100644 index 512ce05..0000000 --- a/ColorSharpTests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file