Skip to content

Commit

Permalink
Merge pull request #35 from SceneGate/feature/yarhl-update
Browse files Browse the repository at this point in the history
⬆️ Update to Yarhl v4.0 and dependencies
  • Loading branch information
pleonex authored Feb 11, 2024
2 parents 5ce560b + bfa72d8 commit 29134f3
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
},
"docfx": {
"version": "2.74.0",
"version": "2.75.2",
"commands": [
"docfx"
]
Expand Down
3 changes: 3 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 @@ -263,6 +264,8 @@ dotnet_diagnostic.CA1305.severity = none # No culture method for quick test code
dotnet_diagnostic.CA1307.severity = none # No culture method for quick test code
dotnet_diagnostic.SA0001.severity = none # Disable documentation
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.101'
secrets:
test_resources: ${{ secrets.TEST_RESOURCES_URI_V1 }}

Expand All @@ -27,7 +27,7 @@ jobs:
needs: build
uses: ./.github/workflows/deploy.yml
with:
dotnet_version: '8.0.100'
dotnet_version: '8.0.101'
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 onlyg
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fetch-depth: 0 # We need full history for version number

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

Expand All @@ -55,7 +55,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 @@ -65,6 +65,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,6 +10,7 @@ build/temp/
.vs/
*.csproj.user
*.DotSettings.user
launchSettings.json

# Test results
BenchmarkDotNet.Artifacts/
Expand Down
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>
16 changes: 8 additions & 8 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project>
<!-- Centralize dependency management -->
<ItemGroup>
<PackageVersion Include="Yarhl" Version="4.0.0-preview.283" />
<PackageVersion Include="Yarhl.Media.Text" Version="4.0.0-preview.283" />
<PackageVersion Include="Texim" Version="0.1.0-preview.207" />
<PackageVersion Include="Yarhl" Version="4.0.0" />
<PackageVersion Include="Yarhl.Media.Text" Version="4.0.0" />
<PackageVersion Include="Texim" Version="0.1.0-preview.210" />
<PackageVersion Include="System.Data.HashFunction.CRC" Version="2.0.0" />
<PackageVersion Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageVersion Include="YamlDotNet" Version="13.7.1" />
<PackageVersion Include="YamlDotNet" Version="15.1.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="nunit" Version="4.0.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="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.10" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.14.0.81108" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="9.19.0.84025" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion src/nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<package pattern="*" />
</packageSource>
<packageSource key="SceneGate-Preview">
<package pattern="Yarhl*" />
<package pattern="Texim" />
</packageSource>
</packageSourceMapping>
Expand Down

0 comments on commit 29134f3

Please sign in to comment.