include TargetFramework in log (#721)

SimonCropp · web-flow · commit 7aff1d8ca4ed · 2025-10-14T21:19:41.000+11:00
diff --git a/src/ConfigReader.Tests/ConfigReader.Tests.csproj b/src/ConfigReader.Tests/ConfigReader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);xUnit1051</NoWarn>
     <RootNamespace>testing</RootNamespace>
diff --git a/src/ConfigReader/ConfigReader.csproj b/src/ConfigReader/ConfigReader.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net48;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net48;net8.0;net9.0</TargetFrameworks>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/src/ConfigReader/LogBuilder.cs b/src/ConfigReader/LogBuilder.cs
@@ -92,6 +92,12 @@ public static string BuildConfigLogMessage(string targetDirectory, ConfigResult
                  """);
         }
 
+#if NET48
+        builder.AppendLine("    TargetFramework: net48");
+#endif
+#if NET9_0
+        builder.AppendLine("    TargetFramework: net9.0");
+#endif
         return builder.ToString().Trim();
     }
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU1608;NU1109</NoWarn>
-    <Version>28.0.0-beta.3</Version>
+    <Version>28.0.0-beta.4</Version>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Markdown, Snippets, mdsnippets, documentation, MarkdownSnippets</PackageTags>
diff --git a/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.csproj b/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.csproj
@@ -1,22 +1,28 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>net48;net9.0</TargetFrameworks>
     <Description>Extract code snippets from any language to be used when building documentation.</Description>
     <DevelopmentDependency>true</DevelopmentDependency>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
+  <Target Name="ShowSdkInfo" BeforeTargets="Build">
+    <Message Text="SDK Version: $(NETCoreSdkVersion)" Importance="high" />
+    <Message Text="SDK Major: $(SdkMajorVersion)" Importance="high" />
+    <Message Text="Target Framework: $(TargetFramework)" Importance="high" />
+    <Message Text="SDK Root: $(NetCoreSdkBundledVersionsPropsPath)" Importance="high" />
+  </Target>
   <ItemGroup>
     <Compile Include="..\ConfigReader\*.cs" />
 
-    <Content Include=".\bin\$(Configuration)\$(TargetFramework)\MarkdownSnippets.MsBuild.dll">
+    <TfmSpecificPackageFile Include=".\bin\$(Configuration)\$(TargetFramework)\MarkdownSnippets.MsBuild.dll">
       <Pack>true</Pack>
-      <PackagePath>task</PackagePath>
-    </Content>
-    <Content Include="$(SolutionDir)MarkdownSnippets\bin\$(Configuration)\$(TargetFramework)\MarkdownSnippets.dll">
+      <PackagePath>task\$(TargetFramework)</PackagePath>
+    </TfmSpecificPackageFile>
+    <TfmSpecificPackageFile Include="$(SolutionDir)MarkdownSnippets\bin\$(Configuration)\$(TargetFramework)\MarkdownSnippets.dll">
       <Pack>true</Pack>
-      <PackagePath>task</PackagePath>
-    </Content>
+      <PackagePath>task\$(TargetFramework)</PackagePath>
+    </TfmSpecificPackageFile>
     <Content Include="MarkdownSnippets.MsBuild.targets">
       <Pack>true</Pack>
       <PackagePath>build</PackagePath>
diff --git a/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.targets b/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.targets
@@ -1,6 +1,7 @@
 ﻿<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MarkdownSnippetsAssembly>$(MSBuildThisFileDirectory)..\task\MarkdownSnippets.MsBuild.dll</MarkdownSnippetsAssembly>
+    <MarkdownSnippetsAssembly Condition="$(MSBuildRuntimeType) == 'Core'">$(MSBuildThisFileDirectory)..\task\net9.0</MarkdownSnippetsAssembly>
+    <MarkdownSnippetsAssembly Condition="$(MSBuildRuntimeType) != 'Core'">$(MSBuildThisFileDirectory)..\task\net48</MarkdownSnippetsAssembly>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.DotNet9_0.verified.txt b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.DotNet9_0.verified.txt
@@ -20,4 +20,5 @@
         Dir6
     UrlsAsSnippets:
         Url1
-        Url2
+        Url2
+    TargetFramework: net9.0
diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.DotNet9_0.verified.txt b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.DotNet9_0.verified.txt
@@ -10,4 +10,5 @@
     FileConfigPath: theConfigFilePath (exists:False)
     ReadOnly: 
     WriteHeader: 
-    Header:
+    Header: 
+    TargetFramework: net9.0
diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.DotNet9_0.verified.txt b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.DotNet9_0.verified.txt
@@ -25,4 +25,5 @@
         Dir6
     UrlsAsSnippets:
         Url1
-        Url2
+        Url2
+    TargetFramework: net9.0
diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.cs b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.cs
@@ -21,7 +21,8 @@ public Task BuildConfigLogMessage()
             Convention = DocumentConvention.InPlaceOverwrite,
         };
         var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath");
-        return Verify(message);
+        return Verify(message)
+            .UniqueForTargetFrameworkAndVersion();
     }
 
     [Fact]
@@ -45,14 +46,16 @@ public Task BuildConfigLogMessageSourceTransform()
             Convention = DocumentConvention.SourceTransform,
         };
         var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath");
-        return Verify(message);
+        return Verify(message)
+            .UniqueForTargetFrameworkAndVersion();
     }
 
     [Fact]
     public Task BuildConfigLogMessageMinimal()
     {
         var config = new ConfigResult();
         var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath");
-        return Verify(message);
+        return Verify(message)
+            .UniqueForTargetFrameworkAndVersion();
     }
 }
diff --git a/src/MarkdownSnippets.Tool.Tests/MarkdownSnippets.Tool.Tests.csproj b/src/MarkdownSnippets.Tool.Tests/MarkdownSnippets.Tool.Tests.csproj
@@ -1,7 +1,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);xUnit1051</NoWarn>
   </PropertyGroup>
diff --git a/src/MarkdownSnippets.Tool/MarkdownSnippets.Tool.csproj b/src/MarkdownSnippets.Tool/MarkdownSnippets.Tool.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ToolCommandName>mdsnippets</ToolCommandName>
     <AssemblyName>mdsnippets</AssemblyName>
     <PackageId>MarkdownSnippets.Tool</PackageId>
diff --git a/src/MarkdownSnippets/MarkdownSnippets.csproj b/src/MarkdownSnippets/MarkdownSnippets.csproj
@@ -1,7 +1,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net48;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net48;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ProjectDefaults" PrivateAssets="all" />
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net48</TargetFrameworks>
-    <TargetFrameworks>net8.0;$(TargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;$(TargetFrameworks)</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);xUnit1051</NoWarn>
     <RootNamespace>testing</RootNamespace>
diff --git a/src/appveyor.yml b/src/appveyor.yml
@@ -15,6 +15,7 @@ build_script:
       Invoke-WebRequest "https://dot.net/v1/dotnet-install.sh" -OutFile "./dotnet-install.sh"
       sudo chmod u+x dotnet-install.sh
       sudo ./dotnet-install.sh --jsonfile src/global.json --architecture x64 --install-dir '/usr/local/share/dotnet'
+      sudo ./dotnet-install.sh --version 9.0.305 --architecture x64 --install-dir '/usr/local/share/dotnet'
     }
 - dotnet build src --configuration Release
 - dotnet test src --configuration Release --no-build --no-restore

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,12 @@ public static string BuildConfigLogMessage(string targetDirectory, ConfigResult`
`92`	`92`	`""");`
`93`	`93`	`}`
`94`	`94`
	`95`	`+#if NET48`
	`96`	`+ builder.AppendLine(" TargetFramework: net48");`
	`97`	`+#endif`
	`98`	`+#if NET9_0`
	`99`	`+ builder.AppendLine(" TargetFramework: net9.0");`
	`100`	`+#endif`
`95`	`101`	`return builder.ToString().Trim();`
`96`	`102`	`}`
`97`	`103`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ public Task BuildConfigLogMessage()`
`21`	`21`	`Convention = DocumentConvention.InPlaceOverwrite,`
`22`	`22`	`};`
`23`	`23`	`var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath");`
`24`		`- return Verify(message);`
	`24`	`+ return Verify(message)`
	`25`	`+ .UniqueForTargetFrameworkAndVersion();`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`[Fact]`
`@@ -45,14 +46,16 @@ public Task BuildConfigLogMessageSourceTransform()`
`45`	`46`	`Convention = DocumentConvention.SourceTransform,`
`46`	`47`	`};`
`47`	`48`	`var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath");`
`48`		`- return Verify(message);`
	`49`	`+ return Verify(message)`
	`50`	`+ .UniqueForTargetFrameworkAndVersion();`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`[Fact]`
`52`	`54`	`public Task BuildConfigLogMessageMinimal()`
`53`	`55`	`{`
`54`	`56`	`var config = new ConfigResult();`
`55`	`57`	`var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath");`
`56`		`- return Verify(message);`
	`58`	`+ return Verify(message)`
	`59`	`+ .UniqueForTargetFrameworkAndVersion();`
`57`	`60`	`}`
`58`	`61`	`}`