Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dotnet core 2.0 port #895

Open
wants to merge 45 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a7e923a
porting to dotnet core 2.0.
Dec 21, 2017
704396a
config work.
Dec 21, 2017
945d38b
:wrench: tiny nincy fixes.
Dec 21, 2017
7f1f59d
:wrench: nancy fixes.
Dec 21, 2017
0adf31b
:wrench: moved /web to root.
Dec 21, 2017
465a7c2
:wrench: removed nancy metrics.
Dec 21, 2017
0385904
Custom errors fix.
Dec 21, 2017
c26fa43
:wrench: updated mysql package.
Dec 21, 2017
3990bb4
:wrench: fixing tests.
Dec 21, 2017
cc7910c
:wrench: fixed tests.
Dec 21, 2017
5d49807
:wrench: use dotnet in circle.ci tests.
Dec 21, 2017
3544611
:wrench: xopy fix.
Dec 21, 2017
9daba80
another xcopy fix.
Dec 21, 2017
09dc857
fix
Dec 21, 2017
84c8f86
fix
Dec 21, 2017
0d17925
build fix
Dec 21, 2017
23956e8
:tada: updated version to 0.2.7.0.
Dec 21, 2017
05fcd01
fix back.
Dec 21, 2017
3691508
fix
Dec 21, 2017
0e4aeff
fix
Dec 21, 2017
3ced7fa
fix
Dec 21, 2017
355f7e9
xcopy fix.
Dec 21, 2017
e0a8e88
fix
Dec 21, 2017
897c0de
fix
Dec 21, 2017
0d982ad
fix
Dec 22, 2017
6ec45fa
CI build fix.
Dec 22, 2017
d2e0e7f
fix.
Dec 22, 2017
f1acb3c
nancy work.
Dec 27, 2017
693d3c9
razor work
Dec 27, 2017
e626456
more work.
Jan 4, 2018
1a83d99
more work
Jan 4, 2018
c9d2f36
fix.
Jan 4, 2018
7dde3a9
fix
Jan 4, 2018
260771c
fix.
Jan 4, 2018
c663dc1
fixed tests.
Jan 4, 2018
434b6b8
fix.
Jan 4, 2018
bf3a343
Merge branch 'develop' into feature/dotnet-core
Jan 4, 2018
06e2635
fix
Jan 4, 2018
ba79d32
fix
Jan 4, 2018
e430025
fix
Jan 4, 2018
f0455cf
Merge branch 'develop' into feature/dotnet-core
Jan 4, 2018
2113c77
fix.
Jan 4, 2018
d91bfd5
fix
Jan 4, 2018
7f55ed5
fix
Jan 4, 2018
3766384
fix tests.
Jan 23, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ jobs:
build:
working_directory: /temp
docker:
- image: mono:latest
- image: microsoft/dotnet:latest
environment:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_CLI_TELEMETRY_OPTOUT: 1
steps:
- checkout
- run: apt-get update
- run: apt-get --yes --force-yes install wget
- run: wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
- run: mono nuget.exe restore CoiniumServ.sln
- run: msbuild CoiniumServ.sln /p:Configuration=Debug
- run: mono packages/xunit.runner.console.2.3.1/tools/net452/xunit.console.exe src/Tests/bin/Debug/CoiniumServ.Tests.dll
- run: dotnet build -c CI
- run: cd src/CoiniumServ.Tests/ && dotnet xunit
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@ UpgradeLog*.XML
# Misc
Thumbs.db
build/.vs/*
.vs/*
.vs/*
33 changes: 23 additions & 10 deletions CoiniumServ.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoiniumServ", "src\CoiniumServ\CoiniumServ.csproj", "{17A4E177-A910-40F8-899D-79A7F628699E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "src\Tests\Tests.csproj", "{6045414C-C243-45B1-907E-3CC9FC168169}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "src\Tests\Tests.csproj", "{ED50E979-2514-4C10-9E68-E35574B9A9AB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoiniumServ", "src\CoiniumServ\CoiniumServ.csproj", "{FDDC0C92-0F51-4B05-B5E2-5B9479AFF540}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nancy.CustomErrors.NetStandard1.6", "contrib\Nancy.CustomErrors\src\Nancy.CustomErrors.NetStandard1.6\Nancy.CustomErrors.NetStandard1.6.csproj", "{7EC1D299-070E-46BC-A02C-1FCDB86AA893}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CI|Any CPU = CI|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{17A4E177-A910-40F8-899D-79A7F628699E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17A4E177-A910-40F8-899D-79A7F628699E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17A4E177-A910-40F8-899D-79A7F628699E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17A4E177-A910-40F8-899D-79A7F628699E}.Release|Any CPU.Build.0 = Release|Any CPU
{ED50E979-2514-4C10-9E68-E35574B9A9AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ED50E979-2514-4C10-9E68-E35574B9A9AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ED50E979-2514-4C10-9E68-E35574B9A9AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ED50E979-2514-4C10-9E68-E35574B9A9AB}.Release|Any CPU.Build.0 = Release|Any CPU
{6045414C-C243-45B1-907E-3CC9FC168169}.CI|Any CPU.ActiveCfg = CI|Any CPU
{6045414C-C243-45B1-907E-3CC9FC168169}.CI|Any CPU.Build.0 = CI|Any CPU
{6045414C-C243-45B1-907E-3CC9FC168169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6045414C-C243-45B1-907E-3CC9FC168169}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6045414C-C243-45B1-907E-3CC9FC168169}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6045414C-C243-45B1-907E-3CC9FC168169}.Release|Any CPU.Build.0 = Release|Any CPU
{FDDC0C92-0F51-4B05-B5E2-5B9479AFF540}.CI|Any CPU.ActiveCfg = CI|Any CPU
{FDDC0C92-0F51-4B05-B5E2-5B9479AFF540}.CI|Any CPU.Build.0 = CI|Any CPU
{FDDC0C92-0F51-4B05-B5E2-5B9479AFF540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FDDC0C92-0F51-4B05-B5E2-5B9479AFF540}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FDDC0C92-0F51-4B05-B5E2-5B9479AFF540}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FDDC0C92-0F51-4B05-B5E2-5B9479AFF540}.Release|Any CPU.Build.0 = Release|Any CPU
{7EC1D299-070E-46BC-A02C-1FCDB86AA893}.CI|Any CPU.ActiveCfg = CI|Any CPU
{7EC1D299-070E-46BC-A02C-1FCDB86AA893}.CI|Any CPU.Build.0 = CI|Any CPU
{7EC1D299-070E-46BC-A02C-1FCDB86AA893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7EC1D299-070E-46BC-A02C-1FCDB86AA893}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7EC1D299-070E-46BC-A02C-1FCDB86AA893}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7EC1D299-070E-46BC-A02C-1FCDB86AA893}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 6 additions & 0 deletions Nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="globalPackagesFolder" value=".\packages" />
</config>
</configuration>
Binary file added assets/Coinium.ico
Binary file not shown.
63 changes: 63 additions & 0 deletions contrib/Nancy.CustomErrors/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
Loading