Skip to content

Commit 46fef2f

Browse files
jeong760jeong760
authored
Merge branch 'oliverw:master' into master
2 parents f759589 + a553f62 commit 46fef2f

File tree

1,060 files changed

+168038
-81898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,060 files changed

+168038
-81898
lines changed

‎.gitattributes‎

Lines changed: 192 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,192 @@
1-
###############################################################################
2-
# Set default behavior to automatically normalize line endings.
3-
###############################################################################
4-
# * text=auto
5-
6-
###############################################################################
7-
# Set default behavior for command prompt diff.
8-
#
9-
# This is need for earlier builds of msysgit that does not have it on by
10-
# default for csharp files.
11-
# Note: This is only used by command line
12-
###############################################################################
13-
#*.cs diff=csharp
14-
15-
###############################################################################
16-
# Set the merge driver for project and solution files
17-
#
18-
# Merging from the command prompt will add diff markers to the files if there
19-
# are conflicts (Merging from VS is not affected by the settings below, in VS
20-
# the diff markers are never inserted). Diff markers may cause the following
21-
# file extensions to fail to load in VS. An alternative would be to treat
22-
# these files as binary and thus will always conflict and require user
23-
# intervention with every merge. To do so, just uncomment the entries below
24-
###############################################################################
25-
#*.sln merge=binary
26-
#*.csproj merge=binary
27-
#*.vbproj merge=binary
28-
#*.vcxproj merge=binary
29-
#*.vcproj merge=binary
30-
#*.dbproj merge=binary
31-
#*.fsproj merge=binary
32-
#*.lsproj merge=binary
33-
#*.wixproj merge=binary
34-
#*.modelproj merge=binary
35-
#*.sqlproj merge=binary
36-
#*.wwaproj merge=binary
37-
38-
###############################################################################
39-
# behavior for image files
40-
#
41-
# image files are treated as binary by default.
42-
###############################################################################
43-
#*.jpg binary
44-
#*.png binary
45-
#*.gif binary
46-
47-
###############################################################################
48-
# diff behavior for common document formats
49-
#
50-
# Convert binary document formats to text before diffing them. This feature
51-
# is only available from the command line. Turn it on by uncommenting the
52-
# entries below.
53-
###############################################################################
54-
#*.doc diff=astextplain
55-
#*.DOC diff=astextplain
56-
#*.docx diff=astextplain
57-
#*.DOCX diff=astextplain
58-
#*.dot diff=astextplain
59-
#*.DOT diff=astextplain
60-
#*.pdf diff=astextplain
61-
#*.PDF diff=astextplain
62-
#*.rtf diff=astextplain
63-
#*.RTF diff=astextplain
1+
* text=auto
2+
3+
###### Git
4+
.gitattributes text
5+
.gitignore text
6+
.gitconfig text
7+
.gitmodules text
8+
9+
##### Windows
10+
*.bat text eol=crlf
11+
*.exe binary
12+
*.dll binary
13+
14+
##### Linux
15+
*.sh text eol=lf
16+
*.so binary
17+
18+
##### Global
19+
# Documents
20+
*.sql text
21+
*.md text
22+
*.adoc text
23+
*.textile text
24+
*.mustache text
25+
*.csv text
26+
*.tab text
27+
*.tsv text
28+
*.coffee text
29+
*.css text
30+
*.htm text
31+
*.html text
32+
*.xhtml text
33+
*.inc text
34+
*.js text
35+
*.jsx text
36+
*.less text
37+
*.od text
38+
*.onlydata text
39+
*.sass text
40+
*.scm text
41+
*.log text
42+
*.properties text
43+
*.scss text
44+
*.styl text
45+
*.tag text
46+
*.ts text
47+
*.tsx text
48+
*.dockerignore text
49+
Dockerfile text
50+
*.markdown text
51+
*.mdwn text
52+
*.mdown text
53+
*.mkd text
54+
*.mkdn text
55+
*.mdtxt text
56+
*.mdtext text
57+
*.txt text
58+
AUTHORS text
59+
CHANGELOG text
60+
CHANGES text
61+
CONTRIBUTING text
62+
COPYING text
63+
copyright text
64+
*COPYRIGHT* text
65+
INSTALL text
66+
license text
67+
LICENSE text
68+
NEWS text
69+
readme text
70+
*README* text
71+
TODO text
72+
# Configuration
73+
*.cnf text
74+
*.cfg text
75+
*.conf text
76+
*.config text
77+
*.ini text
78+
*.json text
79+
*.xml text
80+
*.bowerrc text
81+
.browserslistrc text
82+
.editorconfig text
83+
*.npmignore text
84+
*.yaml text
85+
*.yml text
86+
browserslist text
87+
Makefile text
88+
makefile text
89+
Procfile text
90+
.slugignore text
91+
# Linters
92+
.csslintrc text
93+
.eslintrc text
94+
.htmlhintrc text
95+
.jscsrc text
96+
.jshintrc text
97+
.jshintignore text
98+
.stylelintrc text
99+
# Video
100+
*.3gpp binary
101+
*.3gp binary
102+
*.as binary
103+
*.asf binary
104+
*.asx binary
105+
*.fla binary
106+
*.flv binary
107+
*.m4v binary
108+
*.mng binary
109+
*.mov binary
110+
*.mp4 binary
111+
*.mpeg binary
112+
*.mpg binary
113+
*.ogv binary
114+
*.swc binary
115+
*.swf binary
116+
*.webm binary
117+
# Audio
118+
*.kar binary
119+
*.m4a binary
120+
*.mid binary
121+
*.midi binary
122+
*.mp3 binary
123+
*.ogg binary
124+
*.ra binary
125+
# Graphics
126+
*.png binary
127+
*.jpg binary
128+
*.jpeg binary
129+
*.gif binary
130+
*.tif binary
131+
*.tiff binary
132+
*.ico binary
133+
*.eps binary
134+
*.ai binary
135+
*.bmp binary
136+
*.jng binary
137+
*.jp2 binary
138+
*.jpx binary
139+
*.jxr binary
140+
*.pdf binary
141+
*.psb binary
142+
*.psd binary
143+
*.svg text
144+
*.svgz binary
145+
*.wbmp binary
146+
*.webp binary
147+
# Archives
148+
*.7z binary
149+
*.gz binary
150+
*.jar binary
151+
*.rar binary
152+
*.tar binary
153+
*.zip binary
154+
# Fonts
155+
*.ttf binary
156+
*.eot binary
157+
*.otf binary
158+
*.woff binary
159+
*.woff2 binary
160+
# Executables
161+
*.pyc binary
162+
# Objects
163+
*.o binary
164+
165+
##### IDE/Editor
166+
# Visual Studio
167+
*.sln text eol=crlf
168+
*.csproj text eol=crlf
169+
*.vbproj text eol=crlf
170+
*.vcxproj text eol=crlf
171+
*.vcproj text eol=crlf
172+
*.dbproj text eol=crlf
173+
*.fsproj text eol=crlf
174+
*.lsproj text eol=crlf
175+
*.wixproj text eol=crlf
176+
*.modelproj text eol=crlf
177+
*.sqlproj text eol=crlf
178+
*.wmaproj text eol=crlf
179+
*.xproj text eol=crlf
180+
*.props text eol=crlf
181+
*.filters text eol=crlf
182+
*.vcxitems text eol=crlf
183+
184+
##### Language
185+
# .Net
186+
*.resx text
187+
*.settings text
188+
*.cs text
189+
*.vb text
190+
*.cpp text
191+
*.h text
192+
*.fs text

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: nuget
4+
directory: "/src/Miningcore"
5+
schedule:
6+
interval: monthly
7+
open-pull-requests-limit: 10
8+
target-branch: dev

‎.github/workflows/dotnet.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: .NET
2+
3+
on:
4+
push:
5+
branches: [ master, dev ]
6+
pull_request:
7+
branches: [ master, dev ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
with:
18+
fetch-depth: 0
19+
- name: Install Build dependencies
20+
run: sudo apt-get install -y cmake build-essential libssl-dev pkg-config libboost-all-dev libsodium-dev libzmq5
21+
- name: Setup .NET
22+
uses: actions/setup-dotnet@v1
23+
with:
24+
dotnet-version: 6.0.x
25+
- name: Restore dependencies
26+
run: dotnet restore src
27+
- name: Build
28+
run: dotnet build --no-restore src
29+
- name: Test
30+
run: dotnet test --logger:"console;verbosity=detailed" --no-build --verbosity normal src

0 commit comments

Comments
 (0)