Merge pull request #16 from Syriiin/update-packages

Update packages and cleanup docker compose files
Syriiin · May 15, 2024 · fcf34d5 · fcf34d5
2 parents b64cf79 + 0169edb
commit fcf34d5
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 25 deletions.
diff --git a/Difficalcy.Catch.Tests/Difficalcy.Catch.Tests.csproj b/Difficalcy.Catch.Tests/Difficalcy.Catch.Tests.csproj
@@ -8,13 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Difficalcy.Mania.Tests/Difficalcy.Mania.Tests.csproj b/Difficalcy.Mania.Tests/Difficalcy.Mania.Tests.csproj
@@ -8,13 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Difficalcy.Osu.Tests/Difficalcy.Osu.Tests.csproj b/Difficalcy.Osu.Tests/Difficalcy.Osu.Tests.csproj
@@ -8,13 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Difficalcy.Taiko.Tests/Difficalcy.Taiko.Tests.csproj b/Difficalcy.Taiko.Tests/Difficalcy.Taiko.Tests.csproj
@@ -8,13 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.8.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/Difficalcy.Tests/Difficalcy.Tests.csproj b/Difficalcy.Tests/Difficalcy.Tests.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/Difficalcy/Difficalcy.csproj b/Difficalcy/Difficalcy.csproj
@@ -9,8 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
-    <PackageReference Include="StackExchange.Redis" Version="2.2.50" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.1" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.33" />
   </ItemGroup>
 
 </Project>
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
-COMPOSE_TOOLING_RUN = docker compose -f docker-compose.tooling.yml run --rm --build tooling
-COMPOSE_E2E = docker compose -f docker-compose.yml -f docker-compose.override.e2e.yml
+COMPOSE_TOOLING_RUN = docker compose -f compose.tooling.yaml run --rm --build tooling
+COMPOSE_E2E = docker compose -f compose.yaml -f compose.override.e2e.yaml
 COMPOSE_E2E_RUN = $(COMPOSE_E2E) run --rm --build e2e-test-runner
-COMPOSE_APP_DEV = docker compose -f docker-compose.yml -f docker-compose.override.yml
-COMPOSE_RUN_DOCS = docker compose -f docker-compose.yml -f docker-compose.override.yml run docs
-COMPOSE_PUBLISH = docker compose -f docker-compose.yml -f docker-compose.override.publish.yml
+COMPOSE_APP_DEV = docker compose -f compose.yaml -f compose.override.yaml
+COMPOSE_RUN_DOCS = docker compose -f compose.yaml -f compose.override.yaml run docs
+COMPOSE_PUBLISH = docker compose -f compose.yaml -f compose.override.publish.yaml
 
 help:	## Show this help
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'

diff --git a/docker-compose.override.e2e.yml → compose.override.e2e.yaml b/docker-compose.override.e2e.yml → compose.override.e2e.yaml
diff --git a/docker-compose.override.publish.yml → compose.override.publish.yaml b/docker-compose.override.publish.yml → compose.override.publish.yaml
diff --git a/docker-compose.override.yml → compose.override.yaml b/docker-compose.override.yml → compose.override.yaml
diff --git a/docker-compose.tooling.yml → compose.tooling.yaml b/docker-compose.tooling.yml → compose.tooling.yaml
diff --git a/docker-compose.yml → compose.yaml b/docker-compose.yml → compose.yaml