From c03036b82f3c7f5764a27bcaff2c718caca147e9 Mon Sep 17 00:00:00 2001
From: hadashiA <dev@hadashikick.jp>
Date: Fri, 18 Aug 2023 19:09:32 +0900
Subject: [PATCH] Update target frameworks

---
 .github/workflows/build-debug.yml                             | 3 +--
 .github/workflows/build-release.yml                           | 3 +--
 benchmark/PerfBenchmark/PerfBenchmark.csproj                  | 2 +-
 sandbox/BlazorWasm/BlazorWasm.csproj                          | 2 +-
 sandbox/TryUlid/TryUlid.csproj                                | 2 +-
 src/Ulid.Cli/Ulid.Cli.csproj                                  | 2 +-
 src/Ulid.MessagePack/Ulid.MessagePack.csproj                  | 2 +-
 src/Ulid.SystemTextJson/Ulid.SystemTextJson.csproj            | 2 +-
 src/Ulid/Ulid.csproj                                          | 4 ++--
 tests/Ulid.Cli.Tests/Ulid.Cli.Tests.csproj                    | 2 +-
 tests/Ulid.MessagePack.Tests/Ulid.MessagePack.Tests.csproj    | 2 +-
 .../Ulid.SystemTextJson.Tests.csproj                          | 2 +-
 tests/Ulid.Tests/Ulid.Tests.csproj                            | 2 +-
 13 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml
index 127d02b..f64ee0d 100644
--- a/.github/workflows/build-debug.yml
+++ b/.github/workflows/build-debug.yml
@@ -17,9 +17,8 @@ jobs:
       - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
         with:
           dotnet-version: |
-            3.1.x
-            5.0.x
             6.0.x
+            7.0.x
       - run: dotnet build -c Debug
       - run: dotnet test -c Debug
 
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 201b655..a48a6e2 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -35,9 +35,8 @@ jobs:
       - uses: Cysharp/Actions/.github/actions/setup-dotnet@main
         with:
           dotnet-version: |
-            3.1.x
-            5.0.x
             6.0.x
+            7.0.x
       - run: dotnet build -c Release -p:Version=${{ env.GIT_TAG }}
       - run: dotnet test -c Release -p:Version=${{ env.GIT_TAG }}
       - run: dotnet pack -c Release --no-build -p:Version=${{ env.GIT_TAG }} -o ./publish
diff --git a/benchmark/PerfBenchmark/PerfBenchmark.csproj b/benchmark/PerfBenchmark/PerfBenchmark.csproj
index 2ad0b96..e611318 100644
--- a/benchmark/PerfBenchmark/PerfBenchmark.csproj
+++ b/benchmark/PerfBenchmark/PerfBenchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/sandbox/BlazorWasm/BlazorWasm.csproj b/sandbox/BlazorWasm/BlazorWasm.csproj
index 61dd5d6..25626bd 100644
--- a/sandbox/BlazorWasm/BlazorWasm.csproj
+++ b/sandbox/BlazorWasm/BlazorWasm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/sandbox/TryUlid/TryUlid.csproj b/sandbox/TryUlid/TryUlid.csproj
index da14d0f..b63e583 100644
--- a/sandbox/TryUlid/TryUlid.csproj
+++ b/sandbox/TryUlid/TryUlid.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Ulid.Cli/Ulid.Cli.csproj b/src/Ulid.Cli/Ulid.Cli.csproj
index b59bbe8..b513e6d 100644
--- a/src/Ulid.Cli/Ulid.Cli.csproj
+++ b/src/Ulid.Cli/Ulid.Cli.csproj
@@ -12,7 +12,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <ToolCommandName>dotnet-ulid</ToolCommandName>
         <PackAsTool>true</PackAsTool>
         <LangVersion>7.3</LangVersion>
diff --git a/src/Ulid.MessagePack/Ulid.MessagePack.csproj b/src/Ulid.MessagePack/Ulid.MessagePack.csproj
index 4427c8f..c2832ad 100644
--- a/src/Ulid.MessagePack/Ulid.MessagePack.csproj
+++ b/src/Ulid.MessagePack/Ulid.MessagePack.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>release.snk</AssemblyOriginatorKeyFile>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/src/Ulid.SystemTextJson/Ulid.SystemTextJson.csproj b/src/Ulid.SystemTextJson/Ulid.SystemTextJson.csproj
index ec6f95a..8a9cc94 100644
--- a/src/Ulid.SystemTextJson/Ulid.SystemTextJson.csproj
+++ b/src/Ulid.SystemTextJson/Ulid.SystemTextJson.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
         <DefineConstants>SYSTEM_TEXT_JSON</DefineConstants>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>release.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Ulid/Ulid.csproj b/src/Ulid/Ulid.csproj
index 60fe1d6..32fa56b 100644
--- a/src/Ulid/Ulid.csproj
+++ b/src/Ulid/Ulid.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <RootNamespace>System</RootNamespace>
         <SignAssembly>true</SignAssembly>
@@ -20,7 +20,7 @@
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
     </ItemGroup>
 
diff --git a/tests/Ulid.Cli.Tests/Ulid.Cli.Tests.csproj b/tests/Ulid.Cli.Tests/Ulid.Cli.Tests.csproj
index 47a0791..d167d01 100644
--- a/tests/Ulid.Cli.Tests/Ulid.Cli.Tests.csproj
+++ b/tests/Ulid.Cli.Tests/Ulid.Cli.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/tests/Ulid.MessagePack.Tests/Ulid.MessagePack.Tests.csproj b/tests/Ulid.MessagePack.Tests/Ulid.MessagePack.Tests.csproj
index 09744cd..bf66c42 100644
--- a/tests/Ulid.MessagePack.Tests/Ulid.MessagePack.Tests.csproj
+++ b/tests/Ulid.MessagePack.Tests/Ulid.MessagePack.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
diff --git a/tests/Ulid.SystemTextJson.Tests/Ulid.SystemTextJson.Tests.csproj b/tests/Ulid.SystemTextJson.Tests/Ulid.SystemTextJson.Tests.csproj
index ed88f8b..fc95b00 100644
--- a/tests/Ulid.SystemTextJson.Tests/Ulid.SystemTextJson.Tests.csproj
+++ b/tests/Ulid.SystemTextJson.Tests/Ulid.SystemTextJson.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
diff --git a/tests/Ulid.Tests/Ulid.Tests.csproj b/tests/Ulid.Tests/Ulid.Tests.csproj
index 47a978a..a2d070d 100644
--- a/tests/Ulid.Tests/Ulid.Tests.csproj
+++ b/tests/Ulid.Tests/Ulid.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-      <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
+      <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>