diff --git a/src/ConfigReader.Tests/ConfigReader.Tests.csproj b/src/ConfigReader.Tests/ConfigReader.Tests.csproj index beda74b0..1b3328a7 100644 --- a/src/ConfigReader.Tests/ConfigReader.Tests.csproj +++ b/src/ConfigReader.Tests/ConfigReader.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Exe $(NoWarn);xUnit1051 testing diff --git a/src/ConfigReader/ConfigReader.csproj b/src/ConfigReader/ConfigReader.csproj index fb9234ee..2d075bb1 100644 --- a/src/ConfigReader/ConfigReader.csproj +++ b/src/ConfigReader/ConfigReader.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net48;net8.0 + netstandard2.0;netstandard2.1;net48;net8.0;net9.0 false false diff --git a/src/ConfigReader/LogBuilder.cs b/src/ConfigReader/LogBuilder.cs index 56a022e7..848aefd8 100644 --- 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 index 1b214452..15a37dc4 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ CS1591;NU1608;NU1109 - 28.0.0-beta.3 + 28.0.0-beta.4 preview 1.0.0 Markdown, Snippets, mdsnippets, documentation, MarkdownSnippets diff --git a/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.csproj b/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.csproj index 72da630a..ee493713 100644 --- a/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.csproj +++ b/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.csproj @@ -1,22 +1,28 @@ - netstandard2.0 + net48;net9.0 Extract code snippets from any language to be used when building documentation. true false + + + + + + - + true - task - - + task\$(TargetFramework) + + true - task - + task\$(TargetFramework) + true build diff --git a/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.targets b/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.targets index 71475bc3..124dde3d 100644 --- a/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.targets +++ b/src/MarkdownSnippets.MsBuild/MarkdownSnippets.MsBuild.targets @@ -1,6 +1,7 @@  - $(MSBuildThisFileDirectory)..\task\MarkdownSnippets.MsBuild.dll + $(MSBuildThisFileDirectory)..\task\net9.0 + $(MSBuildThisFileDirectory)..\task\net48 diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.verified.txt b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.DotNet9_0.verified.txt similarity index 92% rename from src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.verified.txt rename to src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.DotNet9_0.verified.txt index 8b6e4c45..699fdaad 100644 --- a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.verified.txt +++ b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessage.DotNet9_0.verified.txt @@ -20,4 +20,5 @@ Dir6 UrlsAsSnippets: Url1 - Url2 \ No newline at end of file + Url2 + TargetFramework: net9.0 \ No newline at end of file diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.verified.txt b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.DotNet9_0.verified.txt similarity index 88% rename from src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.verified.txt rename to src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.DotNet9_0.verified.txt index ee7cc384..012d534e 100644 --- a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.verified.txt +++ b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageMinimal.DotNet9_0.verified.txt @@ -10,4 +10,5 @@ FileConfigPath: theConfigFilePath (exists:False) ReadOnly: WriteHeader: - Header: \ No newline at end of file + Header: + TargetFramework: net9.0 \ No newline at end of file diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.verified.txt b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.DotNet9_0.verified.txt similarity index 93% rename from src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.verified.txt rename to src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.DotNet9_0.verified.txt index 2a20f770..9df71b1d 100644 --- a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.verified.txt +++ b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.BuildConfigLogMessageSourceTransform.DotNet9_0.verified.txt @@ -25,4 +25,5 @@ Dir6 UrlsAsSnippets: Url1 - Url2 \ No newline at end of file + Url2 + TargetFramework: net9.0 \ No newline at end of file diff --git a/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.cs b/src/MarkdownSnippets.Tool.Tests/LogBuilderTests.cs index 04e374b2..6191e022 100644 --- 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,7 +46,8 @@ public Task BuildConfigLogMessageSourceTransform() Convention = DocumentConvention.SourceTransform, }; var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath"); - return Verify(message); + return Verify(message) + .UniqueForTargetFrameworkAndVersion(); } [Fact] @@ -53,6 +55,7 @@ public Task BuildConfigLogMessageMinimal() { var config = new ConfigResult(); var message = LogBuilder.BuildConfigLogMessage("theRoot", config, "theConfigFilePath"); - return Verify(message); + return Verify(message) + .UniqueForTargetFrameworkAndVersion(); } } \ No newline at end of file diff --git a/src/MarkdownSnippets.Tool.Tests/MarkdownSnippets.Tool.Tests.csproj b/src/MarkdownSnippets.Tool.Tests/MarkdownSnippets.Tool.Tests.csproj index 672b412b..76f4b8a7 100644 --- a/src/MarkdownSnippets.Tool.Tests/MarkdownSnippets.Tool.Tests.csproj +++ b/src/MarkdownSnippets.Tool.Tests/MarkdownSnippets.Tool.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Exe $(NoWarn);xUnit1051 diff --git a/src/MarkdownSnippets.Tool/MarkdownSnippets.Tool.csproj b/src/MarkdownSnippets.Tool/MarkdownSnippets.Tool.csproj index acf675a3..af2c64ae 100644 --- a/src/MarkdownSnippets.Tool/MarkdownSnippets.Tool.csproj +++ b/src/MarkdownSnippets.Tool/MarkdownSnippets.Tool.csproj @@ -1,7 +1,7 @@ Exe - net8.0 + net8.0;net9.0 mdsnippets mdsnippets MarkdownSnippets.Tool diff --git a/src/MarkdownSnippets/MarkdownSnippets.csproj b/src/MarkdownSnippets/MarkdownSnippets.csproj index c009ddf8..bd67ff06 100644 --- a/src/MarkdownSnippets/MarkdownSnippets.csproj +++ b/src/MarkdownSnippets/MarkdownSnippets.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net48;net8.0 + netstandard2.0;netstandard2.1;net48;net8.0;net9.0 diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj index 18c75a57..07c76374 100644 --- a/src/Tests/Tests.csproj +++ b/src/Tests/Tests.csproj @@ -1,7 +1,7 @@ net48 - net8.0;$(TargetFrameworks) + net8.0;net9.0;$(TargetFrameworks) Exe $(NoWarn);xUnit1051 testing diff --git a/src/appveyor.yml b/src/appveyor.yml index 8f8dbf26..ac2b1c9b 100644 --- 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