Skip to content

Commit b107a23

Browse files
carlbjorknascarlbjorknas
committed
Merge branch 'master' into patches/restore-all-disabled-compiler-warnings
2 parents 5089ef4 + 75bc79f commit b107a23

File tree

393 files changed

+2819
-2421
lines changed

Some content is hidden

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

393 files changed

+2819
-2421
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
12+
A clear and concise description of what the bug is.
13+
14+
**Version of NSwag toolchain, computer and .NET runtime used**
15+
16+
With which versions did you encounter this behavior.
17+
18+
**To Reproduce**
19+
20+
Ideally code samples or event unit test.
21+
22+
**Expected behavior**
23+
24+
A clear and concise description of what you expected to happen.
25+
26+
**Additional context**
27+
28+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
12+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
13+
14+
**Describe the solution you'd like**
15+
16+
A clear and concise description of what you want to happen.
17+
18+
**Describe alternatives you've considered**
19+
20+
A clear and concise description of any alternative solutions or features you've considered.
21+
22+
**Additional context**
23+
24+
Add any other context or screenshots about the feature request here.

‎.github/workflows/build.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ jobs:
4343
- uses: actions/setup-dotnet@v4
4444
with:
4545
dotnet-version: |
46-
6.0
47-
- uses: actions/checkout@v3
46+
8.0
47+
9.0
48+
- uses: actions/checkout@v4
4849
- name: 'Run: Compile, Test, Pack, Publish'
4950
run: ./build.cmd Compile Test Pack Publish
5051
env:
@@ -53,22 +54,22 @@ jobs:
5354
CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
5455
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
5556
- name: 'Publish: NSwag.zip'
56-
uses: actions/upload-artifact@v3
57+
uses: actions/upload-artifact@v4
5758
with:
5859
name: NSwag.zip
5960
path: artifacts/NSwag.zip
6061
- name: 'Publish: NSwag.Npm.zip'
61-
uses: actions/upload-artifact@v3
62+
uses: actions/upload-artifact@v4
6263
with:
6364
name: NSwag.Npm.zip
6465
path: artifacts/NSwag.Npm.zip
6566
- name: 'Publish: NSwagStudio.msi'
66-
uses: actions/upload-artifact@v3
67+
uses: actions/upload-artifact@v4
6768
with:
6869
name: NSwagStudio.msi
6970
path: artifacts/NSwagStudio.msi
7071
- name: 'Publish: NuGet Packages'
71-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
7273
with:
7374
name: NuGet Packages
7475
path: artifacts/*.nupkg
@@ -79,8 +80,9 @@ jobs:
7980
- uses: actions/setup-dotnet@v4
8081
with:
8182
dotnet-version: |
82-
6.0
83-
- uses: actions/checkout@v3
83+
8.0
84+
9.0
85+
- uses: actions/checkout@v4
8486
- name: 'Run: Compile, Test, Pack, Publish'
8587
run: ./build.cmd Compile Test Pack Publish
8688
env:
@@ -95,8 +97,9 @@ jobs:
9597
- uses: actions/setup-dotnet@v4
9698
with:
9799
dotnet-version: |
98-
6.0
99-
- uses: actions/checkout@v3
100+
8.0
101+
9.0
102+
- uses: actions/checkout@v4
100103
- name: 'Run: Compile, Test, Pack, Publish'
101104
run: ./build.cmd Compile Test Pack Publish
102105
env:

‎.github/workflows/pr.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ on:
2525
- '**/*.*'
2626
- '!**/*.md'
2727

28+
concurrency:
29+
group: ${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.run_id }}
30+
cancel-in-progress: true
31+
2832
jobs:
2933
windows-latest:
3034
name: windows-latest
@@ -41,27 +45,28 @@ jobs:
4145
- uses: actions/setup-dotnet@v4
4246
with:
4347
dotnet-version: |
44-
6.0
45-
- uses: actions/checkout@v3
48+
8.0
49+
9.0
50+
- uses: actions/checkout@v4
4651
- name: 'Run: Compile, Test, Pack'
4752
run: ./build.cmd Compile Test Pack
4853
- name: 'Publish: NSwag.zip'
49-
uses: actions/upload-artifact@v3
54+
uses: actions/upload-artifact@v4
5055
with:
5156
name: NSwag.zip
5257
path: artifacts/NSwag.zip
5358
- name: 'Publish: NSwag.Npm.zip'
54-
uses: actions/upload-artifact@v3
59+
uses: actions/upload-artifact@v4
5560
with:
5661
name: NSwag.Npm.zip
5762
path: artifacts/NSwag.Npm.zip
5863
- name: 'Publish: NSwagStudio.msi'
59-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
6065
with:
6166
name: NSwagStudio.msi
6267
path: artifacts/NSwagStudio.msi
6368
- name: 'Publish: NuGet Packages'
64-
uses: actions/upload-artifact@v3
69+
uses: actions/upload-artifact@v4
6570
with:
6671
name: NuGet Packages
6772
path: artifacts/*.nupkg
@@ -72,8 +77,9 @@ jobs:
7277
- uses: actions/setup-dotnet@v4
7378
with:
7479
dotnet-version: |
75-
6.0
76-
- uses: actions/checkout@v3
80+
8.0
81+
9.0
82+
- uses: actions/checkout@v4
7783
- name: 'Run: Compile, Test, Pack'
7884
run: ./build.cmd Compile Test Pack
7985
macos-latest:
@@ -83,7 +89,8 @@ jobs:
8389
- uses: actions/setup-dotnet@v4
8490
with:
8591
dotnet-version: |
86-
6.0
87-
- uses: actions/checkout@v3
92+
8.0
93+
9.0
94+
- uses: actions/checkout@v4
8895
- name: 'Run: Compile, Test, Pack'
8996
run: ./build.cmd Compile Test Pack

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ _ReSharper.Caches/
8282

8383
/artifacts
8484
*.binlog
85+
*.gen

‎.nuke/build.schema.json

Lines changed: 83 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,50 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"$ref": "#/definitions/build",
4-
"title": "Build Schema",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"Clean",
28+
"Compile",
29+
"InstallDependencies",
30+
"Pack",
31+
"Publish",
32+
"Restore",
33+
"Test"
34+
]
35+
},
36+
"Verbosity": {
37+
"type": "string",
38+
"description": "",
39+
"enum": [
40+
"Verbose",
41+
"Normal",
42+
"Minimal",
43+
"Quiet"
44+
]
45+
},
46+
"NukeBuild": {
847
"properties": {
9-
"ChocoApiKey": {
10-
"type": "string",
11-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
12-
},
13-
"Configuration": {
14-
"type": "string",
15-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
16-
"enum": [
17-
"Debug",
18-
"Release"
19-
]
20-
},
2148
"Continue": {
2249
"type": "boolean",
2350
"description": "Indicates to continue a previously failed build attempt"
@@ -27,42 +54,13 @@
2754
"description": "Shows the help text for this build assembly"
2855
},
2956
"Host": {
30-
"type": "string",
3157
"description": "Host for execution. Default is 'automatic'",
32-
"enum": [
33-
"AppVeyor",
34-
"AzurePipelines",
35-
"Bamboo",
36-
"Bitbucket",
37-
"Bitrise",
38-
"GitHubActions",
39-
"GitLab",
40-
"Jenkins",
41-
"Rider",
42-
"SpaceAutomation",
43-
"TeamCity",
44-
"Terminal",
45-
"TravisCI",
46-
"VisualStudio",
47-
"VSCode"
48-
]
49-
},
50-
"MyGetApiKey": {
51-
"type": "string",
52-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
58+
"$ref": "#/definitions/Host"
5359
},
5460
"NoLogo": {
5561
"type": "boolean",
5662
"description": "Disables displaying the NUKE logo"
5763
},
58-
"NpmAuthToken": {
59-
"type": "string",
60-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
61-
},
62-
"NuGetApiKey": {
63-
"type": "string",
64-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
65-
},
6664
"Partition": {
6765
"type": "string",
6866
"description": "Partition to use on CI"
@@ -86,49 +84,58 @@
8684
"type": "array",
8785
"description": "List of targets to be skipped. Empty list skips all dependencies",
8886
"items": {
89-
"type": "string",
90-
"enum": [
91-
"Clean",
92-
"Compile",
93-
"InstallDependencies",
94-
"Pack",
95-
"Publish",
96-
"Restore",
97-
"Test"
98-
]
87+
"$ref": "#/definitions/ExecutableTarget"
9988
}
10089
},
101-
"Solution": {
102-
"type": "string",
103-
"description": "Path to a solution file that is automatically loaded"
104-
},
10590
"Target": {
10691
"type": "array",
10792
"description": "List of targets to be invoked. Default is '{default_target}'",
10893
"items": {
109-
"type": "string",
110-
"enum": [
111-
"Clean",
112-
"Compile",
113-
"InstallDependencies",
114-
"Pack",
115-
"Publish",
116-
"Restore",
117-
"Test"
118-
]
94+
"$ref": "#/definitions/ExecutableTarget"
11995
}
12096
},
12197
"Verbosity": {
122-
"type": "string",
12398
"description": "Logging verbosity during build execution. Default is 'Normal'",
99+
"$ref": "#/definitions/Verbosity"
100+
}
101+
}
102+
}
103+
},
104+
"allOf": [
105+
{
106+
"properties": {
107+
"ChocoApiKey": {
108+
"type": "string",
109+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
110+
},
111+
"Configuration": {
112+
"type": "string",
113+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
124114
"enum": [
125-
"Minimal",
126-
"Normal",
127-
"Quiet",
128-
"Verbose"
115+
"Debug",
116+
"Release"
129117
]
118+
},
119+
"MyGetApiKey": {
120+
"type": "string",
121+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
122+
},
123+
"NpmAuthToken": {
124+
"type": "string",
125+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
126+
},
127+
"NuGetApiKey": {
128+
"type": "string",
129+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
130+
},
131+
"Solution": {
132+
"type": "string",
133+
"description": "Path to a solution file that is automatically loaded"
130134
}
131135
}
136+
},
137+
{
138+
"$ref": "#/definitions/NukeBuild"
132139
}
133-
}
140+
]
134141
}

0 commit comments

Comments
 (0)