Skip to content

Commit

Permalink
Add .NET 8 support
Browse files Browse the repository at this point in the history
  • Loading branch information
eduherminio committed Nov 19, 2023
1 parent 61f5b54 commit a6e88d4
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: '[Ubuntu] Set version to -ci-${{ github.run_number }}'
if: matrix.os == 'ubuntu-latest'
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ jobs:
ARTIFACT_DIR: ./artifacts
PROJECT_NAME: AoCHelper

- name: Install hub tool
if: github.event.inputs.should_create_github_release == 'true'
run: |
sudo apt-get update && sudo apt-get install -y hub
steps:
- uses: actions/checkout@v4

Expand All @@ -51,7 +56,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Set version to ${{ github.event.inputs.new_package_version }}
shell: pwsh
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
</ItemGroup>

<PropertyGroup Condition="'$(DeterministicBuild)' == 'true'">
Expand Down
2 changes: 1 addition & 1 deletion src/AoCHelper.PoC/AoCHelper.PoC.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

Expand Down
20 changes: 10 additions & 10 deletions src/AoCHelper/AoCHelper.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<Title>AoCHelper</Title>
Expand All @@ -20,8 +20,16 @@
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Spectre.Console" Version="0.45.0" />
</ItemGroup>

<ItemGroup Label="https://github.com/dotnet/roslyn/issues/45510">
<Compile Remove="IsExternalInit.cs" Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'" />
<Compile Remove="IsExternalInit.cs" Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>

<ItemGroup>
Expand All @@ -36,14 +44,6 @@
</AssemblyAttribute>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Spectre.Console" Version="0.45.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>

<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591</NoWarn>
Expand Down
5 changes: 0 additions & 5 deletions src/AoCHelper/SolvingException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace AoCHelper
{
[Serializable]
public class SolvingException : Exception
{
public SolvingException()
Expand All @@ -16,9 +15,5 @@ public SolvingException(string message) : base(message)
public SolvingException(string message, Exception innerException) : base(message, innerException)
{
}

protected SolvingException(SerializationInfo info, StreamingContext context) : base(info, context)
{
}
}
}
2 changes: 1 addition & 1 deletion tests/AoCHelper.Test/AoCHelper.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

Expand Down

0 comments on commit a6e88d4

Please sign in to comment.