From c78d749dbf8cc6f38bde72020cb8c4bf7e736b20 Mon Sep 17 00:00:00 2001 From: Todd Lang Date: Tue, 7 Oct 2025 10:36:24 -0400 Subject: [PATCH 1/2] Upgrading to net90 --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/deploy.yml | 4 ++-- Directory.Build.props | 2 +- Directory.Packages.props | 6 +++--- .../Common.Actors.Manager.Tests/GlobalSuppressions.cs | 1 + .../Common.Players.Manager.Tests/GlobalSuppressions.cs | 1 + .../GlobalSuppressions.cs | 8 ++++++++ .../GlobalSuppressions.cs | 2 ++ .../GlobalSuppressions.cs | 1 + .../Common.Worlds.Manager.Tests/GlobalSuppressions.cs | 1 + .../Worlds/Common.Worlds.Tests/GlobalSuppressions.cs | 1 + .../GlobalSuppressions.cs | 1 + .../GlobalSuppressions.cs | 1 + .../GlobalSuppressions.cs | 10 ++++++++++ .../GlobalSuppressions.cs | 1 + 16 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Analyses/GlobalSuppressions.cs create mode 100644 test/Server/Worlds/Server.Worlds.Builder.Lambda.Tests/GlobalSuppressions.cs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87a41d5..472ac1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ on: - '.github/workflows/ci.yml' env: - DOTNET_VERSION: 8.0.401 + DOTNET_VERSION: 9.0.305 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: true diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1b5f1e5..926c2eb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,7 +13,7 @@ on: - '.github/workflows/codeql.yml' env: - DOTNET_VERSION: 8.0.401 + DOTNET_VERSION: 9.0.305 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: true diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d6855fc..b4a5f47 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -23,8 +23,8 @@ on: - '.github/workflows/deploy.yml' env: - TERRAFORM_VERSION: 1.9.5 - DOTNET_VERSION: 8.0.401 + TERRAFORM_VERSION: 1.13.3 + DOTNET_VERSION: 9.0.305 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: true AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} diff --git a/Directory.Build.props b/Directory.Build.props index 99340dc..86fb708 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ 0.1.0 - net8.0 + net9.0 enable enable true diff --git a/Directory.Packages.props b/Directory.Packages.props index e2d7e97..13111f8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,13 +13,13 @@ - + - - + + diff --git a/test/Common/Actors/Common.Actors.Manager.Tests/GlobalSuppressions.cs b/test/Common/Actors/Common.Actors.Manager.Tests/GlobalSuppressions.cs index f497fcd..3555b71 100644 --- a/test/Common/Actors/Common.Actors.Manager.Tests/GlobalSuppressions.cs +++ b/test/Common/Actors/Common.Actors.Manager.Tests/GlobalSuppressions.cs @@ -7,3 +7,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Common/Players/Common.Players.Manager.Tests/GlobalSuppressions.cs b/test/Common/Players/Common.Players.Manager.Tests/GlobalSuppressions.cs index f497fcd..3555b71 100644 --- a/test/Common/Players/Common.Players.Manager.Tests/GlobalSuppressions.cs +++ b/test/Common/Players/Common.Players.Manager.Tests/GlobalSuppressions.cs @@ -7,3 +7,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Analyses/GlobalSuppressions.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Analyses/GlobalSuppressions.cs new file mode 100644 index 0000000..366100e --- /dev/null +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Analyses/GlobalSuppressions.cs @@ -0,0 +1,8 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Benchmarks/GlobalSuppressions.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Benchmarks/GlobalSuppressions.cs index 9054c84..366100e 100644 --- a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Benchmarks/GlobalSuppressions.cs +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Benchmarks/GlobalSuppressions.cs @@ -4,3 +4,5 @@ // a specific target and scoped to a namespace, type, member, etc. using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/GlobalSuppressions.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/GlobalSuppressions.cs index 8874a80..fedd34c 100644 --- a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/GlobalSuppressions.cs +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/GlobalSuppressions.cs @@ -8,3 +8,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Performance", "CA1812:An internal (assembly-level) type is never instantiated.", Justification = "This class is instantiated via DI.", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Common/Worlds/Common.Worlds.Manager.Tests/GlobalSuppressions.cs b/test/Common/Worlds/Common.Worlds.Manager.Tests/GlobalSuppressions.cs index f497fcd..3555b71 100644 --- a/test/Common/Worlds/Common.Worlds.Manager.Tests/GlobalSuppressions.cs +++ b/test/Common/Worlds/Common.Worlds.Manager.Tests/GlobalSuppressions.cs @@ -7,3 +7,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Common/Worlds/Common.Worlds.Tests/GlobalSuppressions.cs b/test/Common/Worlds/Common.Worlds.Tests/GlobalSuppressions.cs index 8874a80..fedd34c 100644 --- a/test/Common/Worlds/Common.Worlds.Tests/GlobalSuppressions.cs +++ b/test/Common/Worlds/Common.Worlds.Tests/GlobalSuppressions.cs @@ -8,3 +8,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Performance", "CA1812:An internal (assembly-level) type is never instantiated.", Justification = "This class is instantiated via DI.", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Server/Actors/Server.Actors.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs b/test/Server/Actors/Server.Actors.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs index f497fcd..3555b71 100644 --- a/test/Server/Actors/Server.Actors.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs +++ b/test/Server/Actors/Server.Actors.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs @@ -7,3 +7,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Server/Players/Server.Players.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs b/test/Server/Players/Server.Players.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs index f497fcd..3555b71 100644 --- a/test/Server/Players/Server.Players.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs +++ b/test/Server/Players/Server.Players.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs @@ -7,3 +7,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Server/Worlds/Server.Worlds.Builder.Lambda.Tests/GlobalSuppressions.cs b/test/Server/Worlds/Server.Worlds.Builder.Lambda.Tests/GlobalSuppressions.cs new file mode 100644 index 0000000..3555b71 --- /dev/null +++ b/test/Server/Worlds/Server.Worlds.Builder.Lambda.Tests/GlobalSuppressions.cs @@ -0,0 +1,10 @@ +// This file is used by Code Analysis to maintain SuppressMessage +// attributes that are applied to this project. +// Project-level suppressions either have no target or are given +// a specific target and scoped to a namespace, type, member, etc. + +using System.Diagnostics.CodeAnalysis; + +[assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] diff --git a/test/Server/Worlds/Server.Worlds.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs b/test/Server/Worlds/Server.Worlds.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs index f497fcd..3555b71 100644 --- a/test/Server/Worlds/Server.Worlds.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs +++ b/test/Server/Worlds/Server.Worlds.Manager.Repositories.DynamoDb.Tests/GlobalSuppressions.cs @@ -7,3 +7,4 @@ [assembly: SuppressMessage( "Naming", "CA1707:Identifiers should not contain underscores", Justification = "", Scope = "module" )] [assembly: SuppressMessage( "Reliability", "CA2007:Consider calling ConfigureAwait on the awaited task", Justification = "", Scope = "module" )] +[assembly: SuppressMessage( "Maintainability", "CA1515:Consider making public types internal", Justification = "", Scope = "module" )] From a5e04b540e116d211c3af0e453b07186d3e6b149 Mon Sep 17 00:00:00 2001 From: Todd Lang Date: Tue, 7 Oct 2025 10:48:36 -0400 Subject: [PATCH 2/2] Fixes for changes to dependencies --- .../FreshwaterFinderIntegrationTests.cs | 2 +- .../LakeFinderIntegrationTests.cs | 2 +- .../MapEdgeSaltwaterFinderIntegrationTests.cs | 2 +- .../MountainousElevationBuilderIntegrationTests.cs | 2 +- .../TectonicLandformBuilderIntegrationTests.cs | 2 +- test/TestHelpers/IBufferWriter.cs | 11 +++++++++++ 6 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 test/TestHelpers/IBufferWriter.cs diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/FreshwaterFinderIntegrationTests.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/FreshwaterFinderIntegrationTests.cs index 361c63b..196f6f1 100644 --- a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/FreshwaterFinderIntegrationTests.cs +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/FreshwaterFinderIntegrationTests.cs @@ -68,7 +68,7 @@ public async Task Visualize() { IReadOnlySet saltwater = _saltwaterBuilder.Find( size, landform.Map, landform.Cells ); IReadOnlySet lakes = ( _builder as IFreshwaterFinder ).Create( size, landform.Map, landform.Cells, saltwater ); - IBuffer buffer = _bufferFactory.Create( size ); + IBuffer buffer = _bufferFactory.Create( size, 0.0f ); foreach( Cell cell in landform.Cells ) { _rasterizer.Rasterize( cell.Polygon.Points, ( int x, int y ) => { diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/LakeFinderIntegrationTests.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/LakeFinderIntegrationTests.cs index e21115d..15965e7 100644 --- a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/LakeFinderIntegrationTests.cs +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/LakeFinderIntegrationTests.cs @@ -68,7 +68,7 @@ public async Task Visualize() { IReadOnlySet freshwater = _freshwaterBuilder.Create( size, landform.Map, landform.Cells, saltwater ); IReadOnlyList> lakes = _builder.Finder( size, landform.Map, landform.Cells, saltwater, freshwater ); - IBuffer buffer = _bufferFactory.Create( size ); + IBuffer buffer = _bufferFactory.Create( size, 0.0f ); foreach( Cell cell in landform.Cells ) { _rasterizer.Rasterize( cell.Polygon.Points, ( int x, int y ) => { diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MapEdgeSaltwaterFinderIntegrationTests.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MapEdgeSaltwaterFinderIntegrationTests.cs index 8cba07d..31d8e5a 100644 --- a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MapEdgeSaltwaterFinderIntegrationTests.cs +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MapEdgeSaltwaterFinderIntegrationTests.cs @@ -67,7 +67,7 @@ public async Task Visualize() { Landform landform = await _landformBuilder.CreateAsync( size, tectonicPlates, TestContext.CurrentContext.CancellationToken ); IReadOnlySet saltwater = ( _builder as ISaltwaterFinder ).Find( size, landform.Map, landform.Cells ); - IBuffer buffer = _bufferFactory.Create( size ); + IBuffer buffer = _bufferFactory.Create( size, 0.0f ); foreach( Cell cell in landform.Cells ) { diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MountainousElevationBuilderIntegrationTests.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MountainousElevationBuilderIntegrationTests.cs index 6f47cbd..fec39ce 100644 --- a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MountainousElevationBuilderIntegrationTests.cs +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/MountainousElevationBuilderIntegrationTests.cs @@ -91,7 +91,7 @@ public async Task Visualize() { float maximum = elevation.Max( kvp => kvp.Value ); - IBuffer buffer = _bufferFactory.Create( size ); + IBuffer buffer = _bufferFactory.Create( size, 0.0f ); foreach( Cell cell in landform.Cells ) { if( !elevation.TryGetValue( cell, out float intensity ) ) { diff --git a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/TectonicLandformBuilderIntegrationTests.cs b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/TectonicLandformBuilderIntegrationTests.cs index 2169f63..f018ec6 100644 --- a/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/TectonicLandformBuilderIntegrationTests.cs +++ b/test/Common/Worlds/Common.Worlds.Builder.DelaunayVoronoi.Tests/TectonicLandformBuilderIntegrationTests.cs @@ -65,7 +65,7 @@ public async Task Visualize() { TectonicPlates tectonicPlates = _tectonicPlateBuilder.Create( size ); Landform landform = await _landformBuilder.CreateAsync( size, tectonicPlates, TestContext.CurrentContext.CancellationToken ); - IBuffer buffer = _bufferFactory.Create( size ); + IBuffer buffer = _bufferFactory.Create( size, 0.0f ); foreach( Cell cell in landform.Cells ) { _rasterizer.Rasterize( cell.Polygon.Points, ( int x, int y ) => { diff --git a/test/TestHelpers/IBufferWriter.cs b/test/TestHelpers/IBufferWriter.cs new file mode 100644 index 0000000..3bca035 --- /dev/null +++ b/test/TestHelpers/IBufferWriter.cs @@ -0,0 +1,11 @@ +using Kiyote.Buffers; + +namespace TestHelpers; + +public interface IBufferWriter { + + Task WriteAsync( + IBuffer buffer + ); + +}