Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add net8 and net7 support #31

Merged
merged 1 commit into from
Feb 29, 2024
Merged

fix: add net8 and net7 support #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 8.0.100
- name: Restore
run: dotnet restore
- name: Build
Expand All @@ -45,7 +45,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
dotnet-version: 8.0.100
- name: Build
run: dotnet build -c Release
- name: Create Release NuGet package
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/docker-example/ConsoleApp/bin/Debug/net6.0/ConsoleApp.dll",
"program": "${workspaceFolder}/docker-example/ConsoleApp/bin/Debug/net8.0/ConsoleApp.dll",
"args": [],
"cwd": "${workspaceFolder}/docker-example/ConsoleApp",
"console": "internalConsole",
Expand Down
2 changes: 1 addition & 1 deletion docker-example/ConsoleApp/ConsoleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions docker-example/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim-amd64 as build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0.100-bullseye-slim-amd64 as build-env
elonmallin marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /app

# Copy csproj and restore as distinct layers
Expand All @@ -13,7 +13,7 @@ RUN dotnet publish -c Release -o /app/out
RUN dotnet tool install --tool-path /app/out dotnet-certificate-tool

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:6.0.0-bullseye-slim-amd64
FROM mcr.microsoft.com/dotnet/aspnet:8.0.0-bullseye-slim-amd64
elonmallin marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /app
COPY --from=build-env /app/out .
COPY ./docker-entrypoint.sh .
Expand Down
2 changes: 1 addition & 1 deletion docker-example/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.100"
"version": "8.0.100"
}
}
2 changes: 1 addition & 1 deletion src/GSoft.CertificateTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<Description>CLI tool that installs a certificate to the specified store (defaults to My).</Description>
<RepositoryUrl>https://github.com/gsoft-inc/dotnet-certificate-tool</RepositoryUrl>
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down