Skip to content

Commit a1af887

Browse files
phenningphenning
authored
Merge pull request #3156 from dotnet/dev/phenning/updateJsonPackageVersion
Update System.Text.Json Package version
2 parents 6868db6 + cbfc951 commit a1af887

File tree

3 files changed

+68
-60
lines changed

3 files changed

+68
-60
lines changed

‎Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
<PackageVersion Include="Spectre.Console.Cli" Version="$(SpectreConsoleVersion)" />
4949
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
5050
<PackageVersion Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
51-
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataVersion)"/>
51+
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataVersion)" />
52+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
5253
<PackageVersion Include="xunit.skippablefact" Version="$(XunitSkippableFactPackageVersion)" />
5354
</ItemGroup>
5455

‎eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
</PropertyGroup>
119119
<PropertyGroup>
120120
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
121+
<SystemTextJsonVersion>9.0.4</SystemTextJsonVersion>
121122
</PropertyGroup>
122123
<!-- Package versions for MSIdentity projects-->
123124
<PropertyGroup>

‎src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Microsoft.DotNet.MSIdentity.csproj

Lines changed: 65 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,65 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
5-
<RootNamespace>Microsoft.DotNet.MSIdentity</RootNamespace>
6-
<OutputType>Library</OutputType>
7-
<SignAssembly>true</SignAssembly>
8-
</PropertyGroup>
9-
10-
<!-- package settings -->
11-
<PropertyGroup>
12-
<IsPackable>true</IsPackable>
13-
<IncludeSymbols>true</IncludeSymbols>
14-
<DebugType>pdbonly</DebugType>
15-
<DebugSymbol>true</DebugSymbol>
16-
</PropertyGroup>
17-
18-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
19-
<WarningLevel>1</WarningLevel>
20-
<DelaySign>false</DelaySign>
21-
</PropertyGroup>
22-
23-
<Import Project="$(RepoRoot)eng\Versions.MSIdentity.props" />
24-
25-
<ItemGroup>
26-
<PackageReference Include="Azure.Identity" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
30-
<PackageReference Include="Microsoft.Graph" />
31-
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" />
32-
<PackageReference Include="Newtonsoft.Json" />
33-
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
34-
</ItemGroup>
35-
36-
<ItemGroup>
37-
<ProjectReference Include="$(RepoRoot)src\Shared\Microsoft.DotNet.Scaffolding.Shared\Microsoft.DotNet.Scaffolding.Shared.csproj" />
38-
</ItemGroup>
39-
40-
<ItemGroup>
41-
<Folder Include="Resources\" />
42-
</ItemGroup>
43-
44-
<ItemGroup>
45-
<Compile Update="Properties\Resources.Designer.cs">
46-
<DesignTime>True</DesignTime>
47-
<AutoGen>True</AutoGen>
48-
<DependentUpon>Resources.resx</DependentUpon>
49-
</Compile>
50-
</ItemGroup>
51-
52-
<ItemGroup>
53-
<EmbeddedResource Update="Properties\Resources.resx">
54-
<Generator>ResXFileCodeGenerator</Generator>
55-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
56-
</EmbeddedResource>
57-
</ItemGroup>
58-
59-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<RootNamespace>Microsoft.DotNet.MSIdentity</RootNamespace>
6+
<OutputType>Library</OutputType>
7+
<SignAssembly>true</SignAssembly>
8+
</PropertyGroup>
9+
10+
<!-- package settings -->
11+
<PropertyGroup>
12+
<IsPackable>true</IsPackable>
13+
<IncludeSymbols>true</IncludeSymbols>
14+
<DebugType>pdbonly</DebugType>
15+
<DebugSymbol>true</DebugSymbol>
16+
</PropertyGroup>
17+
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
19+
<WarningLevel>1</WarningLevel>
20+
<DelaySign>false</DelaySign>
21+
</PropertyGroup>
22+
23+
<Import Project="$(RepoRoot)eng\Versions.MSIdentity.props" />
24+
25+
<!-- Pin this to 8.0.5, since that is what is used by Microsoft.Graph and Microsoft.Identity.Client.Extensions.Msal -->
26+
<ItemGroup>
27+
<PackageVersion Update="System.Text.Json" Version="8.0.5" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<PackageReference Include="Azure.Identity" />
32+
<PackageReference Include="Microsoft.Extensions.Configuration" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" />
35+
<PackageReference Include="Microsoft.Graph" />
36+
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" />
37+
<PackageReference Include="Newtonsoft.Json" />
38+
<PackageReference Include="System.Security.Cryptography.ProtectedData" />
39+
<PackageReference Include="System.Text.Json" />
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<ProjectReference Include="$(RepoRoot)src\Shared\Microsoft.DotNet.Scaffolding.Shared\Microsoft.DotNet.Scaffolding.Shared.csproj" />
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<Folder Include="Resources\" />
48+
</ItemGroup>
49+
50+
<ItemGroup>
51+
<Compile Update="Properties\Resources.Designer.cs">
52+
<DesignTime>True</DesignTime>
53+
<AutoGen>True</AutoGen>
54+
<DependentUpon>Resources.resx</DependentUpon>
55+
</Compile>
56+
</ItemGroup>
57+
58+
<ItemGroup>
59+
<EmbeddedResource Update="Properties\Resources.resx">
60+
<Generator>ResXFileCodeGenerator</Generator>
61+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
62+
</EmbeddedResource>
63+
</ItemGroup>
64+
65+
</Project>

0 commit comments

Comments
 (0)