Skip to content

Commit 8118541

Browse files
authored
Merge pull request #34 from Axionyxx/dotnet10
Update MapServer to dotnet 10
1 parent 8f2362b commit 8118541

7 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET
1616
uses: actions/setup-dotnet@v3
1717
with:
18-
dotnet-version: 7.x.x
18+
dotnet-version: 10.x.x
1919
- name: Restore dependencies
2020
run: dotnet restore
2121
- name: Build

.github/workflows/deploy-dev-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup .NET
2222
uses: actions/setup-dotnet@v3
2323
with:
24-
dotnet-version: 7.x.x
24+
dotnet-version: 10.x.x
2525

2626
- name: Restore dependencies
2727
run: dotnet restore

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup .NET
2424
uses: actions/setup-dotnet@v3
2525
with:
26-
dotnet-version: 7.x.x
26+
dotnet-version: 10.x.x
2727

2828
- name: Restore dependencies
2929
run: dotnet restore

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "SS14.GithubApiHelper"]
22
path = SS14.GithubApiHelper
3-
url = git@github.com:juliangiebel/SS14.GithubApiHelper.git
3+
url = https://github.com/space-wizards/SS14.GithubApiHelper.git

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS base
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
5+
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
66
WORKDIR /src
77
COPY ["SS14.MapServer/SS14.MapServer.csproj", "SS14.MapServer/"]
88
RUN dotnet restore "SS14.MapServer/SS14.MapServer.csproj"

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

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

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

SS14.MapServer/SS14.MapServer.csproj

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

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

0 commit comments

Comments
 (0)