Skip to content

Commit

Permalink
🔧Update dependencias and build system
Browse files Browse the repository at this point in the history
  • Loading branch information
pleonex committed Sep 10, 2024
1 parent 777c888 commit 6d2b136
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 32 deletions.
17 changes: 11 additions & 6 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,36 @@
"version": "5.12.0",
"commands": [
"dotnet-gitversion"
]
],
"rollForward": false
},
"thirdlicense": {
"version": "1.3.1",
"commands": [
"thirdlicense"
]
],
"rollForward": false
},
"dotnet-reportgenerator-globaltool": {
"version": "5.2.0",
"commands": [
"reportgenerator"
]
],
"rollForward": false
},
"docfx": {
"version": "2.74.0",
"version": "2.77.0",
"commands": [
"docfx"
]
],
"rollForward": false
},
"gitreleasemanager.tool": {
"version": "0.16.0",
"commands": [
"dotnet-gitreleasemanager"
]
],
"rollForward": false
}
}
}
2 changes: 2 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ dotnet_diagnostic.CA1303.severity = none # We don't translate exception and log
dotnet_diagnostic.SA1025.severity = none # Allow spaces in comments to structure info
dotnet_diagnostic.IDE0045.severity = suggestion # Simplify ifs
dotnet_diagnostic.IDE0046.severity = suggestion # Simplify ifs
dotnet_diagnostic.IDE0057.severity = suggestion # Slice can be simplified

### StyleCop
dotnet_diagnostic.SA1101.severity = none # Do not force to prefix local calls with 'this'
Expand All @@ -267,6 +268,7 @@ dotnet_diagnostic.SA0001.severity = none # Disable documentation
dotnet_diagnostic.SA1402.severity = none # Multiple types in the same file
dotnet_diagnostic.SA1600.severity = none # Disable documentation
dotnet_diagnostic.SA1601.severity = none # Disable documentation
dotnet_diagnostic.SA1602.severity = none # Disable documentation
dotnet_diagnostic.SA1201.severity = none # Allow enums inside classes
dotnet_diagnostic.S1144.severity = none # Remove unused setter
dotnet_diagnostic.S2094.severity = none # Remove empty class
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: "Build"
uses: ./.github/workflows/build.yml
with:
dotnet_version: '8.0.100'
dotnet_version: '8.0.401'

# Preview release on push to develop only
# Stable release on version tag push only
Expand All @@ -25,7 +25,7 @@ jobs:
needs: build
uses: ./.github/workflows/deploy.yml
with:
dotnet_version: '8.0.100'
dotnet_version: '8.0.401'
azure_nuget_feed: 'https://pkgs.dev.azure.com/SceneGate/SceneGate/_packaging/SceneGate-Preview/nuget/v3/index.json'
secrets:
nuget_preview_token: "az" # Dummy values as we use Azure DevOps
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,15 @@ jobs:
lfs: true

- name: "Setup .NET SDK"
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ inputs.dotnet_version }}

- name: "Setup .NET 6.0 SDK"
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.425'

- name: "Build and test"
run: dotnet run --project build/orchestrator -- --target=Default --dotnet-configuration=Release
env:
Expand All @@ -43,7 +48,7 @@ jobs:

- name: "Publish artifacts to CI"
if: ${{ matrix.is_main_build }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Artifacts"
retention-days: 7
Expand All @@ -53,6 +58,6 @@ jobs:
- name: Publish docs artifact to CI
if: ${{ matrix.is_main_build }}
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: build/artifacts/docs
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4

push_artifacts:
name: "Artifacts"
Expand All @@ -44,13 +44,13 @@ jobs:
fetch-depth: 0 # We need full history for version number

- name: "Download artifacts"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "Artifacts"
path: "./build/artifacts/"

- name: "Setup .NET SDK"
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ inputs.dotnet_version }}

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ build/temp/
.vs/
*.csproj.user
*.DotSettings.user
launchSettings.json
2 changes: 1 addition & 1 deletion build/orchestrator/BuildSystem.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Frosting.PleOps.Recipe" Version="1.0.1" />
<PackageReference Include="Cake.Frosting.PleOps.Recipe" Version="1.0.3" />
</ItemGroup>

</Project>
18 changes: 9 additions & 9 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project>
<!-- Centralize dependency management -->
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageVersion Include="Yarhl" Version="4.0.0-preview.283" />
<PackageVersion Include="YamlDotNet" Version="13.7.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="nunit" Version="4.0.1" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.15.0.81779" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageVersion Include="Yarhl" Version="4.0.0" />
<PackageVersion Include="YamlDotNet" Version="16.1.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.1" />
<PackageVersion Include="nunit" Version="4.2.2" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.32.0.97167" />
</ItemGroup>
</Project>
4 changes: 1 addition & 3 deletions src/Lemon/Containers/Converters/Ncch2Binary.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ namespace SceneGate.Lemon.Containers.Converters
/// </summary>
/// <remarks>
/// <p>This converter expects to have a node with the following binary
/// children: header_data/partition_id, header_data/maker_code
/// header_data/version, header_data/program_id, header_data/product_code,
/// header_data/flag_(0 through 7),
/// children:
/// extended_header (optional), access_descriptor (optional), sdk_info.txt (optional),
/// logo.bin (optional), system (optional), rom (optional).</p>
/// </remarks>
Expand Down
5 changes: 0 additions & 5 deletions src/nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@
<packageSources>
<clear/>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="SceneGate-Preview" value="https://pkgs.dev.azure.com/SceneGate/SceneGate/_packaging/SceneGate-Preview/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
<packageSource key="SceneGate-Preview">
<package pattern="Yarhl*" />
<package pattern="Texim" />
</packageSource>
</packageSourceMapping>
</configuration>

0 comments on commit 6d2b136

Please sign in to comment.