Skip to content

Commit 43056c2

Browse files
upgrade to .NET 6 (#279)
1 parent 389d86b commit 43056c2

8 files changed

+14
-18
lines changed

build-system/azure-pipeline.template.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ jobs:
2020
displayName: 'Use .NET 6 SDK 6.0.100'
2121
inputs:
2222
version: 6.0.100
23-
- task: UseDotNet@2
24-
displayName: "Use .NET Core SDK 3.1.415"
25-
inputs:
26-
version: 3.1.415
2723
# Linux or macOS
2824
- script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
2925
displayName: Docker - Register QEMU

build.fsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ Target "PublishCode" (fun _ ->
316316
Project = project
317317
Configuration = configuration
318318
VersionSuffix = overrideVersionSuffix project
319-
Framework = "netcoreapp3.1"
319+
Framework = "net6.0"
320320
})
321321

322322
projects |> Seq.iter (runSingleProject)

src/Lighthouse/Dockerfile-arm64

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:3.1 AS base
1+
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
22
WORKDIR /app
33

44
# Install Petabridge.Cmd client so it can be invoked remotely via
@@ -7,9 +7,9 @@ RUN dotnet tool install --global pbm
77

88
# RUN pbm help
99

10-
COPY ./bin/Release/netcoreapp3.1/publish/ /app
10+
COPY ./bin/Release/net6.0/publish/ /app
1111

12-
FROM mcr.microsoft.com/dotnet/runtime:3.1 AS app
12+
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS app
1313
WORKDIR /app
1414

1515
COPY --from=base /app /app

src/Lighthouse/Dockerfile-linux

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS base
1+
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
22
WORKDIR /app
33

44
# Install Petabridge.Cmd client so it can be invoked remotely via
@@ -7,9 +7,9 @@ RUN dotnet tool install --global pbm
77

88
# RUN pbm help
99

10-
COPY ./bin/Release/netcoreapp3.1/publish/ /app
10+
COPY ./bin/Release/net6.0/publish/ /app
1111

12-
FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS app
12+
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS app
1313
WORKDIR /app
1414

1515
COPY --from=base /app /app

src/Lighthouse/Dockerfile-windows

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-nanoserver-1809 AS base
1+
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
22
WORKDIR /app
33

44
# Install Petabridge.Cmd client so it can be invoked remotely via
@@ -10,9 +10,9 @@ WORKDIR /app
1010

1111
# RUN pbm help
1212

13-
COPY ./bin/Release/netcoreapp3.1/publish/ /app
13+
COPY ./bin/Release/net6.0/publish/ /app
1414

15-
FROM mcr.microsoft.com/dotnet/core/runtime:3.1-nanoserver-1809 AS app
15+
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS app
1616
WORKDIR /app
1717

1818
COPY --from=base /app /app

src/Lighthouse/buildLinuxDockerImages.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fi
2020

2121

2222
echo "Building project..."
23-
dotnet publish -c Release --framework netcoreapp3.1
23+
dotnet publish -c Release --framework net6.0
2424
dotnet build-server shutdown
2525

2626
LINUX_IMAGE="$IMAGE_NAME:linux-$IMAGE_VERSION"

src/Lighthouse/buildWindowsDockerImages.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ param (
66
)
77

88
Write-Host "Building project..."
9-
dotnet publish -c Release --framework netcoreapp3.1
9+
dotnet publish -c Release --framework net6.0
1010
dotnet build-server shutdown
1111

1212
$windowsImage = "{0}:windows-{1}" -f $imageName,$tagVersion

src/common.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<XunitVersion>2.4.2</XunitVersion>
1919
<MicrosoftSdkVersion>17.3.0</MicrosoftSdkVersion>
2020
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
21-
<NetCoreVersion>netcoreapp3.1</NetCoreVersion>
21+
<NetCoreVersion>net6.0</NetCoreVersion>
2222
<NetStandardVersion>netstandard1.6</NetStandardVersion>
2323
<NetFrameworkLibVersion>net461</NetFrameworkLibVersion>
24-
<NetFrameworkTestVersion>netcoreapp3.1</NetFrameworkTestVersion>
24+
<NetFrameworkTestVersion>net6.0</NetFrameworkTestVersion>
2525
<AkkaVersion>1.4.40</AkkaVersion>
2626
<PbmVersion>1.1.0</PbmVersion>
2727
</PropertyGroup>

0 commit comments

Comments
 (0)