Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"isRoot": true,
"tools": {
"dotnet-reportgenerator-globaltool": {
"version": "5.5.1",
"version": "5.5.4",
"commands": [
"reportgenerator"
],
"rollForward": false
},
"dotnet-outdated-tool": {
"version": "4.6.9",
"version": "4.7.1",
"commands": [
"dotnet-outdated"
],
"rollForward": true
},
"docfx": {
"version": "2.78.4",
"version": "2.78.5",
"commands": [
"docfx"
],
Expand Down
12 changes: 2 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,10 @@ updates:
schedule:
interval: daily
groups:
microsoft:
nuget-dependencies:
applies-to: version-updates
patterns:
- "Microsoft.*"
- "System.*"
update-types:
- minor
- patch
spectre:
applies-to: version-updates
patterns:
- "Spectre.*"
- "*"
update-types:
- minor
- patch
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,20 +68,20 @@ jobs:

- name: Upload test data on failure
if: failure() && github.event_name != 'pull_request'
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: test-data
path: artifacts/Data

- name: Upload coverage
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: coverage
path: artifacts/bin/GuildWars2.Tests/*/TestResults/coverage.xml

- name: Upload coverage to Codecov
if: github.event_name != 'pull_request'
uses: codecov/codecov-action@v5
uses: codecov/codecov-action@v6
with:
token: ${{ secrets.CODECOV_TOKEN }}

Expand All @@ -91,7 +91,7 @@ jobs:

- name: Upload artifacts
if: github.event_name != 'pull_request'
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: package
path: artifacts/package/
Expand All @@ -105,7 +105,7 @@ jobs:
name: github-packages
steps:
- name: Download artifacts
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: package
path: artifacts
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/checkout@v6

- name: Log in to GitHub Docker Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ jobs:
steps:
- name: Deploy artifact
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v5
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: dotnet pack src/GuildWars2 --configuration Release --no-build

- name: Upload artifacts
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: package
path: artifacts/package/release
Expand All @@ -49,7 +49,7 @@ jobs:
id-token: write # Required to request OIDC token for trusted publishing
steps:
- name: Download artifacts
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: package
path: artifacts/package
Expand All @@ -76,7 +76,7 @@ jobs:
id-token: write # Required to request OIDC token for trusted publishing
steps:
- name: Download artifacts
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: package
path: artifacts/package
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</ItemGroup>
<ItemGroup>
<!-- Microsoft.CodeAnalysis.CSharp: keep in sync with docfx version from dotnet-tools.json
e.g. https://github.com/dotnet/docfx/blob/v2.78.4/Directory.Packages.props#L38 -->
e.g. https://github.com/dotnet/docfx/blob/v2.78.5/Directory.Packages.props#L38 -->
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="[4.14.0]" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
Expand All @@ -17,12 +17,12 @@
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.4.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2" />
<PackageVersion Include="MinVer" Version="7.0.0" />
<PackageVersion Include="Pastel" Version="7.0.1" />
<PackageVersion Include="Polly.Core" Version="8.6.6" />
<PackageVersion Include="Polyfill" Version="9.8.1">
<PackageVersion Include="Polyfill" Version="9.22.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
Expand Down
32 changes: 16 additions & 16 deletions src/GuildWars2/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
},
"Polyfill": {
"type": "Direct",
"requested": "[9.8.1, )",
"resolved": "9.8.1",
"contentHash": "K5p8SViAcAMInRm67ZyPFhnIBAXfGz3gjQWOMhYz19rdDuN8B0F2wUsukXJRAuGpx6Tr2FJgzQHByqQwzmx3qQ=="
"requested": "[9.22.0, )",
"resolved": "9.22.0",
"contentHash": "kmELvtpt6ziHRHYHcMygLNElwdBGRIJN1jAIv5GVxCcAhECnmJEP6L9zIIividSt9tXl2DNoMcRqgOUS36rEZQ=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand Down Expand Up @@ -178,9 +178,9 @@
},
"Polyfill": {
"type": "Direct",
"requested": "[9.8.1, )",
"resolved": "9.8.1",
"contentHash": "K5p8SViAcAMInRm67ZyPFhnIBAXfGz3gjQWOMhYz19rdDuN8B0F2wUsukXJRAuGpx6Tr2FJgzQHByqQwzmx3qQ=="
"requested": "[9.22.0, )",
"resolved": "9.22.0",
"contentHash": "kmELvtpt6ziHRHYHcMygLNElwdBGRIJN1jAIv5GVxCcAhECnmJEP6L9zIIividSt9tXl2DNoMcRqgOUS36rEZQ=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand Down Expand Up @@ -298,9 +298,9 @@
},
"Polyfill": {
"type": "Direct",
"requested": "[9.8.1, )",
"resolved": "9.8.1",
"contentHash": "K5p8SViAcAMInRm67ZyPFhnIBAXfGz3gjQWOMhYz19rdDuN8B0F2wUsukXJRAuGpx6Tr2FJgzQHByqQwzmx3qQ=="
"requested": "[9.22.0, )",
"resolved": "9.22.0",
"contentHash": "kmELvtpt6ziHRHYHcMygLNElwdBGRIJN1jAIv5GVxCcAhECnmJEP6L9zIIividSt9tXl2DNoMcRqgOUS36rEZQ=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand Down Expand Up @@ -336,9 +336,9 @@
},
"Polyfill": {
"type": "Direct",
"requested": "[9.8.1, )",
"resolved": "9.8.1",
"contentHash": "K5p8SViAcAMInRm67ZyPFhnIBAXfGz3gjQWOMhYz19rdDuN8B0F2wUsukXJRAuGpx6Tr2FJgzQHByqQwzmx3qQ=="
"requested": "[9.22.0, )",
"resolved": "9.22.0",
"contentHash": "kmELvtpt6ziHRHYHcMygLNElwdBGRIJN1jAIv5GVxCcAhECnmJEP6L9zIIividSt9tXl2DNoMcRqgOUS36rEZQ=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand Down Expand Up @@ -374,9 +374,9 @@
},
"Polyfill": {
"type": "Direct",
"requested": "[9.8.1, )",
"resolved": "9.8.1",
"contentHash": "K5p8SViAcAMInRm67ZyPFhnIBAXfGz3gjQWOMhYz19rdDuN8B0F2wUsukXJRAuGpx6Tr2FJgzQHByqQwzmx3qQ=="
"requested": "[9.22.0, )",
"resolved": "9.22.0",
"contentHash": "kmELvtpt6ziHRHYHcMygLNElwdBGRIJN1jAIv5GVxCcAhECnmJEP6L9zIIividSt9tXl2DNoMcRqgOUS36rEZQ=="
},
"Roslynator.Analyzers": {
"type": "Direct",
Expand All @@ -386,4 +386,4 @@
}
}
}
}
}
58 changes: 29 additions & 29 deletions tests/GuildWars2.ArchitectureTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
},
"Microsoft.Testing.Extensions.CodeCoverage": {
"type": "Direct",
"requested": "[18.4.1, )",
"resolved": "18.4.1",
"contentHash": "l1VZM9dg9s76L5D288ipAT4HRYDJ6Vxh8wX20gfS9VnpueedRfN4/aGNn4oA1g6pwq2WSM3Ci7IoSSGPiqu+WQ==",
"requested": "[18.5.2, )",
"resolved": "18.5.2",
"contentHash": "UNcGLx9pVtlXF8MPDR8KDp+/OKKNIJjpzwRyZSt609TSGvaD8mtuQMb5GKZvhMucPp0a5Juvn3kxXDceQZWmAg==",
"dependencies": {
"Microsoft.DiaSymReader": "2.0.0",
"Microsoft.Extensions.DependencyModel": "8.0.2",
Expand All @@ -31,9 +31,9 @@
},
"Polyfill": {
"type": "Direct",
"requested": "[9.8.1, )",
"resolved": "9.8.1",
"contentHash": "K5p8SViAcAMInRm67ZyPFhnIBAXfGz3gjQWOMhYz19rdDuN8B0F2wUsukXJRAuGpx6Tr2FJgzQHByqQwzmx3qQ=="
"requested": "[9.22.0, )",
"resolved": "9.22.0",
"contentHash": "kmELvtpt6ziHRHYHcMygLNElwdBGRIJN1jAIv5GVxCcAhECnmJEP6L9zIIividSt9tXl2DNoMcRqgOUS36rEZQ=="
},
"TUnit": {
"type": "Direct",
Expand Down Expand Up @@ -85,8 +85,8 @@
},
"Microsoft.DiaSymReader": {
"type": "Transitive",
"resolved": "2.0.0",
"contentHash": "QcZrCETsBJqy/vQpFtJc+jSXQ0K5sucQ6NUFbTNVHD4vfZZOwjZ/3sBzczkC4DityhD3AVO/+K/+9ioLs1AgRA=="
"resolved": "2.2.3",
"contentHash": "bhwzJfzyiJM0nXJyNB7Y9OfsEXyxLdDBHG99soIp5JjnPydwkOaBdRCtRtWgQh3noSLi2cSIZ/wpbHNNE9knxQ=="
},
"Microsoft.Extensions.DependencyModel": {
"type": "Transitive",
Expand Down Expand Up @@ -313,9 +313,9 @@
".NETFramework,Version=v4.8.1/linux-x64": {
"Microsoft.Testing.Extensions.CodeCoverage": {
"type": "Direct",
"requested": "[18.4.1, )",
"resolved": "18.4.1",
"contentHash": "l1VZM9dg9s76L5D288ipAT4HRYDJ6Vxh8wX20gfS9VnpueedRfN4/aGNn4oA1g6pwq2WSM3Ci7IoSSGPiqu+WQ==",
"requested": "[18.5.2, )",
"resolved": "18.5.2",
"contentHash": "UNcGLx9pVtlXF8MPDR8KDp+/OKKNIJjpzwRyZSt609TSGvaD8mtuQMb5GKZvhMucPp0a5Juvn3kxXDceQZWmAg==",
"dependencies": {
"Microsoft.DiaSymReader": "2.0.0",
"Microsoft.Extensions.DependencyModel": "8.0.2",
Expand All @@ -332,9 +332,9 @@
".NETFramework,Version=v4.8.1/win-x64": {
"Microsoft.Testing.Extensions.CodeCoverage": {
"type": "Direct",
"requested": "[18.4.1, )",
"resolved": "18.4.1",
"contentHash": "l1VZM9dg9s76L5D288ipAT4HRYDJ6Vxh8wX20gfS9VnpueedRfN4/aGNn4oA1g6pwq2WSM3Ci7IoSSGPiqu+WQ==",
"requested": "[18.5.2, )",
"resolved": "18.5.2",
"contentHash": "UNcGLx9pVtlXF8MPDR8KDp+/OKKNIJjpzwRyZSt609TSGvaD8mtuQMb5GKZvhMucPp0a5Juvn3kxXDceQZWmAg==",
"dependencies": {
"Microsoft.DiaSymReader": "2.0.0",
"Microsoft.Extensions.DependencyModel": "8.0.2",
Expand All @@ -357,9 +357,9 @@
},
"Microsoft.Testing.Extensions.CodeCoverage": {
"type": "Direct",
"requested": "[18.4.1, )",
"resolved": "18.4.1",
"contentHash": "l1VZM9dg9s76L5D288ipAT4HRYDJ6Vxh8wX20gfS9VnpueedRfN4/aGNn4oA1g6pwq2WSM3Ci7IoSSGPiqu+WQ==",
"requested": "[18.5.2, )",
"resolved": "18.5.2",
"contentHash": "UNcGLx9pVtlXF8MPDR8KDp+/OKKNIJjpzwRyZSt609TSGvaD8mtuQMb5GKZvhMucPp0a5Juvn3kxXDceQZWmAg==",
"dependencies": {
"Microsoft.DiaSymReader": "2.0.0",
"Microsoft.Extensions.DependencyModel": "8.0.2",
Expand All @@ -368,9 +368,9 @@
},
"Polyfill": {
"type": "Direct",
"requested": "[9.8.1, )",
"resolved": "9.8.1",
"contentHash": "K5p8SViAcAMInRm67ZyPFhnIBAXfGz3gjQWOMhYz19rdDuN8B0F2wUsukXJRAuGpx6Tr2FJgzQHByqQwzmx3qQ=="
"requested": "[9.22.0, )",
"resolved": "9.22.0",
"contentHash": "kmELvtpt6ziHRHYHcMygLNElwdBGRIJN1jAIv5GVxCcAhECnmJEP6L9zIIividSt9tXl2DNoMcRqgOUS36rEZQ=="
},
"TUnit": {
"type": "Direct",
Expand All @@ -397,8 +397,8 @@
},
"Microsoft.DiaSymReader": {
"type": "Transitive",
"resolved": "2.0.0",
"contentHash": "QcZrCETsBJqy/vQpFtJc+jSXQ0K5sucQ6NUFbTNVHD4vfZZOwjZ/3sBzczkC4DityhD3AVO/+K/+9ioLs1AgRA=="
"resolved": "2.2.3",
"contentHash": "bhwzJfzyiJM0nXJyNB7Y9OfsEXyxLdDBHG99soIp5JjnPydwkOaBdRCtRtWgQh3noSLi2cSIZ/wpbHNNE9knxQ=="
},
"Microsoft.Extensions.DependencyModel": {
"type": "Transitive",
Expand Down Expand Up @@ -479,9 +479,9 @@
"net10.0/linux-x64": {
"Microsoft.Testing.Extensions.CodeCoverage": {
"type": "Direct",
"requested": "[18.4.1, )",
"resolved": "18.4.1",
"contentHash": "l1VZM9dg9s76L5D288ipAT4HRYDJ6Vxh8wX20gfS9VnpueedRfN4/aGNn4oA1g6pwq2WSM3Ci7IoSSGPiqu+WQ==",
"requested": "[18.5.2, )",
"resolved": "18.5.2",
"contentHash": "UNcGLx9pVtlXF8MPDR8KDp+/OKKNIJjpzwRyZSt609TSGvaD8mtuQMb5GKZvhMucPp0a5Juvn3kxXDceQZWmAg==",
"dependencies": {
"Microsoft.DiaSymReader": "2.0.0",
"Microsoft.Extensions.DependencyModel": "8.0.2",
Expand All @@ -492,9 +492,9 @@
"net10.0/win-x64": {
"Microsoft.Testing.Extensions.CodeCoverage": {
"type": "Direct",
"requested": "[18.4.1, )",
"resolved": "18.4.1",
"contentHash": "l1VZM9dg9s76L5D288ipAT4HRYDJ6Vxh8wX20gfS9VnpueedRfN4/aGNn4oA1g6pwq2WSM3Ci7IoSSGPiqu+WQ==",
"requested": "[18.5.2, )",
"resolved": "18.5.2",
"contentHash": "UNcGLx9pVtlXF8MPDR8KDp+/OKKNIJjpzwRyZSt609TSGvaD8mtuQMb5GKZvhMucPp0a5Juvn3kxXDceQZWmAg==",
"dependencies": {
"Microsoft.DiaSymReader": "2.0.0",
"Microsoft.Extensions.DependencyModel": "8.0.2",
Expand All @@ -503,4 +503,4 @@
}
}
}
}
}
Loading