Skip to content

Commit 77cc46a

Browse files
kevinchaletkevinchalet
committed
Bump the .NET SDK/dependencies and remove the .NET 8.0 Android/iOS/Mac Catalyst/macOS target framework monikers
1 parent 672ab0e commit 77cc46a

File tree

8 files changed

+107
-80
lines changed

8 files changed

+107
-80
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
os: [ macos-15, ubuntu-24.04, windows-2022 ]
37+
os: [ macos-26, ubuntu-24.04, windows-2022 ]
3838
include:
39-
- os: macos-15
39+
- os: macos-26
4040
os_name: macos
4141
- os: ubuntu-24.04
4242
os_name: linux

‎Directory.Build.props‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1010
<NoWarn>$(NoWarn);CS1591;NU5128</NoWarn>
1111
<WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
12-
<NuGetAuditMode>direct</NuGetAuditMode>
12+
<NuGetAuditMode>all</NuGetAuditMode>
1313
<Nullable>enable</Nullable>
1414
<ImplicitUsings>enable</ImplicitUsings>
1515
<DebugSymbols>true</DebugSymbols>
@@ -110,25 +110,21 @@
110110

111111
<NetCoreAndroidTargetFrameworks
112112
Condition=" '$(NetCoreAndroidTargetFrameworks)' == '' And '$(SupportsAndroidTargeting)' == 'true' ">
113-
net8.0-android34.0;
114113
net9.0-android35.0
115114
</NetCoreAndroidTargetFrameworks>
116115

117116
<NetCoreIOSTargetFrameworks
118117
Condition=" '$(NetCoreIOSTargetFrameworks)' == '' And '$(SupportsIOSTargeting)' == 'true' ">
119-
net8.0-ios18.0;
120118
net9.0-ios18.0
121119
</NetCoreIOSTargetFrameworks>
122120

123121
<NetCoreMacCatalystTargetFrameworks
124122
Condition=" '$(NetCoreMacCatalystTargetFrameworks)' == '' And '$(SupportsMacCatalystTargeting)' == 'true' ">
125-
net8.0-maccatalyst18.0;
126123
net9.0-maccatalyst18.0
127124
</NetCoreMacCatalystTargetFrameworks>
128125

129126
<NetCoreMacOSTargetFrameworks
130127
Condition=" '$(NetCoreMacOSTargetFrameworks)' == '' And '$(SupportsMacOSTargeting)' == 'true' ">
131-
net8.0-macos15.0;
132128
net9.0-macos15.0
133129
</NetCoreMacOSTargetFrameworks>
134130

‎Directory.Packages.props‎

Lines changed: 51 additions & 50 deletions
Large diffs are not rendered by default.

‎WorkloadRollback.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"microsoft.net.sdk.android": "35.0.78/9.0.100",
3-
"microsoft.net.sdk.ios": "18.5.9214/9.0.100",
4-
"microsoft.net.sdk.maccatalyst": "18.5.9214/9.0.100",
5-
"microsoft.net.sdk.macos": "15.5.9214/9.0.100",
6-
"microsoft.net.sdk.maui": "9.0.82/9.0.100",
7-
"microsoft.net.sdk.tvos": "18.5.9214/9.0.100",
8-
"microsoft.net.workload.mono.toolchain.current": "9.0.9/9.0.100",
9-
"microsoft.net.workload.emscripten.current": "9.0.9/9.0.100",
10-
"microsoft.net.workload.emscripten.net6": "9.0.9/9.0.100",
11-
"microsoft.net.workload.emscripten.net7": "9.0.9/9.0.100",
12-
"microsoft.net.workload.emscripten.net8": "9.0.9/9.0.100",
13-
"microsoft.net.workload.mono.toolchain.net6": "9.0.9/9.0.100",
14-
"microsoft.net.workload.mono.toolchain.net7": "9.0.9/9.0.100",
15-
"microsoft.net.workload.mono.toolchain.net8": "9.0.9/9.0.100",
3+
"microsoft.net.sdk.ios": "26.0.9752/9.0.100",
4+
"microsoft.net.sdk.maccatalyst": "26.0.9752/9.0.100",
5+
"microsoft.net.sdk.macos": "26.0.9752/9.0.100",
6+
"microsoft.net.sdk.maui": "9.0.111/9.0.100",
7+
"microsoft.net.sdk.tvos": "26.0.9752/9.0.100",
8+
"microsoft.net.workload.mono.toolchain.current": "9.0.10/9.0.100",
9+
"microsoft.net.workload.emscripten.current": "9.0.10/9.0.100",
10+
"microsoft.net.workload.emscripten.net6": "9.0.10/9.0.100",
11+
"microsoft.net.workload.emscripten.net7": "9.0.10/9.0.100",
12+
"microsoft.net.workload.emscripten.net8": "9.0.10/9.0.100",
13+
"microsoft.net.workload.mono.toolchain.net6": "9.0.10/9.0.100",
14+
"microsoft.net.workload.mono.toolchain.net7": "9.0.10/9.0.100",
15+
"microsoft.net.workload.mono.toolchain.net8": "9.0.10/9.0.100",
1616
"microsoft.net.sdk.aspire": "8.2.2/8.0.100"
1717
}

‎gen/OpenIddict.Client.WebIntegration.Generators/OpenIddictClientWebIntegrationGenerator.cs‎

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.CodeAnalysis;
55
using Microsoft.CodeAnalysis.Text;
66
using Scriban;
7+
using Scriban.Runtime;
78

89
namespace OpenIddict.Client.WebIntegration.Generators;
910

@@ -802,7 +803,7 @@ public sealed partial class {{ provider.name }}
802803
{{~ end ~}}
803804
}
804805
");
805-
return template.Render(new
806+
var context = CreateTemplateContext(new
806807
{
807808
Providers = document.Root.Elements("Provider")
808809
.Select(static provider => new
@@ -860,6 +861,8 @@ public sealed partial class {{ provider.name }}
860861
})
861862
.ToList()
862863
});
864+
865+
return template.Render(context);
863866
}
864867

865868
static string GenerateConstants(XDocument document)
@@ -913,7 +916,7 @@ public static class ProviderTypes
913916
}
914917
}
915918
");
916-
return template.Render(new
919+
var context = CreateTemplateContext(new
917920
{
918921
Providers = document.Root.Elements("Provider")
919922
.Select(static provider => new
@@ -946,6 +949,8 @@ public static class ProviderTypes
946949
})
947950
.ToList()
948951
});
952+
953+
return template.Render(context);
949954
}
950955

951956
static string GenerateConfigurationClasses(XDocument document)
@@ -1305,7 +1310,7 @@ public static partial void ConfigureProvider(OpenIddictClientRegistration regist
13051310
}
13061311
}
13071312
");
1308-
return template.Render(new
1313+
var context = CreateTemplateContext(new
13091314
{
13101315
Providers = document.Root.Elements("Provider")
13111316
.Select(static provider => new
@@ -1443,6 +1448,8 @@ public static partial void ConfigureProvider(OpenIddictClientRegistration regist
14431448
})
14441449
.ToList()
14451450
});
1451+
1452+
return template.Render(context);
14461453
}
14471454

14481455
static string GenerateHelpers(XDocument document)
@@ -1472,7 +1479,7 @@ public static partial class OpenIddictClientWebIntegrationHelpers
14721479
{{~ end ~}}
14731480
}
14741481
");
1475-
return template.Render(new
1482+
var context = CreateTemplateContext(new
14761483
{
14771484
Providers = document.Root.Elements("Provider")
14781485
.Select(static provider => new
@@ -1482,6 +1489,8 @@ public static partial class OpenIddictClientWebIntegrationHelpers
14821489
})
14831490
.ToList()
14841491
});
1492+
1493+
return template.Render(context);
14851494
}
14861495

14871496
static string GenerateSettings(XDocument document)
@@ -1524,7 +1533,7 @@ public sealed class {{ provider.name }}
15241533
{{~ end ~}}
15251534
}
15261535
");
1527-
return template.Render(new
1536+
var context = CreateTemplateContext(new
15281537
{
15291538
Providers = document.Root.Elements("Provider")
15301539
.Select(static provider => new
@@ -1572,6 +1581,20 @@ public sealed class {{ provider.name }}
15721581
})
15731582
.ToList()
15741583
});
1584+
1585+
return template.Render(context);
1586+
}
1587+
1588+
static TemplateContext CreateTemplateContext(object model)
1589+
{
1590+
var context = new TemplateContext
1591+
{
1592+
LoopLimit = 100_000
1593+
};
1594+
1595+
context.PushGlobal(ScriptObject.From(model));
1596+
1597+
return context;
15751598
}
15761599
}
15771600
}

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "9.0.305",
3+
"version": "9.0.306",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77

88
"tools": {
9-
"dotnet": "9.0.305",
9+
"dotnet": "9.0.306",
1010

1111
"runtimes": {
1212
"aspnetcore": [
13-
"8.0.20"
13+
"8.0.21"
1414
]
1515
}
1616
},

‎sandbox/OpenIddict.Sandbox.AspNetCore.Client/OpenIddict.Sandbox.AspNetCore.Client.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,15 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
19+
<!--
20+
Note: Microsoft.AspNetCore.Server.Kestrel.Core is explicitly referenced to
21+
override the vulnerable version referenced by other packages or metapackages.
22+
-->
23+
1924
<PackageReference Include="Microsoft.AspNetCore" />
2025
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" />
2126
<PackageReference Include="Microsoft.AspNetCore.Mvc" />
27+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
2228
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
2329
</ItemGroup>
2430

‎sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020

2121
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
2222
<!--
23-
Note: Microsoft.AspNetCore.Identity is explicitly referenced to override the vulnerable
24-
2.3.0 version referenced by the Microsoft.AspNetCore.Identity.EntityFrameworkCore package.
23+
Note: Microsoft.AspNetCore.Identity and Microsoft.AspNetCore.Server.Kestrel.Core are explicitly
24+
referenced to override vulnerable versions referenced by other packages or metapackages.
2525
-->
2626

2727
<PackageReference Include="Microsoft.AspNetCore" />
2828
<PackageReference Include="Microsoft.AspNetCore.Identity" />
2929
<PackageReference Include="Microsoft.AspNetCore.Mvc" />
30+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
3031
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
3132
</ItemGroup>
3233

0 commit comments

Comments
 (0)