Skip to content

Commit 39ad280

Browse files
Remove .NET 6 target framework, add .NET 10 (#24)
* 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. * 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
1 parent f47b7e0 commit 39ad280

5 files changed

Lines changed: 12 additions & 10 deletions

File tree

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ updates:
77
open-pull-requests-limit: 10
88
assignees:
99
- "albertospelta"
10+
ignore:
11+
- dependency-name: "Microsoft.NET.Test.Sdk"
12+
- dependency-name: "xunit"
13+
- dependency-name: "xunit.runner.visualstudio"
14+
- dependency-name: "coverlet.collector"
1015

1116
- package-ecosystem: "github-actions"
1217
directory: "/"

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: |
24-
6.0.x
2523
global-json-file: global.json
2624
- name: restore
2725
run: dotnet restore ./src

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.400",
3+
"version": "10.0.300",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

src/Dax.Formatter.Tests/Dax.Formatter.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net472;net8.0;net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>

src/Dax.Formatter/Dax.Formatter.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77
<NeutralLanguage>en-US</NeutralLanguage>
@@ -45,8 +45,7 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
49-
</ItemGroup>
48+
<PackageReference Include="System.Text.Json" Version="10.0.9" Condition="'$(TargetFramework)' == 'netstandard2.0'" /> </ItemGroup>
5049

5150
<PropertyGroup>
5251
<DefineConstants>$(AdditionalConstants)</DefineConstants>
@@ -55,11 +54,11 @@
5554
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
5655
<AssemblyTitle>Dax.Formatter .NET Standard 2.0</AssemblyTitle>
5756
</PropertyGroup>
58-
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
59-
<AssemblyTitle>Dax.Formatter .NET 6.0</AssemblyTitle>
60-
</PropertyGroup>
6157
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
6258
<AssemblyTitle>Dax.Formatter .NET 8.0</AssemblyTitle>
6359
</PropertyGroup>
60+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
61+
<AssemblyTitle>Dax.Formatter .NET 10.0</AssemblyTitle>
62+
</PropertyGroup>
6463

6564
</Project>

0 commit comments

Comments
 (0)