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

chore: release activities towards 3.1.0 #149

Merged
merged 12 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
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
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@
"contributions": [
"code"
]
},
{
"login": "techgarage-ir",
"name": "Tech Garage",
"avatar_url": "https://avatars.githubusercontent.com/u/126519308?v=4",
"profile": "https://techgarage.ir/",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 10
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/DotNET-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/JS-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ jobs:
with:
distribution: 'temurin'
java-version: '17'
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
.nuke/temp
Expand Down
212 changes: 102 additions & 110 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -1,68 +1,119 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/build",
"title": "Build Schema",
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"ElasticProvider": {
"type": "string"
},
"MongoProvider": {
"type": "string"
},
"MsSqlProvider": {
"type": "string"
},
"MySqlProvider": {
"type": "string"
},
"NugetApiKey": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"PostgresProvider": {
"type": "string"
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"SonarToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"SonarTokenUi": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Ui": {
"type": "string"
}
},
"definitions": {
"build": {
"type": "object",
"Host": {
"type": "string",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"ExecutableTarget": {
"type": "string",
"enum": [
"Backend_Clean",
"Backend_Compile",
"Backend_Report_Ci",
"Backend_Restore",
"Backend_SonarScan_End",
"Backend_SonarScan_Start",
"Backend_Test",
"Backend_Test_Ci",
"Clean",
"Frontend_Build",
"Frontend_Clean",
"Frontend_Restore",
"Frontend_Tests",
"Frontend_Tests_Ci",
"Pack",
"Publish"
]
},
"Verbosity": {
"type": "string",
"description": "",
"enum": [
"Verbose",
"Normal",
"Minimal",
"Quiet"
]
},
"NukeBuild": {
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"ElasticProvider": {
"type": "string"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"MongoProvider": {
"type": "string"
},
"MsSqlProvider": {
"type": "string"
},
"MySqlProvider": {
"type": "string"
"$ref": "#/definitions/Host"
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"NugetApiKey": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
Expand All @@ -71,9 +122,6 @@
"type": "boolean",
"description": "Shows the execution plan (HTML)"
},
"PostgresProvider": {
"type": "string"
},
"Profile": {
"type": "array",
"description": "Defines the profiles to load",
Expand All @@ -89,78 +137,22 @@
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Backend_Clean",
"Backend_Compile",
"Backend_Report_Ci",
"Backend_Restore",
"Backend_SonarScan_End",
"Backend_SonarScan_Start",
"Backend_Test",
"Backend_Test_Ci",
"Clean",
"Frontend_Build",
"Frontend_Clean",
"Frontend_Restore",
"Frontend_Tests",
"Frontend_Tests_Ci",
"Pack",
"Publish"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"SonarToken": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"SonarTokenUi": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Backend_Clean",
"Backend_Compile",
"Backend_Report_Ci",
"Backend_Restore",
"Backend_SonarScan_End",
"Backend_SonarScan_Start",
"Backend_Test",
"Backend_Test_Ci",
"Clean",
"Frontend_Build",
"Frontend_Clean",
"Frontend_Restore",
"Frontend_Tests",
"Frontend_Tests_Ci",
"Pack",
"Publish"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Ui": {
"type": "string"
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
"$ref": "#/definitions/Verbosity"
}
}
}
}
},
"$ref": "#/definitions/NukeBuild"
}
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Teronis.MSBuild.Packaging.ProjectBuildInPackage" Version="1.0.0">
<PackageReference Include="Tenekon.MSBuild.Packaging.ProjectBuildInPackage" Version="2.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ See [LICENSE](https://github.com/serilog-contrib/serilog-ui/blob/master/LICENSE)
<tr>
<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>
<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>
<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>
</tr>
</tbody>
</table>
Expand Down
4 changes: 2 additions & 2 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</ItemGroup>

<ItemGroup>
<PackageDownload Include="dotnet-coverage" Version="[17.12.4]"/>
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.3.9]"/>
<PackageDownload Include="dotnet-coverage" Version="[17.12.5]"/>
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.3.10]"/>
<PackageDownload Include="dotnet-sonarscanner" Version="[8.0.3]" />
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions samples/WebApi/WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
<PackageReference Include="Serilog.Sinks.Map" Version="2.0.0"/>
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1"/>
<PackageReference Include="Testcontainers" Version="3.10.0"/>
<PackageReference Include="Testcontainers.MsSql" Version="3.10.0"/>
</ItemGroup>

<!-- Serilog UI packages -->
<ItemGroup>
<!-- comment/uncomment to directly reference Nuget release
<PackageReference Include="Serilog.UI" Version=">3.0.2"/>
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version=">3.0.0"/>
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version=">3.0.0"/>
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.1.0"/>
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.1.0"/>
-->

<!-- comment/uncomment to directly reference solution projects -->
Expand Down
6 changes: 3 additions & 3 deletions samples/WebApp/WebApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.0.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))"/>
<PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="1.1.3" Condition="$([MSBuild]::IsOSPlatform('Windows'))"/>
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2"/>
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.2"/>
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.3"/>
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.MongoDB" Version="6.0.0" />
</ItemGroup>
Expand All @@ -38,8 +38,8 @@
<!-- Serilog UI packages -->
<ItemGroup>
<!-- comment/uncomment to directly reference Nuget release
<PackageReference Include="Serilog.UI" Version=">3.0.2"/>
<PackageReference Include="Serilog.UI.MongoDbProvider" Version=">3.0.0"/>
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="3.1.0"/>
-->

<!-- comment/uncomment to directly reference solution projects -->
Expand Down
Loading
Loading