From d0edbb4dab0d3ed61e266fc016accd7592271cd1 Mon Sep 17 00:00:00 2001
From: Kouji Matsui <k@kekyo.net>
Date: Tue, 28 May 2024 22:51:05 +0900
Subject: [PATCH] Supported dotnet future release versions (maybe).

---
 RelaxVersioner/RelaxVersioner.csproj        |  2 +-
 RelaxVersioner/build/RelaxVersioner.props   | 28 ++++++++++++++++++++-
 RelaxVersioner/build/RelaxVersioner.targets | 13 ++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/RelaxVersioner/RelaxVersioner.csproj b/RelaxVersioner/RelaxVersioner.csproj
index 3bcc360..1c9d823 100644
--- a/RelaxVersioner/RelaxVersioner.csproj
+++ b/RelaxVersioner/RelaxVersioner.csproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1') OR ('$(TargetFramework)' == 'net5.0') OR ('$(TargetFramework)' == 'net6.0') OR ('$(TargetFramework)' == 'net7.0') OR ('$(TargetFramework)' == 'net8.0')">
-    <RollForward>Minor</RollForward>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/RelaxVersioner/build/RelaxVersioner.props b/RelaxVersioner/build/RelaxVersioner.props
index 52ca8f8..6f6f9ac 100644
--- a/RelaxVersioner/build/RelaxVersioner.props
+++ b/RelaxVersioner/build/RelaxVersioner.props
@@ -99,5 +99,31 @@
       </Code>
     </Task>
   </UsingTask>
-    
+
+  <UsingTask
+    TaskName="_RVB_CandidateToolingDir"
+    TaskFactory="$(_RVB_TaskFactory)"
+    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
+    <ParameterGroup>
+      <ToolingDir ParameterType="Microsoft.Build.Framework.ITaskItem" Required="true" />
+      <CandidateDir Output="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System"/>
+      <Using Namespace="System.IO"/>
+      <Using Namespace="Microsoft.Build.Framework"/>
+      <Code Type="Fragment" Language="cs">
+<![CDATA[
+        string path = Path.GetFullPath(ToolingDir.ItemSpec);
+        if (!Directory.Exists(path))
+        {
+            string basePath = Path.GetDirectoryName(path);
+            path = Path.Combine(basePath, "net8.0");
+        }
+        CandidateDir = path;
+]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
 </Project>
diff --git a/RelaxVersioner/build/RelaxVersioner.targets b/RelaxVersioner/build/RelaxVersioner.targets
index 9d91254..d8e3920 100644
--- a/RelaxVersioner/build/RelaxVersioner.targets
+++ b/RelaxVersioner/build/RelaxVersioner.targets
@@ -53,6 +53,11 @@
   </Target>
 
   <Target Name="RelaxVersionerPrepare">
+
+    <_RVB_CandidateToolingDir ToolingDir="$(_RVB_ToolingDir)">
+      <Output TaskParameter="CandidateDir" PropertyName="_RVB_ToolingCandidateDir" />
+    </_RVB_CandidateToolingDir>
+
     <!-- For F# -->
     <PropertyGroup Condition="'$(Language)' == 'F#'">
       <!-- HACK: https://github.com/fsharp/fsharp/issues/289 -->
@@ -110,7 +115,7 @@
     
     <PropertyGroup>
       <RelaxVersionerToolingRuntimeName Condition="'$(RelaxVersionerToolingRuntimeName)' == ''">$(_RVB_RuntimeName)</RelaxVersionerToolingRuntimeName>
-      <RelaxVersionerToolingDir Condition="'$(RelaxVersionerToolingDir)' == ''">$([System.IO.Path]::GetFullPath('$(_RVB_ToolingDir)'))</RelaxVersionerToolingDir>
+      <RelaxVersionerToolingDir Condition="'$(RelaxVersionerToolingDir)' == ''">$(_RVB_ToolingCandidateDir)</RelaxVersionerToolingDir>
       <RelaxVersionerToolingPath Condition="'$(RelaxVersionerToolingPath)' == ''">$([System.IO.Path]::Combine('$(RelaxVersionerToolingDir)','$(_RVB_ExecutableName)'))</RelaxVersionerToolingPath>
     </PropertyGroup>
 
@@ -282,9 +287,13 @@
 
   <Target Name="RelaxVersionerPackPrepare">
 
+    <_RVB_CandidateToolingDir ToolingDir="$(_RVB_ToolingDir)">
+      <Output TaskParameter="CandidateDir" PropertyName="_RVB_ToolingCandidateDir" />
+    </_RVB_CandidateToolingDir>
+
     <PropertyGroup>
       <RelaxVersionerToolingRuntimeName Condition="'$(RelaxVersionerToolingRuntimeName)' == ''">$(_RVB_RuntimeName)</RelaxVersionerToolingRuntimeName>
-      <RelaxVersionerToolingDir Condition="'$(RelaxVersionerToolingDir)' == ''">$([System.IO.Path]::GetFullPath('$(_RVB_ToolingDir)'))</RelaxVersionerToolingDir>
+      <RelaxVersionerToolingDir Condition="'$(RelaxVersionerToolingDir)' == ''">$(_RVB_ToolingCandidateDir)</RelaxVersionerToolingDir>
       <RelaxVersionerToolingPath Condition="'$(RelaxVersionerToolingPath)' == ''">$([System.IO.Path]::Combine('$(RelaxVersionerToolingDir)','$(_RVB_ExecutableName)'))</RelaxVersionerToolingPath>
 
       <RelaxVersionerOutputDir Condition="'$(RelaxVersionerOutputDir)' == ''">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','$(NuspecOutputPath)'))</RelaxVersionerOutputDir>