Skip to content

Commit

Permalink
Add .NET 8.0 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Zoltan Csizmadia authored and zcsizmadia committed Nov 19, 2023
1 parent 24e5857 commit 47c16a8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 45 deletions.
27 changes: 0 additions & 27 deletions .github/workflows/benchmark.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
dotnet-version: |
6.0.x
7.0.x
8.0.x
- name: Build
run: dotnet build -c Release
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup Label="Versions">
<!-- Default target frameworks -->
<DefaultExeTargetFrameworks Condition="'$(DefaultExeTargetFrameworks)' == ''">net7.0</DefaultExeTargetFrameworks>
<DefaultExeTargetFrameworks Condition="'$(DefaultExeTargetFrameworks)' == ''">net6.0;net7.0;net8.0</DefaultExeTargetFrameworks>
<DefaultLibraryTargetFrameworks Condition="'$(DefaultLibraryTargetFrameworks)' == ''">netstandard2.0;netstandard2.1</DefaultLibraryTargetFrameworks>
<DefaultTestTargetFrameworks Condition="'$(DefaultTestTargetFrameworks)' == ''">net6.0;net7.0</DefaultTestTargetFrameworks>
<DefaultTestTargetFrameworks Condition="'$(DefaultTestTargetFrameworks)' == ''">net6.0;net7.0;net8.0</DefaultTestTargetFrameworks>

<!-- Default version if not specified in dotnet command -->
<PackageVersion Condition="'$(PackageVersion)' == ''">0.1.0</PackageVersion>
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
<PackageVersion Include="System.CodeDom" Version="7.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
<PackageVersion Include="System.CodeDom" Version="8.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
<PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
Expand All @@ -20,8 +20,8 @@
-->
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="xunit" Version="2.6.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
<PackageVersion Include="xunit" Version="2.6.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />

<!--
Benchmark
Expand Down
12 changes: 0 additions & 12 deletions src/Utf8Json.UniversalCodeGenerator/Mono.Options/Options.cs
Original file line number Diff line number Diff line change
Expand Up @@ -709,22 +709,10 @@ public OptionException(string message, string optionName, Exception innerExcepti
this.option = optionName;
}

protected OptionException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
this.option = info.GetString("OptionName");
}

public string OptionName
{
get { return this.option; }
}

public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
base.GetObjectData(info, context);
info.AddValue("OptionName", option);
}
}

public delegate void OptionAction<TKey, TValue>(TKey key, TValue value);
Expand Down

0 comments on commit 47c16a8

Please sign in to comment.