Skip to content

Commit 4b7130e

Browse files
authored
Merge pull request #217 from tomchavakis/net8
Quick'n'dirty net8
2 parents ac9014f + 943d79e commit 4b7130e

File tree

6 files changed

+17
-50
lines changed

6 files changed

+17
-50
lines changed

.github/workflows/action.yml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,11 @@ jobs:
1212
matrix:
1313
os: [ubuntu-latest, windows-latest, macos-latest]
1414
steps:
15-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
16-
- uses: actions/checkout@v3
17-
- name: Setup dotnet 3.0.100
18-
uses: actions/setup-dotnet@v2
15+
- uses: actions/checkout@v4
16+
- name: Setup dotnet 8.x
17+
uses: actions/setup-dotnet@v4
1918
with:
20-
dotnet-version: "3.1.100" # SDK Version to use.
21-
- name: Setup dotnet 5.0.x
22-
uses: actions/setup-dotnet@v2
23-
with:
24-
dotnet-version: "5.0.x" # SDK Version to use (x uses the latest version).
25-
- name: Setup dotnet 6.0.x
26-
uses: actions/setup-dotnet@v2
27-
with:
28-
dotnet-version: "6.0.x" # SDK Version to use (x uses the latest version).
29-
- name: Setup dotnet 7.0.x
30-
uses: actions/setup-dotnet@v2
31-
with:
32-
dotnet-version: "7.0.x" # SDK Version to use (x uses the latest version).
19+
dotnet-version: "8.x" # SDK Version to use (x uses the latest version).
3320
# dotnet restore
3421
- name: restore
3522
run: dotnet restore

.github/workflows/release.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,11 @@ jobs:
1212
# The type of runner that the job will run on
1313
runs-on: ubuntu-latest
1414
steps:
15-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
16-
- uses: actions/checkout@v3
17-
- name: Setup dotnet 3.0.100
18-
uses: actions/setup-dotnet@v2
15+
- uses: actions/checkout@v4
16+
- name: Setup dotnet 8.x
17+
uses: actions/setup-dotnet@v4
1918
with:
20-
dotnet-version: "3.1.100" # SDK Version to use.
21-
env:
22-
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
23-
- name: Setup dotnet 5.0.x
24-
uses: actions/setup-dotnet@v2
25-
with:
26-
dotnet-version: "5.0.x" # SDK Version to use (x uses the latest version).
27-
env:
28-
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
29-
- name: Setup dotnet 6.0.x
30-
uses: actions/setup-dotnet@v2
31-
with:
32-
dotnet-version: "6.0.x" # SDK Version to use (x uses the latest version).
33-
env:
34-
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
35-
- name: Setup dotnet 7.0.x
36-
uses: actions/setup-dotnet@v2
37-
with:
38-
dotnet-version: "7.0.103" # SDK Version to use (x uses the latest version).
19+
dotnet-version: "8.x" # SDK Version to use (x uses the latest version).
3920
env:
4021
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
4122
# dotnet restore
@@ -52,10 +33,10 @@ jobs:
5233
run: dotnet pack --configuration Release
5334
# publish the package
5435
- name: Publish the artifact
55-
run: dotnet publish -f net7.0 -c Release -o ./artifacts
36+
run: dotnet publish -f net8.0 -c Release -o ./artifacts
5637
# publish the package to package folder
5738
- name: Publish the artifact
58-
run: dotnet publish -f net7.0 -c Release -o ./package
39+
run: dotnet publish -f net8.0 -c Release -o ./package
5940
# Add nuget package
6041
- name: Nuget package
6142
run: dotnet pack -c Release -o ./artifacts

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
22
WORKDIR /src
33

44

@@ -7,10 +7,10 @@ RUN dotnet restore
77

88

99
COPY . ./
10-
RUN dotnet publish -f net7.0 -c Release -o out
10+
RUN dotnet publish -f net8.0 -c Release -o out
1111

1212

13-
FROM mcr.microsoft.com/dotnet/runtime:7.0
13+
FROM mcr.microsoft.com/dotnet/runtime:8.0
1414
WORKDIR /src
1515
COPY --from=build-env /src/out .
1616
ENTRYPOINT ["dotnet", "NugetUtility.dll"]

src/LicenseToUrlMappings.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Diagnostics.CodeAnalysis;
4-
using System.Diagnostics.CodeAnalysis;
54

65
namespace NugetUtility
76
{

src/NugetUtility.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<LangVersion>latest</LangVersion>
88
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
@@ -12,8 +12,8 @@
1212
<RepositoryType>git</RepositoryType>
1313
<PackageId>dotnet-project-licenses</PackageId>
1414
<ToolCommandName>dotnet-project-licenses</ToolCommandName>
15-
<Version>2.7.1</Version>
16-
<Authors>Tom Chavakis, Lexy2, senslen</Authors>
15+
<Version>2.7.2</Version>
16+
<Authors>Tom Chavakis, Lexy2, sensslen</Authors>
1717
<Company>-</Company>
1818
<Title>.NET Core Tool to print a list of the licenses of a projects</Title>
1919
<PackageProjectUrl>https://github.com/tomchavakis/nuget-license</PackageProjectUrl>

tests/NugetUtility.Tests/NugetUtility.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-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;</TargetFrameworks>
4+
<TargetFrameworks>net8.0;</TargetFrameworks>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
77
<LangVersion>latest</LangVersion>

0 commit comments

Comments
 (0)