Skip to content

Commit

Permalink
upgrade to .NET 6 (#279)
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaronontheweb authored Aug 10, 2022
1 parent 389d86b commit 43056c2
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 18 deletions.
4 changes: 0 additions & 4 deletions build-system/azure-pipeline.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ jobs:
displayName: 'Use .NET 6 SDK 6.0.100'
inputs:
version: 6.0.100
- task: UseDotNet@2
displayName: "Use .NET Core SDK 3.1.415"
inputs:
version: 3.1.415
# Linux or macOS
- script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
displayName: Docker - Register QEMU
Expand Down
2 changes: 1 addition & 1 deletion build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ Target "PublishCode" (fun _ ->
Project = project
Configuration = configuration
VersionSuffix = overrideVersionSuffix project
Framework = "netcoreapp3.1"
Framework = "net6.0"
})

projects |> Seq.iter (runSingleProject)
Expand Down
6 changes: 3 additions & 3 deletions src/Lighthouse/Dockerfile-arm64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:3.1 AS base
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
WORKDIR /app

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

# RUN pbm help

COPY ./bin/Release/netcoreapp3.1/publish/ /app
COPY ./bin/Release/net6.0/publish/ /app

FROM mcr.microsoft.com/dotnet/runtime:3.1 AS app
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS app
WORKDIR /app

COPY --from=base /app /app
Expand Down
6 changes: 3 additions & 3 deletions src/Lighthouse/Dockerfile-linux
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS base
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
WORKDIR /app

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

# RUN pbm help

COPY ./bin/Release/netcoreapp3.1/publish/ /app
COPY ./bin/Release/net6.0/publish/ /app

FROM mcr.microsoft.com/dotnet/core/runtime:3.1 AS app
FROM mcr.microsoft.com/dotnet/runtime:6.0 AS app
WORKDIR /app

COPY --from=base /app /app
Expand Down
6 changes: 3 additions & 3 deletions src/Lighthouse/Dockerfile-windows
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-nanoserver-1809 AS base
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS base
WORKDIR /app

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

# RUN pbm help

COPY ./bin/Release/netcoreapp3.1/publish/ /app
COPY ./bin/Release/net6.0/publish/ /app

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

COPY --from=base /app /app
Expand Down
2 changes: 1 addition & 1 deletion src/Lighthouse/buildLinuxDockerImages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi


echo "Building project..."
dotnet publish -c Release --framework netcoreapp3.1
dotnet publish -c Release --framework net6.0
dotnet build-server shutdown

LINUX_IMAGE="$IMAGE_NAME:linux-$IMAGE_VERSION"
Expand Down
2 changes: 1 addition & 1 deletion src/Lighthouse/buildWindowsDockerImages.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param (
)

Write-Host "Building project..."
dotnet publish -c Release --framework netcoreapp3.1
dotnet publish -c Release --framework net6.0
dotnet build-server shutdown

$windowsImage = "{0}:windows-{1}" -f $imageName,$tagVersion
Expand Down
4 changes: 2 additions & 2 deletions src/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<XunitVersion>2.4.2</XunitVersion>
<MicrosoftSdkVersion>17.3.0</MicrosoftSdkVersion>
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
<NetCoreVersion>netcoreapp3.1</NetCoreVersion>
<NetCoreVersion>net6.0</NetCoreVersion>
<NetStandardVersion>netstandard1.6</NetStandardVersion>
<NetFrameworkLibVersion>net461</NetFrameworkLibVersion>
<NetFrameworkTestVersion>netcoreapp3.1</NetFrameworkTestVersion>
<NetFrameworkTestVersion>net6.0</NetFrameworkTestVersion>
<AkkaVersion>1.4.40</AkkaVersion>
<PbmVersion>1.1.0</PbmVersion>
</PropertyGroup>
Expand Down

0 comments on commit 43056c2

Please sign in to comment.