Merge pull request #49 from Cysharp/hadashiA/fw

Update target frameworks
Cysharp · Aug 18, 2023 · b750393 · b750393
2 parents 6addb56 + c03036b
commit b750393
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml
@@ -17,8 +17,6 @@ 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-      <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
+      <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>