diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index aa9143113f..de276dd5c3 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -372,15 +372,19 @@ jobs:
id: wix-tool
run: echo "version=$(cat build/package/winget/.config/dotnet-tools.json | jq -r '.tools.wix.version')" >> $GITHUB_OUTPUT
- - name: Retrieve StrawberryShake Tool Version
- id: strawberry-tool
+ - name: Retrieve StrawberryShake Tool Version 1
+ id: strawberry-tool-1
run: echo "version=$(cat src/Tgstation.Server.Host.Utils.GitLab.GraphQL/.config/dotnet-tools.json | jq -r '.tools."strawberryshake.tools".version')" >> $GITHUB_OUTPUT
+ - name: Retrieve StrawberryShake Tool Version 2
+ id: strawberry-tool-2
+ run: echo "version=$(cat src/Tgstation.Server.Client.GraphQL/.config/dotnet-tools.json | jq -r '.tools."strawberryshake.tools".version')" >> $GITHUB_OUTPUT
+
- name: Retrieve dotnet-ef Nuget Version
id: dotnet-ef-nuget
run: |
- regex='\s+'
- if [[ $(cat src/Tgstation.Server.Host/Tgstation.Server.Host.csproj) =~ $regex ]]; then
+ regex='\s+'
+ if [[ $(cat Directory.Packages.props) =~ $regex ]]; then
echo "version=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
else
echo "Regex search failed!"
@@ -401,8 +405,8 @@ jobs:
- name: Retrieve StrawberryShake Nuget Version
id: strawberry-nuget
run: |
- regex='\s+'
- if [[ $(cat src/Tgstation.Server.Host.Utils.GitLab.GraphQL/Tgstation.Server.Host.Utils.GitLab.GraphQL.csproj) =~ $regex ]]; then
+ regex='\s+'
+ if [[ $(cat Directory.Packages.props) =~ $regex ]]; then
echo "version=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
else
echo "Regex search failed!"
@@ -422,9 +426,9 @@ jobs:
exit 1
- name: Fail if StrawberryShake Versions Don't Match
- if: ${{ steps.strawberry-tool.outputs.version != steps.strawberry-nuget.outputs.version }}
+ if: ${{ steps.strawberry-tool-1.outputs.version != steps.strawberry-nuget.outputs.version || steps.strawberry-tool-2.outputs.version != steps.strawberry-nuget.outputs.version }}
run: |
- echo "${{ steps.strawberry-tool.outputs.version }} != ${{ steps.strawberry-nuget.outputs.version }}"
+ echo "${{ steps.strawberry-tool-1.outputs.version }} != ${{ steps.strawberry-nuget.outputs.version }} || ${{ steps.strawberry-tool-2.outputs.version }} != ${{ steps.strawberry-nuget.outputs.version }}"
exit 1
pages-build:
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000000..5a54f16799
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/Common.props b/build/Common.props
index d826c09025..3f04e9db66 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -5,6 +5,7 @@
net$(TgsNetMajorVersion).0
latest
true
+ true
diff --git a/build/NewtonsoftJson.props b/build/NewtonsoftJson.props
index da775538fb..3180130e0f 100644
--- a/build/NewtonsoftJson.props
+++ b/build/NewtonsoftJson.props
@@ -1,6 +1,6 @@
-
+
diff --git a/build/NugetCommon.props b/build/NugetCommon.props
index 88598d46f5..16406efd99 100644
--- a/build/NugetCommon.props
+++ b/build/NugetCommon.props
@@ -29,7 +29,7 @@
-
+
diff --git a/build/SrcCommon.props b/build/SrcCommon.props
index a98bf6bad8..97402d3a22 100644
--- a/build/SrcCommon.props
+++ b/build/SrcCommon.props
@@ -17,7 +17,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/build/TestCommon.props b/build/TestCommon.props
index 92b418583a..34b7efe2bf 100644
--- a/build/TestCommon.props
+++ b/build/TestCommon.props
@@ -3,23 +3,23 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
+
-
+
-
+
diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj
index e6c1c32c58..245a33c7f4 100644
--- a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj
+++ b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Tgstation.Server.Host.Service.Wix.Bundle.wixproj
@@ -24,8 +24,8 @@
-
-
+
+
diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix.Extensions/Tgstation.Server.Host.Service.Wix.Extensions.csproj b/build/package/winget/Tgstation.Server.Host.Service.Wix.Extensions/Tgstation.Server.Host.Service.Wix.Extensions.csproj
index fcdbd512a6..b6b9d3a807 100644
--- a/build/package/winget/Tgstation.Server.Host.Service.Wix.Extensions/Tgstation.Server.Host.Service.Wix.Extensions.csproj
+++ b/build/package/winget/Tgstation.Server.Host.Service.Wix.Extensions/Tgstation.Server.Host.Service.Wix.Extensions.csproj
@@ -7,7 +7,7 @@
-
+
diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj b/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj
index 6916be49c6..d2fbd59986 100644
--- a/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj
+++ b/build/package/winget/Tgstation.Server.Host.Service.Wix/Tgstation.Server.Host.Service.Wix.wixproj
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
index 6f32743090..7ca98fa6f8 100644
--- a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
+++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
@@ -26,11 +26,11 @@
-
+
-
+
-
+
diff --git a/src/Tgstation.Server.Client.GraphQL/.config/dotnet-tools.json b/src/Tgstation.Server.Client.GraphQL/.config/dotnet-tools.json
index 17a88ea077..6cbce338fa 100644
--- a/src/Tgstation.Server.Client.GraphQL/.config/dotnet-tools.json
+++ b/src/Tgstation.Server.Client.GraphQL/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"strawberryshake.tools": {
- "version": "13.9.12",
+ "version": "15.1.9",
"commands": [
"dotnet-graphql"
]
diff --git a/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj b/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj
index d3d3c14f2c..04d5ae2baf 100644
--- a/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj
+++ b/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj
@@ -8,10 +8,8 @@
-
-
-
-
+
+
diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
index 7147aab8f8..88aa1055c9 100644
--- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
@@ -11,9 +11,9 @@
-
+
-
+
diff --git a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
index 263b813dc3..acdff03504 100644
--- a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
+++ b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj
index 06f38392b7..e12827c195 100644
--- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj
+++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj
@@ -13,9 +13,9 @@
-
+
-
+
diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj
index 5657a97c65..8ca280d70f 100644
--- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj
+++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj
@@ -17,21 +17,21 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/.config/dotnet-tools.json b/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/.config/dotnet-tools.json
index 5292a3c312..4b619e4d2c 100644
--- a/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/.config/dotnet-tools.json
+++ b/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/.config/dotnet-tools.json
@@ -3,11 +3,11 @@
"isRoot": true,
"tools": {
"strawberryshake.tools": {
- "version": "15.1.8",
+ "version": "15.1.9",
"commands": [
"dotnet-graphql"
],
"rollForward": false
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/Tgstation.Server.Host.Utils.GitLab.GraphQL.csproj b/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/Tgstation.Server.Host.Utils.GitLab.GraphQL.csproj
index 34e7198df1..a6b397bbbd 100644
--- a/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/Tgstation.Server.Host.Utils.GitLab.GraphQL.csproj
+++ b/src/Tgstation.Server.Host.Utils.GitLab.GraphQL/Tgstation.Server.Host.Utils.GitLab.GraphQL.csproj
@@ -35,7 +35,7 @@
-
+
diff --git a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj
index 97ec170509..6ef7397856 100644
--- a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj
+++ b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj
@@ -10,9 +10,9 @@
-
+
-
+
diff --git a/src/Tgstation.Server.Host/.config/dotnet-tools.json b/src/Tgstation.Server.Host/.config/dotnet-tools.json
index 7cf60e92f7..5efa53e31f 100644
--- a/src/Tgstation.Server.Host/.config/dotnet-tools.json
+++ b/src/Tgstation.Server.Host/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
- "version": "9.0.7",
+ "version": "9.0.8",
"commands": [
"dotnet-ef"
]
diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
index b84b101ddd..67f3d5217b 100644
--- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
@@ -68,85 +68,85 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj
index b5cd8a66fb..2f3bb04669 100644
--- a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj
+++ b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj
@@ -10,11 +10,11 @@
-
+
-
+
-
+
diff --git a/tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj b/tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj
index 2f6f44c567..9daf4ea33c 100644
--- a/tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj
+++ b/tests/Tgstation.Server.Api.Tests/Tgstation.Server.Api.Tests.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj b/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj
index 07849c199b..9167b66ed3 100644
--- a/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj
+++ b/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj b/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj
index 273cd50efc..76a1eedeb2 100644
--- a/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj
+++ b/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj
@@ -9,9 +9,9 @@
-
+
-
+
diff --git a/tgstation-server.slnx b/tgstation-server.slnx
index 46baa536d3..edd5eda989 100644
--- a/tgstation-server.slnx
+++ b/tgstation-server.slnx
@@ -200,6 +200,7 @@
+
diff --git a/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj b/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj
index 5616ec05ed..0fc788a31d 100644
--- a/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj
+++ b/tools/Tgstation.Server.LogoGenerator/Tgstation.Server.LogoGenerator.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj b/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
index 772bc7c717..df7a33a579 100644
--- a/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
+++ b/tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
@@ -8,7 +8,7 @@
-
+