Skip to content

Commit 2feaf36

Browse files
authored
Merge pull request #268 from devlead/feature/net10
feat: add .NET 10.0 support and update dependencies
2 parents ac6c812 + 1eeddb4 commit 2feaf36

File tree

5 files changed

+18
-8
lines changed

5 files changed

+18
-8
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,28 @@ jobs:
3131
with:
3232
dotnet-version: |
3333
8.0.x
34+
9.0.x
3435
3536
- name: Install .NET SDK
3637
uses: actions/setup-dotnet@v5
3738
with:
3839
global-json-file: global.json
3940

41+
- name: NuGet login (OIDC → temp API key)
42+
uses: NuGet/login@v1
43+
id: login
44+
if: matrix.os == 'windows-latest' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
45+
with:
46+
user: ${{secrets.NUGET_USER}}
47+
4048
- name: Run Cake script
4149
uses: cake-build/cake-action@v3
4250
env:
4351
NuGetReportSettings_SharedKey: ${{ secrets.NUGETREPORTSETTINGS_SHAREDKEY }}
4452
NuGetReportSettings_WorkspaceId: ${{ secrets.NUGETREPORTSETTINGS_WORKSPACEID }}
4553
GH_PACKAGES_NUGET_SOURCE: ${{ secrets.GH_PACKAGES_NUGET_SOURCE }}
4654
NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }}
47-
NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}
55+
NUGET_APIKEY: ${{steps.login.outputs.NUGET_API_KEY}}
4856
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4957
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
5058
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "9.0.308"
3+
"version": "10.0.100"
44
}
55
}

src/ARI.TestWeb/ARI.TestWeb.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="System.Drawing.Common" Version="9.0.11" />
1818
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
1919
<PackageReference Include="Azure.Identity" Version="1.17.1" />
20-
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.0" />
20+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.3" />
2121
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
2222
<PackageReference Include="System.Formats.Asn1" Version="9.0.11" />
2323
<PackageReference Include="System.DirectoryServices.Protocols" Version="9.0.11" />

src/ARI.Tests/ARI.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>net9.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>

src/ARI/ARI.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameWorks>net9.0;net8.0</TargetFrameWorks>
5+
<TargetFrameWorks>net10.0;net9.0;net8.0</TargetFrameWorks>
66
<Nullable>enable</Nullable>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
88
<ImplicitUsings>enable</ImplicitUsings>
@@ -40,11 +40,13 @@
4040
<ItemGroup>
4141
<PackageReference Include="Azure.Identity" Version="1.17.1" />
4242
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.11" />
44-
<PackageReference Include="System.Linq.Async" Version="7.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1 " Condition="'$(TargetFramework)' == 'net8.0'" />
44+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.11" Condition="'$(TargetFramework)' == 'net9.0'" />
45+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" Condition="'$(TargetFramework)' == 'net10.0'" />
46+
<PackageReference Include="System.Linq.Async" Version="7.0.0" Condition="'$(TargetFramework)' != 'net10.0'" />
4547
<PackageReference Include="Cake.Bridge.DependencyInjection" Version="2025.11.17.398" />
4648
<PackageReference Include="Cake.Common" Version="6.0.0" />
47-
<PackageReference Include="Devlead.Console" Version="2025.11.4.431" />
49+
<PackageReference Include="Devlead.Console" Version="2025.11.23.493" />
4850
</ItemGroup>
4951

5052
<ItemGroup>

0 commit comments

Comments
 (0)