Remove .NET standard support - out of support (#18)

* Remove .NET standard support - out of support * Updated proj * updated ci * Upgraded csproj files
wivuu · Apr 15, 2024 · 362ab93 · 362ab93
1 parent ef3ceaa
commit 362ab93
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,11 +11,11 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  - name: Setup .NET Core
- uses: actions/setup-dotnet@v1
+ uses: actions/setup-dotnet@v2
  with:
- dotnet-version: 7.0.100
+ dotnet-version: '8.0.x'
  - name: Install dependencies
  run: dotnet restore
  - name: Build

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -13,9 +13,9 @@ jobs:
  steps:
  - uses: actions/checkout@v2
  - name: Setup .NET Core
- uses: actions/setup-dotnet@v1
+ uses: actions/setup-dotnet@v2
  with:
- dotnet-version: 7.0.100
+ dotnet-version: '8.0.x'
  - name: Install dependencies
  run: dotnet restore
  - name: Build

diff --git a/TestNSwag.Models/TestNSwag.Models.csproj b/TestNSwag.Models/TestNSwag.Models.csproj
@@ -5,7 +5,7 @@
  </ItemGroup>
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>enable</Nullable>
  </PropertyGroup>

diff --git a/TestNSwag/TestNSwag.csproj b/TestNSwag/TestNSwag.csproj
@@ -9,7 +9,7 @@
  </ItemGroup>
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  </PropertyGroup>
 

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  </PropertyGroup>
 

diff --git a/Wivuu.JsonPolymorphism.proj b/Wivuu.JsonPolymorphism.proj
@@ -1,13 +1,13 @@
 <Project>
 
  <PropertyGroup>
- <VersionPrefix>1.0.18</VersionPrefix>
+ <VersionPrefix>1.0.20</VersionPrefix>
  <Authors>Erik O'Leary</Authors>
  <Company>Wivuu</Company>
  <Product>Wivuu JsonPolymorphism</Product>
  <Description>Adds System.Text.Json serializer support for polymorphism with a discriminator attribute.</Description>
  <ReleaseNotes>
- - Allow base type to not be abstract
+ - Remove support for .NET 5.0 and below (.NET Standard 2.0), which are out-of-support.
  </ReleaseNotes>
  <PackageTags>net6;json;serialize;polymorphism</PackageTags>
  <PackageProjectUrl>https://github.com/wivuu/Wivuu.JsonPolymorphism</PackageProjectUrl>

diff --git a/Wivuu.JsonPolymorphism/Wivuu.JsonPolymorphism.csproj b/Wivuu.JsonPolymorphism/Wivuu.JsonPolymorphism.csproj
@@ -4,17 +4,12 @@
  <PropertyGroup>
  <Nullable>enable</Nullable>
  <LangVersion>11</LangVersion>
- <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+ <TargetFramework>net6.0</TargetFramework>
  <BuildOutputTargetFolder>analyzers</BuildOutputTargetFolder>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" PrivateAssets="all" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
- <PackageReference Include="System.Text.Json" Version="6.0.0" />
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>