Skip to content

Commit c15107a

Browse files
glopesdevglopesdev
authored
Merge pull request #29 from NgrDavid/main
Common CI/CD and repository layout
2 parents aa4f994 + 9536001 commit c15107a

39 files changed

+686
-286
lines changed

‎.bonsai/NuGet.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="Gallery" value="Gallery" />
5-
<add key="Bonsai Packages" value="https://www.myget.org/F/bonsai/api/v3/index.json" />
6-
<add key="Community Packages" value="https://www.myget.org/F/bonsai-community/api/v3/index.json" />
74
</packageSources>
85
</configuration>

‎.config/dotnet-tools.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
"isRoot": true,
44
"tools": {
55
"docfx": {
6-
"version": "2.75.3",
6+
"version": "2.78.3",
77
"commands": [
88
"docfx"
9-
]
9+
],
10+
"rollForward": false
1011
}
1112
}
1213
}

‎.editorconfig‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
6+
#--------------------------------------------------------------------------------------------------
7+
# XML, JSON, and web files
8+
#--------------------------------------------------------------------------------------------------
9+
[*.{xml,csproj,vcxproj,vcxproj.filters,shproj,props,targets,config,nuspec,resx,vsixmanifest,wxs,vstemplate,slnx}]
10+
indent_size = 2
11+
12+
[*.json]
13+
indent_size = 2
14+
15+
[*.{html,css}]
16+
indent_size = 2
17+
18+
#--------------------------------------------------------------------------------------------------
19+
# C++
20+
#--------------------------------------------------------------------------------------------------
21+
[*.{c,cpp,h,hpp,ixx}]
22+
indent_size = 4
23+
charset = utf-8-bom
24+
trim_trailing_whitespace = true
25+
insert_final_newline = true
26+
27+
#--------------------------------------------------------------------------------------------------
28+
# C#
29+
#--------------------------------------------------------------------------------------------------
30+
[*.{cs,csx}]
31+
indent_size = 4
32+
charset = utf-8-bom
33+
trim_trailing_whitespace = true
34+
insert_final_newline = true
35+
36+
# Language keyword vs full type name
37+
# Predefined for members, etc does not create a message because the explicitly sized types are conveient in interop scenarios where the bit size matters.
38+
dotnet_style_predefined_type_for_locals_parameters_members = true:none
39+
dotnet_style_predefined_type_for_member_access = true:suggestion
40+
41+
# Instantiate argument exceptions correctly
42+
dotnet_diagnostic.CA2208.severity = warning
43+
44+
# Don't complain about not using modern collection syntax
45+
dotnet_style_prefer_collection_expression = never
46+
csharp_style_prefer_range_operator = false

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# Config
99
*.gitignore text
1010
*.gitattributes text
11+
*.gitmodules text eol=lf
1112
*.editorconfig text
1213
*.git-blame-ignore-revs text
1314
*.sln text
@@ -39,4 +40,4 @@ LICENSE text
3940
*.png binary
4041
*.ico binary
4142
*.gif binary
42-
*.svg text
43+
*.svg text

‎.github/workflows/Bonsai.Scripting.Python.yml‎

Lines changed: 344 additions & 0 deletions
Large diffs are not rendered by default.

‎.github/workflows/docs.yml‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
.vs
1+
.bonsai/Bonsai.exe*
2+
.bonsai/Packages/
3+
.bonsai/Settings/
4+
.vs/
5+
/artifacts/
26
.venv
3-
bin
4-
obj
5-
Packages
6-
*.exe
7-
*.exe.*
87
*.user
98
*.suo

‎.gitmodules‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "docs/bonsai"]
2-
path = docs/bonsai
3-
url = https://github.com/bonsai-rx/docfx-tools
1+
[submodule "docs/bonsai-docfx"]
2+
path = docs/bonsai-docfx
3+
url = https://github.com/bonsai-rx/docfx-tools.git

src/Bonsai.Scripting.Python.sln renamed to Bonsai.Scripting.Python.sln

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.3.32825.248
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bonsai.Scripting.Python", "Bonsai.Scripting.Python\Bonsai.Scripting.Python.csproj", "{DE54420F-E2A7-48E5-B96E-7D9CEA1B2CB0}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bonsai.Scripting.Python", "src\Bonsai.Scripting.Python\Bonsai.Scripting.Python.csproj", "{DE54420F-E2A7-48E5-B96E-7D9CEA1B2CB0}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{497840F3-F4DC-4E8A-A000-21E5929B945B}"
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DEE5DD87-39C1-BF34-B639-A387DCCF972B}"
99
ProjectSection(SolutionItems) = preProject
10-
Directory.Build.props = Directory.Build.props
10+
build\Common.csproj.props = build\Common.csproj.props
11+
build\Common.csproj.targets = build\Common.csproj.targets
12+
build\Common.Tests.csproj.props = build\Common.Tests.csproj.props
13+
build\icon.png = build\icon.png
14+
build\Package.props = build\Package.props
15+
build\Project.csproj.props = build\Project.csproj.props
1116
EndProjectSection
1217
EndProject
1318
Global

‎Directory.Build.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="build/Common$(MSBuildProjectExtension).props" Condition="Exists('build/Common$(MSBuildProjectExtension).props')"/>
3+
</Project>

0 commit comments

Comments
 (0)