Merge branch 'devel'

kekyo · Dec 10, 2024 · cf1da78 · cf1da78
2 parents b046df4 + daa7fa0
commit cf1da78
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 25 deletions.
diff --git a/README.ja.md b/README.ja.md
@@ -529,13 +529,6 @@ nuspecファイルを使ってパッケージを生成する場合は、デフ
 
 ----
 
-## TODO:
-
-* 除外ルールのサポート
-* ネイティブC++プロジェクトに対応させる
-* テンプレート出力をサポートする
-* フォールバックルールを指定可能にする
-
 ## License
 
 * Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
@@ -545,6 +538,8 @@ nuspecファイルを使ってパッケージを生成する場合は、デフ
 
 ## 履歴
 
+* 3.10.0:
+  * 環境によって.NET 9.0 SDK以上でビルド出来ない場合があるのを修正。
 * 3.9.0:
   * UTF8テキストファイル出力をBOMなしに変更。
 * 3.8.0:

diff --git a/README.md b/README.md
@@ -510,13 +510,6 @@ When you are using a nuspec file to generate a NuGet package, there are addition
 
 ----
 
-## TODO:
-
-* Support exclude rule set.
-* Support native C++ project.
-* Support templated output.
-* Support fallback rule set.
-
 ## License
 
 * Copyright (c) Kouji Matsui (@kozy_kekyo, @kekyo@mastodon.cloud)
@@ -526,6 +519,8 @@ When you are using a nuspec file to generate a NuGet package, there are addition
 
 ## History
 
+* 3.10.0:
+  * Fixed a bug that prevented building on .NET 9.0 SDK or upper, depending on the environment.
 * 3.9.0:
   * Changed UTF8 text file output to no BOM.
 * 3.8.0:

diff --git a/RelaxVersioner.Core.Tests/RelaxVersioner.Core.Tests.csproj b/RelaxVersioner.Core.Tests/RelaxVersioner.Core.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
   </PropertyGroup>
 

diff --git a/RelaxVersioner.Core/RelaxVersioner.Core.csproj b/RelaxVersioner.Core/RelaxVersioner.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
 
     <AssemblyName>RelaxVersioner.Core</AssemblyName>
@@ -17,7 +17,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
-                      Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.9.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RelaxVersioner.Tasks/RelaxVersioner.Tasks.csproj b/RelaxVersioner.Tasks/RelaxVersioner.Tasks.csproj
@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
-                      Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.9.0" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/RelaxVersioner/RelaxVersioner.csproj b/RelaxVersioner/RelaxVersioner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -24,7 +24,7 @@
     <NuspecProperties>$(NuspecProperties);Configuration=$(Configuration);PackageVersion=$(PackageVersion)</NuspecProperties>
   </PropertyGroup>
 
-  <PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0')">
+  <PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0') OR ('$(TargetFramework)' == 'net9.0')">
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
@@ -37,7 +37,7 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
-                      Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.9.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/RelaxVersioner/RelaxVersioner.nuspec b/RelaxVersioner/RelaxVersioner.nuspec
@@ -32,5 +32,6 @@
     <file src="bin\$Configuration$\net6.0\**\*.*" target="tools/net6.0" />
     <file src="bin\$Configuration$\net7.0\**\*.*" target="tools/net7.0" />
     <file src="bin\$Configuration$\net8.0\**\*.*" target="tools/net8.0" />
+    <file src="bin\$Configuration$\net9.0\**\*.*" target="tools/net9.0" />
   </files>
 </package>
diff --git a/RelaxVersioner/build/RelaxVersioner.props b/RelaxVersioner/build/RelaxVersioner.props
@@ -118,7 +118,7 @@
         if (!Directory.Exists(path))
         {
             string basePath = Path.GetDirectoryName(path);
-            path = Path.Combine(basePath, "net8.0");
+            path = Path.Combine(basePath, "net9.0");
         }
         CandidateDir = path;
 ]]>

diff --git a/rv-cli/rv-cli.csproj b/rv-cli/rv-cli.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -20,14 +20,14 @@
     <NuspecProperties>$(NuspecProperties);Configuration=$(Configuration);PackageVersion=$(PackageVersion)</NuspecProperties>
   </PropertyGroup>
 
-  <PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0')">
+  <PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0') OR ('$(TargetFramework)' == 'net9.0')">
     <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
-                      Include="RelaxVersioner" Version="3.7.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.9.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>