From 0033174972262ec0f80559585c2974e318138b51 Mon Sep 17 00:00:00 2001 From: Mathieu MACK Date: Tue, 9 Dec 2025 22:17:13 +0100 Subject: [PATCH 1/2] Upgrade to .NET 10.0 and modernize project dependencies Updated CI to support .NET 10.0 and upgraded target frameworks in project files to `net10.0`. Simplified build configurations by removing redundant settings in `Directory.builds.prop`. Refactored tests to improve readability and align with modern practices. Upgraded NuGet dependencies to their latest versions to ensure compatibility and leverage new features. Added a markdown template for managing dependency upgrade requests, streamlining the process for future updates. --- .github/ISSUE_TEMPLATE/upgrade_depedency.md | 16 +++++++++++ .github/workflows/ci.yml | 1 + src/Directory.builds.prop | 27 ------------------- src/JSLTSharp.Tests/BaseTestsClass.cs | 1 + .../ToBooleanTransformTests.cs | 6 +++-- src/JSLTSharp.Tests/JSLTSharp.Tests.csproj | 17 ++++++------ src/JSLTSharp/JSLTSharp.csproj | 17 +++--------- 7 files changed, 34 insertions(+), 51 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/upgrade_depedency.md delete mode 100644 src/Directory.builds.prop diff --git a/.github/ISSUE_TEMPLATE/upgrade_depedency.md b/.github/ISSUE_TEMPLATE/upgrade_depedency.md new file mode 100644 index 0000000..4399baa --- /dev/null +++ b/.github/ISSUE_TEMPLATE/upgrade_depedency.md @@ -0,0 +1,16 @@ +--- +name: Upgrade dependency +about: Create a request to upgrade a dependency +title: '' +labels: +assignees: '' + +--- + +Describe the dependency you want to upgrade here. + +Put the current version and the desired version of the dependency. You can also include any relevant context or reasons for the upgrade. + +Current version : '' + +Desired version : '' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e07780..bfb3f66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,6 +20,7 @@ jobs: publishToNuget: ${{ github.event.inputs.publishToNuget == true }} dotnet-version: | 9.0.x + 10.0.x secrets: NUGETPACKAGEIDENTIFIER: ${{ secrets.NUGETPACKAGEIDENTIFIER }} NUGETAPIKEY: ${{ secrets.NUGETAPIKEY }} diff --git a/src/Directory.builds.prop b/src/Directory.builds.prop deleted file mode 100644 index 6620b78..0000000 --- a/src/Directory.builds.prop +++ /dev/null @@ -1,27 +0,0 @@ - - - $(AssemblyName) ($(TargetFramework)) - en - - latest - $(NoWarn);1591;1701;1702;1705;VSX1000;NU1603 - true - true - - AnyCPU - portable - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - true - - $(MSBuildProjectName.Contains('UnitTest')) - $(MSBuildProjectName.Contains('MvvX.Plugins.ServiceMaxMobile')) - - - $(MSBuildProgramFiles32)\dotnet\dotnet - $(ProgramW6432)\dotnet\dotnet - - \ No newline at end of file diff --git a/src/JSLTSharp.Tests/BaseTestsClass.cs b/src/JSLTSharp.Tests/BaseTestsClass.cs index 7e59b99..f479743 100644 --- a/src/JSLTSharp.Tests/BaseTestsClass.cs +++ b/src/JSLTSharp.Tests/BaseTestsClass.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Newtonsoft.Json.Linq; +using System; using System.Diagnostics.CodeAnalysis; namespace JSLTSharp.Tests diff --git a/src/JSLTSharp.Tests/EmbededFunctions/ValueTransformations/ToBooleanTransformTests.cs b/src/JSLTSharp.Tests/EmbededFunctions/ValueTransformations/ToBooleanTransformTests.cs index 6db2298..115b524 100644 --- a/src/JSLTSharp.Tests/EmbededFunctions/ValueTransformations/ToBooleanTransformTests.cs +++ b/src/JSLTSharp.Tests/EmbededFunctions/ValueTransformations/ToBooleanTransformTests.cs @@ -34,10 +34,11 @@ public void TestString_False() } [TestMethod] - [ExpectedException(typeof(JsonReaderException))] public void TestString_WithUpperCase() { - TestJsonTransformation(@"{ + Assert.Throws(() => + { + TestJsonTransformation(@"{ 'bool': False }", @"{ @@ -46,6 +47,7 @@ public void TestString_WithUpperCase() @"{ 'bool': false }"); + }); } [TestMethod] diff --git a/src/JSLTSharp.Tests/JSLTSharp.Tests.csproj b/src/JSLTSharp.Tests/JSLTSharp.Tests.csproj index ae0577e..dc919b4 100644 --- a/src/JSLTSharp.Tests/JSLTSharp.Tests.csproj +++ b/src/JSLTSharp.Tests/JSLTSharp.Tests.csproj @@ -1,22 +1,21 @@  - net9.0 + net10.0 true enable - false - - - - - + + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/JSLTSharp/JSLTSharp.csproj b/src/JSLTSharp/JSLTSharp.csproj index 7a64ee6..bb5c4a4 100644 --- a/src/JSLTSharp/JSLTSharp.csproj +++ b/src/JSLTSharp/JSLTSharp.csproj @@ -2,7 +2,7 @@ {7E99DD47-E2FE-4ABE-8481-3B3FE758C7D4} - net8.0;net9.0 + net9.0;net10.0 true README.md preview @@ -21,18 +21,9 @@ - - - - - - - - - - - - + + + From 41575e97144d16fefbbd00a09b278e20a8506440 Mon Sep 17 00:00:00 2001 From: Mathieu MACK Date: Tue, 9 Dec 2025 22:19:52 +0100 Subject: [PATCH 2/2] Rename incorrect file name --- .../{upgrade_depedency.md => upgrade_dependency.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{upgrade_depedency.md => upgrade_dependency.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/upgrade_depedency.md b/.github/ISSUE_TEMPLATE/upgrade_dependency.md similarity index 100% rename from .github/ISSUE_TEMPLATE/upgrade_depedency.md rename to .github/ISSUE_TEMPLATE/upgrade_dependency.md