From a97d0ad0f5a986a558f5d100b14722eb89bf3edb Mon Sep 17 00:00:00 2001 From: Alberto Spelta Date: Wed, 10 Jun 2026 18:34:58 +0200 Subject: [PATCH 1/2] Ignore test dependencies in dependabot updates Added an ignore section in dependabot.yml to exclude Microsoft.NET.Test.Sdk, xunit, xunit.runner.visualstudio, and coverlet.collector from automatic update checks. This helps prevent unnecessary pull requests for these test-related dependencies. --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e402d0d..8825657 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,6 +7,11 @@ updates: open-pull-requests-limit: 10 assignees: - "albertospelta" + ignore: + - dependency-name: "Microsoft.NET.Test.Sdk" + - dependency-name: "xunit" + - dependency-name: "xunit.runner.visualstudio" + - dependency-name: "coverlet.collector" - package-ecosystem: "github-actions" directory: "/" From 59710ddbf58301ec45048885fcf11735e3c68886 Mon Sep 17 00:00:00 2001 From: Alberto Spelta Date: Wed, 10 Jun 2026 18:52:54 +0200 Subject: [PATCH 2/2] Replace .NET 6 target framework with .NET 10, update SDK - Update CI and `global.json` to use .NET SDK 10.0.300 - Target .NET 10.0 in project files; remove .NET 6.0 - Bump `System.Text.Json` for netstandard2.0 to 10.0.9 --- .github/workflows/ci.yml | 2 -- global.json | 2 +- src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj | 2 +- src/Dax.Formatter/Dax.Formatter.csproj | 11 +++++------ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bba9830..7d35222 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,6 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - dotnet-version: | - 6.0.x global-json-file: global.json - name: restore run: dotnet restore ./src diff --git a/global.json b/global.json index 4ccdb21..d52502e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", + "version": "10.0.300", "allowPrerelease": false, "rollForward": "latestFeature" } diff --git a/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj b/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj index 2fcf183..85273ba 100644 --- a/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj +++ b/src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj @@ -1,7 +1,7 @@  - net472;net6.0;net8.0 + net472;net8.0;net10.0 latest enable false diff --git a/src/Dax.Formatter/Dax.Formatter.csproj b/src/Dax.Formatter/Dax.Formatter.csproj index 8a7d5b2..dc3ef9a 100644 --- a/src/Dax.Formatter/Dax.Formatter.csproj +++ b/src/Dax.Formatter/Dax.Formatter.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net6.0;net8.0 + netstandard2.0;net8.0;net10.0 latest enable en-US @@ -45,8 +45,7 @@ - - + $(AdditionalConstants) @@ -55,11 +54,11 @@ Dax.Formatter .NET Standard 2.0 - - Dax.Formatter .NET 6.0 - Dax.Formatter .NET 8.0 + + Dax.Formatter .NET 10.0 + \ No newline at end of file