Skip to content

Commit 29134f3

Browse files
authored
Merge pull request #35 from SceneGate/feature/yarhl-update
⬆️ Update to Yarhl v4.0 and dependencies
2 parents 5ce560b + bfa72d8 commit 29134f3

File tree

9 files changed

+22
-19
lines changed

9 files changed

+22
-19
lines changed

.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
]
2222
},
2323
"docfx": {
24-
"version": "2.74.0",
24+
"version": "2.75.2",
2525
"commands": [
2626
"docfx"
2727
]

.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ dotnet_diagnostic.CA1303.severity = none # We don't translate exception and log
241241
dotnet_diagnostic.SA1025.severity = none # Allow spaces in comments to structure info
242242
dotnet_diagnostic.IDE0045.severity = suggestion # Simplify ifs
243243
dotnet_diagnostic.IDE0046.severity = suggestion # Simplify ifs
244+
dotnet_diagnostic.IDE0057.severity = suggestion # Slice can be simplified
244245

245246
### StyleCop
246247
dotnet_diagnostic.SA1101.severity = none # Do not force to prefix local calls with 'this'
@@ -263,6 +264,8 @@ dotnet_diagnostic.CA1305.severity = none # No culture method for quick test code
263264
dotnet_diagnostic.CA1307.severity = none # No culture method for quick test code
264265
dotnet_diagnostic.SA0001.severity = none # Disable documentation
265266
dotnet_diagnostic.SA1600.severity = none # Disable documentation
267+
dotnet_diagnostic.SA1601.severity = none # Disable documentation
268+
dotnet_diagnostic.SA1602.severity = none # Disable documentation
266269
dotnet_diagnostic.SA1201.severity = none # Allow enums inside classes
267270
dotnet_diagnostic.S1144.severity = none # Remove unused setter
268271
dotnet_diagnostic.S2094.severity = none # Remove empty class

.github/workflows/build-and-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: "Build"
1616
uses: ./.github/workflows/build.yml
1717
with:
18-
dotnet_version: '8.0.100'
18+
dotnet_version: '8.0.101'
1919
secrets:
2020
test_resources: ${{ secrets.TEST_RESOURCES_URI_V1 }}
2121

@@ -27,7 +27,7 @@ jobs:
2727
needs: build
2828
uses: ./.github/workflows/deploy.yml
2929
with:
30-
dotnet_version: '8.0.100'
30+
dotnet_version: '8.0.101'
3131
azure_nuget_feed: 'https://pkgs.dev.azure.com/SceneGate/SceneGate/_packaging/SceneGate-Preview/nuget/v3/index.json'
3232
secrets:
3333
nuget_preview_token: "az" # Dummy values as we use Azure DevOps onlyg

.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 0 # We need full history for version number
3131

3232
- name: "Setup .NET SDK"
33-
uses: actions/setup-dotnet@v3
33+
uses: actions/setup-dotnet@v4
3434
with:
3535
dotnet-version: ${{ inputs.dotnet_version }}
3636

@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: "Publish artifacts to CI"
5757
if: ${{ matrix.is_main_build }}
58-
uses: actions/upload-artifact@v3
58+
uses: actions/upload-artifact@v4
5959
with:
6060
name: "Artifacts"
6161
retention-days: 7
@@ -65,6 +65,6 @@ jobs:
6565
6666
- name: Publish docs artifact to CI
6767
if: ${{ matrix.is_main_build }}
68-
uses: actions/upload-pages-artifact@v2
68+
uses: actions/upload-pages-artifact@v3
6969
with:
7070
path: build/artifacts/docs

.github/workflows/deploy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333
- name: Deploy to GitHub Pages
3434
id: deployment
35-
uses: actions/deploy-pages@v2
35+
uses: actions/deploy-pages@v4
3636

3737
push_artifacts:
3838
name: "Artifacts"
@@ -44,13 +44,13 @@ jobs:
4444
fetch-depth: 0 # We need full history for version number
4545

4646
- name: "Download artifacts"
47-
uses: actions/download-artifact@v3
47+
uses: actions/download-artifact@v4
4848
with:
4949
name: "Artifacts"
5050
path: "./build/artifacts/"
5151

5252
- name: "Setup .NET SDK"
53-
uses: actions/setup-dotnet@v3
53+
uses: actions/setup-dotnet@v4
5454
with:
5555
dotnet-version: ${{ inputs.dotnet_version }}
5656

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build/temp/
1010
.vs/
1111
*.csproj.user
1212
*.DotSettings.user
13+
launchSettings.json
1314

1415
# Test results
1516
BenchmarkDotNet.Artifacts/

build/orchestrator/BuildSystem.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Cake.Frosting.PleOps.Recipe" Version="1.0.1" />
14+
<PackageReference Include="Cake.Frosting.PleOps.Recipe" Version="1.0.3" />
1515
</ItemGroup>
1616

1717
</Project>

src/Directory.Packages.props

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project>
22
<!-- Centralize dependency management -->
33
<ItemGroup>
4-
<PackageVersion Include="Yarhl" Version="4.0.0-preview.283" />
5-
<PackageVersion Include="Yarhl.Media.Text" Version="4.0.0-preview.283" />
6-
<PackageVersion Include="Texim" Version="0.1.0-preview.207" />
4+
<PackageVersion Include="Yarhl" Version="4.0.0" />
5+
<PackageVersion Include="Yarhl.Media.Text" Version="4.0.0" />
6+
<PackageVersion Include="Texim" Version="0.1.0-preview.210" />
77
<PackageVersion Include="System.Data.HashFunction.CRC" Version="2.0.0" />
88
<PackageVersion Include="Portable.BouncyCastle" Version="1.9.0" />
9-
<PackageVersion Include="YamlDotNet" Version="13.7.1" />
9+
<PackageVersion Include="YamlDotNet" Version="15.1.1" />
1010
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
11-
<PackageVersion Include="nunit" Version="4.0.0" />
11+
<PackageVersion Include="nunit" Version="4.0.1" />
1212
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
13-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
13+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1414
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
15-
<PackageVersion Include="BenchmarkDotNet" Version="0.13.10" />
16-
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.14.0.81108" />
15+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
16+
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.19.0.84025" />
1717
</ItemGroup>
1818
</Project>

src/nuget.config

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<package pattern="*" />
1111
</packageSource>
1212
<packageSource key="SceneGate-Preview">
13-
<package pattern="Yarhl*" />
1413
<package pattern="Texim" />
1514
</packageSource>
1615
</packageSourceMapping>

0 commit comments

Comments
 (0)