Merge branch 'devel'

Author: kekyo

Directory.Build.props

@@ -11,6 +11,7 @@
     <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/kekyo/RelaxVersioner.git</RepositoryUrl>

PlayGround/CSharpNewTestProject/CSharpNewTestProject.csproj

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
     <!--<TargetFrameworks>net48</TargetFrameworks>-->
     <PlatformTarget>x86</PlatformTarget>
 

README.ja.md

@@ -553,6 +553,8 @@ nuspecファイルを使ってパッケージを生成する場合は、デフ
 
 ## 履歴
 
+* 3.19.0:
+  * net8.0の自動informational versionが競合する可能性があるので無効にしました。
 * 3.18.0:
   * GitReader を 1.16.0 に更新し、structured-interface の代わりに primitive-interface を使用。
 * 3.17.0:

README.md

@@ -535,6 +535,8 @@ When you are using a nuspec file to generate a NuGet package, there are addition
 
 ## History
 
+* 3.19.0:
+  * Disabled the automatic informational version of net8.0 because it might cause conflicts.
 * 3.18.0:
   * Updated GitReader to 1.16.0 and uses primitive-interface instead of structured-interface.
 * 3.17.0:

RelaxVersioner.Core.Tests/RelaxVersioner.Core.Tests.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="RelaxVersioner" Version="3.17.0" PrivateAssets="all" />
+    <PackageReference Include="RelaxVersioner" Version="3.18.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

RelaxVersioner.Core/RelaxVersioner.Core.csproj

@@ -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.17.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.18.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

RelaxVersioner.Tasks/RelaxVersioner.Tasks.csproj

@@ -28,7 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
     <PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
-                      Include="RelaxVersioner" Version="3.17.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.18.0" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

RelaxVersioner/RelaxVersioner.csproj

@@ -36,7 +36,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.17.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.18.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

RelaxVersioner/build/RelaxVersioner.props

@@ -32,6 +32,7 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
   </PropertyGroup>
 
   <PropertyGroup>

rv-cli/rv-cli.csproj

@@ -27,7 +27,7 @@
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <PackageReference Condition="'$(RV_BOOTSTRAP)' != 'True'"
-                      Include="RelaxVersioner" Version="3.17.0" PrivateAssets="all" />
+                      Include="RelaxVersioner" Version="3.18.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>