Skip to content

Commit

Permalink
Upgraded to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
mtirionMSFT committed Oct 9, 2024
1 parent c04311f commit 975ded0
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.x
dotnet-version: 8.x
fetch-depth: 0

# Loop through all the solutions in src and restore, build & test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
id: gitversion
uses: gittools/actions/gitversion/execute@v0

# Setup .NET 6
# Setup .NET 8
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.x
dotnet-version: 8.x

# Build the tools & create the zip-file and nuget packages
# Chocolatey tools are in .\tools. NuGet packages in .\artifacts
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
ARG tool
WORKDIR /app

Expand All @@ -10,7 +10,7 @@ RUN dotnet restore "src/${tool}/${tool}.csproj"
RUN dotnet publish "src/${tool}/${tool}.csproj" -c Release -r linux-musl-x64 -o out /p:PublishSingleFile=true /p:CopyOutputSymbolsToPublishDirectory=false /p:AssemblyName=docfx-companion-tools-entrypoint --self-contained false

# Build runtime image
FROM mcr.microsoft.com/dotnet/runtime:6.0-alpine
FROM mcr.microsoft.com/dotnet/runtime:8.0
RUN adduser -D docfx-companion-tools
COPY --from=build-env /app/out /usr/bin/
USER docfx-companion-tools
Expand Down
4 changes: 3 additions & 1 deletion src/DocFxOpenApi/DocFxOpenApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
5 changes: 4 additions & 1 deletion src/DocFxTocGenerator/DocFxTocGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Authors>DocFx Companion Tools contributors</Authors>
Expand Down
5 changes: 4 additions & 1 deletion src/DocLanguageTranslator/DocLanguageTranslator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Authors>DocFx Companion Tools contributors</Authors>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
6 changes: 4 additions & 2 deletions src/DocLinkChecker/DocLinkChecker/DocLinkChecker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>10.0</LangVersion>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Authors>DocFx Companion Tools contributors</Authors>
Expand Down

0 comments on commit 975ded0

Please sign in to comment.