Skip to content

Commit 97afd7d

Browse files
followynnefollowynne
authored
chore: release activities towards 3.1.0 (#149)
1 parent 7f4842b commit 97afd7d

File tree

24 files changed

+492
-492
lines changed

24 files changed

+492
-492
lines changed

‎.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,15 @@
120120
"contributions": [
121121
"code"
122122
]
123+
},
124+
{
125+
"login": "techgarage-ir",
126+
"name": "Tech Garage",
127+
"avatar_url": "https://avatars.githubusercontent.com/u/126519308?v=4",
128+
"profile": "https://techgarage.ir/",
129+
"contributions": [
130+
"code"
131+
]
123132
}
124133
],
125134
"contributorsPerLine": 10

‎.github/workflows/DotNET-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
with:
3737
distribution: 'temurin'
3838
java-version: '17'
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
with:
4141
fetch-depth: 0
4242
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
43-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4444
with:
4545
path: |
4646
.nuke/temp

‎.github/workflows/JS-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
with:
3737
distribution: 'temurin'
3838
java-version: '17'
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
with:
4141
fetch-depth: 0
4242
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
43-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4444
with:
4545
path: |
4646
.nuke/temp

‎.github/workflows/Release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
with:
4949
distribution: 'temurin'
5050
java-version: '17'
51-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v4
5252
with:
5353
fetch-depth: 0
5454
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
55-
uses: actions/cache@v3
55+
uses: actions/cache@v4
5656
with:
5757
path: |
5858
.nuke/temp

‎.nuke/build.schema.json

Lines changed: 102 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,119 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"$ref": "#/definitions/build",
4-
"title": "Build Schema",
3+
"properties": {
4+
"Configuration": {
5+
"type": "string",
6+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
7+
"enum": [
8+
"Debug",
9+
"Release"
10+
]
11+
},
12+
"ElasticProvider": {
13+
"type": "string"
14+
},
15+
"MongoProvider": {
16+
"type": "string"
17+
},
18+
"MsSqlProvider": {
19+
"type": "string"
20+
},
21+
"MySqlProvider": {
22+
"type": "string"
23+
},
24+
"NugetApiKey": {
25+
"type": "string",
26+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
27+
},
28+
"PostgresProvider": {
29+
"type": "string"
30+
},
31+
"Solution": {
32+
"type": "string",
33+
"description": "Path to a solution file that is automatically loaded"
34+
},
35+
"SonarToken": {
36+
"type": "string",
37+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
38+
},
39+
"SonarTokenUi": {
40+
"type": "string",
41+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
42+
},
43+
"Ui": {
44+
"type": "string"
45+
}
46+
},
547
"definitions": {
6-
"build": {
7-
"type": "object",
48+
"Host": {
49+
"type": "string",
50+
"enum": [
51+
"AppVeyor",
52+
"AzurePipelines",
53+
"Bamboo",
54+
"Bitbucket",
55+
"Bitrise",
56+
"GitHubActions",
57+
"GitLab",
58+
"Jenkins",
59+
"Rider",
60+
"SpaceAutomation",
61+
"TeamCity",
62+
"Terminal",
63+
"TravisCI",
64+
"VisualStudio",
65+
"VSCode"
66+
]
67+
},
68+
"ExecutableTarget": {
69+
"type": "string",
70+
"enum": [
71+
"Backend_Clean",
72+
"Backend_Compile",
73+
"Backend_Report_Ci",
74+
"Backend_Restore",
75+
"Backend_SonarScan_End",
76+
"Backend_SonarScan_Start",
77+
"Backend_Test",
78+
"Backend_Test_Ci",
79+
"Clean",
80+
"Frontend_Build",
81+
"Frontend_Clean",
82+
"Frontend_Restore",
83+
"Frontend_Tests",
84+
"Frontend_Tests_Ci",
85+
"Pack",
86+
"Publish"
87+
]
88+
},
89+
"Verbosity": {
90+
"type": "string",
91+
"description": "",
92+
"enum": [
93+
"Verbose",
94+
"Normal",
95+
"Minimal",
96+
"Quiet"
97+
]
98+
},
99+
"NukeBuild": {
8100
"properties": {
9-
"Configuration": {
10-
"type": "string",
11-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
12-
"enum": [
13-
"Debug",
14-
"Release"
15-
]
16-
},
17101
"Continue": {
18102
"type": "boolean",
19103
"description": "Indicates to continue a previously failed build attempt"
20104
},
21-
"ElasticProvider": {
22-
"type": "string"
23-
},
24105
"Help": {
25106
"type": "boolean",
26107
"description": "Shows the help text for this build assembly"
27108
},
28109
"Host": {
29-
"type": "string",
30110
"description": "Host for execution. Default is 'automatic'",
31-
"enum": [
32-
"AppVeyor",
33-
"AzurePipelines",
34-
"Bamboo",
35-
"Bitbucket",
36-
"Bitrise",
37-
"GitHubActions",
38-
"GitLab",
39-
"Jenkins",
40-
"Rider",
41-
"SpaceAutomation",
42-
"TeamCity",
43-
"Terminal",
44-
"TravisCI",
45-
"VisualStudio",
46-
"VSCode"
47-
]
48-
},
49-
"MongoProvider": {
50-
"type": "string"
51-
},
52-
"MsSqlProvider": {
53-
"type": "string"
54-
},
55-
"MySqlProvider": {
56-
"type": "string"
111+
"$ref": "#/definitions/Host"
57112
},
58113
"NoLogo": {
59114
"type": "boolean",
60115
"description": "Disables displaying the NUKE logo"
61116
},
62-
"NugetApiKey": {
63-
"type": "string",
64-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
65-
},
66117
"Partition": {
67118
"type": "string",
68119
"description": "Partition to use on CI"
@@ -71,9 +122,6 @@
71122
"type": "boolean",
72123
"description": "Shows the execution plan (HTML)"
73124
},
74-
"PostgresProvider": {
75-
"type": "string"
76-
},
77125
"Profile": {
78126
"type": "array",
79127
"description": "Defines the profiles to load",
@@ -89,78 +137,22 @@
89137
"type": "array",
90138
"description": "List of targets to be skipped. Empty list skips all dependencies",
91139
"items": {
92-
"type": "string",
93-
"enum": [
94-
"Backend_Clean",
95-
"Backend_Compile",
96-
"Backend_Report_Ci",
97-
"Backend_Restore",
98-
"Backend_SonarScan_End",
99-
"Backend_SonarScan_Start",
100-
"Backend_Test",
101-
"Backend_Test_Ci",
102-
"Clean",
103-
"Frontend_Build",
104-
"Frontend_Clean",
105-
"Frontend_Restore",
106-
"Frontend_Tests",
107-
"Frontend_Tests_Ci",
108-
"Pack",
109-
"Publish"
110-
]
140+
"$ref": "#/definitions/ExecutableTarget"
111141
}
112142
},
113-
"Solution": {
114-
"type": "string",
115-
"description": "Path to a solution file that is automatically loaded"
116-
},
117-
"SonarToken": {
118-
"type": "string",
119-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
120-
},
121-
"SonarTokenUi": {
122-
"type": "string",
123-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
124-
},
125143
"Target": {
126144
"type": "array",
127145
"description": "List of targets to be invoked. Default is '{default_target}'",
128146
"items": {
129-
"type": "string",
130-
"enum": [
131-
"Backend_Clean",
132-
"Backend_Compile",
133-
"Backend_Report_Ci",
134-
"Backend_Restore",
135-
"Backend_SonarScan_End",
136-
"Backend_SonarScan_Start",
137-
"Backend_Test",
138-
"Backend_Test_Ci",
139-
"Clean",
140-
"Frontend_Build",
141-
"Frontend_Clean",
142-
"Frontend_Restore",
143-
"Frontend_Tests",
144-
"Frontend_Tests_Ci",
145-
"Pack",
146-
"Publish"
147-
]
147+
"$ref": "#/definitions/ExecutableTarget"
148148
}
149149
},
150-
"Ui": {
151-
"type": "string"
152-
},
153150
"Verbosity": {
154-
"type": "string",
155151
"description": "Logging verbosity during build execution. Default is 'Normal'",
156-
"enum": [
157-
"Minimal",
158-
"Normal",
159-
"Quiet",
160-
"Verbose"
161-
]
152+
"$ref": "#/definitions/Verbosity"
162153
}
163154
}
164155
}
165-
}
156+
},
157+
"$ref": "#/definitions/NukeBuild"
166158
}

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>
26-
<PackageReference Include="Teronis.MSBuild.Packaging.ProjectBuildInPackage" Version="1.0.0">
26+
<PackageReference Include="Tenekon.MSBuild.Packaging.ProjectBuildInPackage" Version="2.0.0">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ See [LICENSE](https://github.com/serilog-contrib/serilog-ui/blob/master/LICENSE)
122122
<tr>
123123
<td align="center" valign="top" width="10%"><a href="https://github.com/uthmanrahimi"><img src="https://avatars.githubusercontent.com/u/45357615?v=4?s=60" width="60px;" alt="Uthman"/><br /><sub><b>Uthman</b></sub></a><br /><a href="https://github.com/serilog-contrib/serilog-ui/commits?author=uthmanrahimi" title="Code">💻</a></td>
124124
<td align="center" valign="top" width="10%"><a href="https://github.com/jorgevp"><img src="https://avatars.githubusercontent.com/u/3268148?v=4?s=60" width="60px;" alt="jorgevp"/><br /><sub><b>jorgevp</b></sub></a><br /><a href="https://github.com/serilog-contrib/serilog-ui/commits?author=jorgevp" title="Code">💻</a></td>
125+
<td align="center" valign="top" width="10%"><a href="https://techgarage.ir/"><img src="https://avatars.githubusercontent.com/u/126519308?v=4?s=60" width="60px;" alt="Tech Garage"/><br /><sub><b>Tech Garage</b></sub></a><br /><a href="https://github.com/serilog-contrib/serilog-ui/commits?author=techgarage-ir" title="Code">💻</a></td>
125126
</tr>
126127
</tbody>
127128
</table>

‎build/_build.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageDownload Include="dotnet-coverage" Version="[17.12.4]"/>
29-
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.3.9]"/>
28+
<PackageDownload Include="dotnet-coverage" Version="[17.12.5]"/>
29+
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.3.10]"/>
3030
<PackageDownload Include="dotnet-sonarscanner" Version="[8.0.3]" />
3131
</ItemGroup>
3232
</Project>

‎samples/WebApi/WebApi.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
<PackageReference Include="Serilog.Sinks.Map" Version="2.0.0"/>
1515
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.1" />
1616
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0"/>
17-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3"/>
17+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1"/>
1818
<PackageReference Include="Testcontainers" Version="3.10.0"/>
1919
<PackageReference Include="Testcontainers.MsSql" Version="3.10.0"/>
2020
</ItemGroup>
2121

2222
<!-- Serilog UI packages -->
2323
<ItemGroup>
2424
<!-- comment/uncomment to directly reference Nuget release
25-
<PackageReference Include="Serilog.UI" Version=">3.0.2"/>
26-
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version=">3.0.0"/>
27-
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version=">3.0.0"/>
25+
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
26+
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.1.0"/>
27+
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.1.0"/>
2828
-->
2929

3030
<!-- comment/uncomment to directly reference solution projects -->

‎samples/WebApp/WebApp.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.0.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))"/>
1919
<PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="1.1.3" Condition="$([MSBuild]::IsOSPlatform('Windows'))"/>
2020
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2"/>
21-
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2"/>
21+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4"/>
2222
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
2323
<PackageReference Include="Serilog.Sinks.MongoDB" Version="6.0.0" />
2424
</ItemGroup>
@@ -38,8 +38,8 @@
3838
<!-- Serilog UI packages -->
3939
<ItemGroup>
4040
<!-- comment/uncomment to directly reference Nuget release
41-
<PackageReference Include="Serilog.UI" Version=">3.0.2"/>
42-
<PackageReference Include="Serilog.UI.MongoDbProvider" Version=">3.0.0"/>
41+
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
42+
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="3.1.0"/>
4343
-->
4444

4545
<!-- comment/uncomment to directly reference solution projects -->

0 commit comments

Comments
 (0)