Skip to content

Commit 0e8d841

Browse files
committed
Update mapserver to .net 9
Update dependencies Fix github config documentation
1 parent 8ff08ce commit 0e8d841

4 files changed

Lines changed: 35 additions & 30 deletions

File tree

SS14.MapServer.Tests/SS14.MapServer.Tests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

@@ -10,25 +10,25 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
14-
<PackageReference Include="NUnit" Version="4.0.1" />
15-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
16-
<PackageReference Include="NUnit.Analyzers" Version="4.0.1">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
14+
<PackageReference Include="NUnit" Version="4.3.2" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
16+
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="6.0.0">
20+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
</PackageReference>
2424
</ItemGroup>
25-
25+
2626
<ItemGroup>
2727
<Content Include="resources\**\*">
2828
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2929
</Content>
3030
</ItemGroup>
31-
31+
3232
<ItemGroup>
3333
<ProjectReference Include="..\SS14.MapServer\SS14.MapServer.csproj" />
3434
</ItemGroup>

SS14.MapServer/SS14.MapServer.csproj

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -10,30 +10,30 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
13-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
13+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
1414
<PackageReference Include="JsonModelBinder" Version="2.1.1" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
<PrivateAssets>all</PrivateAssets>
1818
</PackageReference>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
21-
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
23-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.3" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.3" />
21+
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.3" />
22+
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.3" />
23+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
2424
<PackageReference Include="MimeTypeMapOfficial" Version="1.0.17" />
2525
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
26-
<PackageReference Include="Npgsql" Version="8.0.2" />
27-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
26+
<PackageReference Include="Npgsql" Version="9.0.3" />
27+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
2828
<PackageReference Include="Octokit" Version="14.0.0" />
29-
<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
30-
<PackageReference Include="Sentry.AspNetCore" Version="4.1.0" />
31-
<PackageReference Include="Sentry.Serilog" Version="4.1.0" />
32-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
33-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
34-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
35-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
36-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
29+
<PackageReference Include="Quartz.AspNetCore" Version="3.14.0" />
30+
<PackageReference Include="Sentry.AspNetCore" Version="5.5.0" />
31+
<PackageReference Include="Sentry.Serilog" Version="5.5.0" />
32+
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
33+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
34+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
35+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="8.1.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.3" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

docker-compose.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ services:
66
context: ./
77
dockerfile: SS14.MapServer/Dockerfile
88
volumes:
9-
- ./appsettings.yaml:/app/appsettings.yaml
10-
- ./private-key.pem:/app/private-key.pem
9+
- ./appsettings.yaml:/app/appsettings.yaml #This is a file
10+
- ./private-key.pem:/app/private-key.pem #
1111
- ./files:/app/data
1212
- ./build:/app/build
1313
ports:
@@ -23,4 +23,3 @@ services:
2323
- POSTGRES_PASSWORD=postgres #Replace postgres with a randomly generated password
2424
volumes:
2525
- ./data:/var/lib/postgresql/data
26-
- ./init.sql:/docker-entrypoint-initdb.d/init.sql

docs/Writerside/topics/Github-Configuration.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ yaml:
99
[[[AppPrivateKeyLocation|#appprivatekeylocation]]]: <string>
1010
[[[AppId|#appid]]]: <int>
1111
[[[TemplateLocation|#templatelocation]]]: <string>
12+
[[[AppWebhookSecret|#appwebhooksecret]]]: <string>
1213
````
1314

1415
## Configuration Options
@@ -38,6 +39,11 @@ The app id of the GitHub app
3839

3940
The location of liquid templates used for GitHub PR comments.
4041

42+
### AppWebhookSecret
43+
`<string>`
44+
45+
The webhook secret
46+
4147
<seealso>
4248
<!--Provide links to related how-to guides, overviews, and tutorials.-->
43-
</seealso>
49+
</seealso>

0 commit comments

Comments
 (0)