Skip to content

[dev7x] Update STJ to 8.0.5 for some TFM, fix project files, add suppressions #3499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmaytak merged 7 commits into from
Jun 2, 2026
Merged

[dev7x] Update STJ to 8.0.5 for some TFM, fix project files, add suppressions #3499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bcc90cb
[dev7x] Update version.props with Microsoft Identity Model properties
pmaytak May 20, 2026
a924f4e
Add NuGet source and global.json for CI pipeline compatibility
iNinja May 22, 2026
6b13888
Update common props.
pmaytak May 27, 2026
cf41636
Merge main.
pmaytak May 28, 2026
711ca62
Update System.Text.Json to 8.0.5 and add suppressions.
pmaytak May 28, 2026
b8b2533
Update feed.
pmaytak Jun 1, 2026
884679f
Apply suggestion from @pmaytak
pmaytak Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<packageSources>
<clear />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
Comment thread
pmaytak marked this conversation as resolved.
</packageSources>
</configuration>
5 changes: 3 additions & 2 deletions Wilson.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.33711.374
# Visual Studio Version 18
VisualStudioVersion = 18.6.11819.183 stable
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmark", "benchmark", "{2F79F3C4-F4E3-46DD-8B34-8EF403A6F7F5}"
EndProject
Expand Down Expand Up @@ -85,6 +85,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4655DBB4-70C6-475D-8971-FE6619B85F70}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
NuGet.Config = NuGet.Config
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IdentityModel.Validators", "src\Microsoft.IdentityModel.Validators\Microsoft.IdentityModel.Validators.csproj", "{DA585910-0E6C-45A5-AABD-30917130FD63}"
Expand Down
6 changes: 6 additions & 0 deletions benchmark/Microsoft.IdentityModel.Benchmarks/Microsoft.IdentityModel.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
<Optimize>true</Optimize>
</PropertyGroup>

<!-- Suppress NETSDK1138, NETSDK1202 ("target framework is out of support") -->
<PropertyGroup>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.JsonWebTokens\Microsoft.IdentityModel.JsonWebTokens.csproj" />
<ProjectReference Include="..\..\src\Microsoft.IdentityModel.Tokens\Microsoft.IdentityModel.Tokens.csproj" />
Expand Down
23 changes: 8 additions & 15 deletions build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<Import Project="dependencies.props" />
<Import Project="targets.props" />
<Import Project="version.props" />

<PropertyGroup>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -30,31 +31,23 @@
<LangVersion>12</LangVersion>
</PropertyGroup>

<!-- Wilson version -->
<PropertyGroup>
<WilsonCurrentVersion>7.6.1</WilsonCurrentVersion>

<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss"))</PreviewVersionSuffix>
<!--VS re-evaluates the variables, so having seconds or minutes creates an infinite loop of package updates-->
<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' == 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH"))</PreviewVersionSuffix>
<IsCustomPreview>$(WilsonVersion.Contains("-"))</IsCustomPreview>
<Version Condition="'$(WilsonVersion)' != ''">$(WilsonVersion)</Version>
<VersionSuffix Condition="'$(WilsonVersion)' == ''">$(PreviewVersionSuffix)</VersionSuffix>
<VersionPrefix Condition="'$(WilsonVersion)' == ''">$(WilsonCurrentVersion)</VersionPrefix>
</PropertyGroup>

<PropertyGroup>
<EnablePackageValidation>true</EnablePackageValidation>
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
</PropertyGroup>

<!-- Suppress NETSDK1138, NETSDK1202 ("target framework is out of support") -->
<PropertyGroup>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
<NoWarn>$(NoWarn);SYSLIB0050;SYSLIB0051;NETSDK1138</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions build/commonTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,14 @@
<DefineConstants>$(DefineConstants);NET_CORE</DefineConstants>
</PropertyGroup>

<!-- Suppress NETSDK1138, NETSDK1202 ("target framework is out of support") -->
<PropertyGroup>
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
<NoWarn>$(NoWarn);SYSLIB0051</NoWarn>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>

<PropertyGroup>
<NoWarn>$(NoWarn);SYSLIB0050;SYSLIB0051;NETSDK1138</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' != 'net461'">
<SystemTextJson>8.0.4</SystemTextJson>
<SystemTextJson>8.0.5</SystemTextJson>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
Expand Down
2 changes: 1 addition & 1 deletion build/dependenciesTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' != 'net461'">
<SystemTextJson>8.0.4</SystemTextJson>
<SystemTextJson>8.0.5</SystemTextJson>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
Expand Down
28 changes: 13 additions & 15 deletions build/version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix. -->
<Project>
<PropertyGroup>
<VersionPrefix>0.0.1</VersionPrefix>
<VersionSuffix>preview</VersionSuffix>
</PropertyGroup>

<!--Enables to create preview NuGet packages.-->
<PropertyGroup Condition=" '$(VersionSuffix)' == '' ">
<Version>$(VersionPrefix)</Version>
</PropertyGroup>

<PropertyGroup Condition=" '$(VersionSuffix)' != '' ">
<Version>$(VersionPrefix)-$(VersionSuffix)</Version>
</PropertyGroup>

<PropertyGroup>
<MicrosoftIdentityModelCurrentVersion>7.0.0</MicrosoftIdentityModelCurrentVersion>

<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss"))</PreviewVersionSuffix>
<!--VS re-evaluates the variables, so having seconds or minutes creates an infinite loop of package updates-->
<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' == 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH"))</PreviewVersionSuffix>
<IsCustomPreview>$(MicrosoftIdentityModelVersion.Contains("-"))</IsCustomPreview>
<Version Condition="'$(MicrosoftIdentityModelVersion)' != ''">$(MicrosoftIdentityModelVersion)</Version>
<VersionSuffix Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(PreviewVersionSuffix)</VersionSuffix>
<VersionPrefix Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(MicrosoftIdentityModelCurrentVersion)</VersionPrefix>
<FileVersion Condition="'$(MicrosoftIdentityModelVersion)' != '' and '$(IsCustomPreview)' != 'true' ">$(MicrosoftIdentityModelVersion).$([System.DateTime]::Now.ToString("yy"))$([System.DateTime]::Now.DayOfYear.ToString("000"))</FileVersion>
<FileVersion Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(MicrosoftIdentityModelCurrentVersion).$([System.DateTime]::Now.ToString("yy"))$([System.DateTime]::Now.DayOfYear.ToString("000"))</FileVersion>
</PropertyGroup>
</Project>