Skip to content

Commit 1c57340

Browse files
ksaafKashif Mehmood
andauthored
Make Microsoft.Extensions.Http dependency framework friendly (#3296)
This PR pins Microsoft.Extensions.Http ver 3.1.3 to .Net Framework/Standard and uses inbox version of Microsoft.Extensions.Http for .Net Core. Change involves updating Directory.Build.props and updating CSProj to reference Microsoft.Extensions.Http package only for non .Net Core. --------- Co-authored-by: Kashif Mehmood <[email protected]>
1 parent 690cea4 commit 1c57340

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<AzureSecurityKeyVaultCertificatesVersion>4.6.0</AzureSecurityKeyVaultCertificatesVersion>
9696
<MicrosoftGraphVersion>4.36.0</MicrosoftGraphVersion>
9797
<MicrosoftGraphBetaVersion>4.57.0-preview</MicrosoftGraphBetaVersion>
98-
<MicrosoftExtensionsHttpVersion>3.1.3</MicrosoftExtensionsHttpVersion>
9998
<MicrosoftIdentityAbstractionsVersion>8.2.0</MicrosoftIdentityAbstractionsVersion>
10099
<!--CVE-2024-43485-->
101100
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
@@ -173,6 +172,7 @@
173172
<MicrosoftExtensionsCachingMemoryVersion>6.0.2</MicrosoftExtensionsCachingMemoryVersion>
174173
<!-- Microsoft.Extensions.* 5.* are obsoleted -->
175174
<MicrosoftExtensionsHostingVersion>6.0.0</MicrosoftExtensionsHostingVersion>
175+
<MicrosoftExtensionsHttpVersion>3.1.3</MicrosoftExtensionsHttpVersion>
176176
<MicrosoftAspNetCoreDataProtectionVersion>6.0.0</MicrosoftAspNetCoreDataProtectionVersion>
177177
<SystemSecurityCryptographyPkcsVersion>7.0.2</SystemSecurityCryptographyPkcsVersion>
178178
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
@@ -196,6 +196,7 @@
196196
<MicrosoftExtensionsLoggingVersion>4.7.1</MicrosoftExtensionsLoggingVersion>
197197
<MicrosoftExtensionsCachingMemoryVersion>2.1.0</MicrosoftExtensionsCachingMemoryVersion>
198198
<MicrosoftExtensionsHostingVersion>2.1.1</MicrosoftExtensionsHostingVersion>
199+
<MicrosoftExtensionsHttpVersion>3.1.3</MicrosoftExtensionsHttpVersion>
199200
<MicrosoftExtensionsLoggingVersion>2.1.0</MicrosoftExtensionsLoggingVersion>
200201
<MicrosoftExtensionsDependencyInjectionVersion>2.1.0</MicrosoftExtensionsDependencyInjectionVersion>
201202
<MicrosoftExtensionsConfigurationBinderVersion>2.2.4</MicrosoftExtensionsConfigurationBinderVersion>

src/Microsoft.Identity.Web.OWIN/Microsoft.Identity.Web.OWIN.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="$(MicrosoftIdentityModelVersion)" />
3030
<PackageReference Include="Microsoft.IdentityModel.Validators" Version="$(MicrosoftIdentityModelVersion)" />
3131
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(MicrosoftIdentityModelVersion)" />
32-
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
3332
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
3433
<PackageReference Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
3534
<PackageReference Include="Microsoft.AspNet.WebApi" Version="5.2.7" />
@@ -40,6 +39,10 @@
4039
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4140
</ItemGroup>
4241

42+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
43+
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
44+
</ItemGroup>
45+
4346
<ItemGroup>
4447
<ProjectReference Include="..\Microsoft.Identity.Web.TokenAcquisition\Microsoft.Identity.Web.TokenAcquisition.csproj" />
4548
</ItemGroup>

src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@
3535
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="$(MicrosoftIdentityModelVersion)" />
3636
<PackageReference Include="Microsoft.IdentityModel.LoggingExtensions" Version="$(MicrosoftIdentityModelVersion)" />
3737
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(MicrosoftIdentityModelVersion)" />
38-
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
3938
<PackageReference Include="Microsoft.Identity.Abstractions" Version="$(MicrosoftIdentityAbstractionsVersion)" />
4039
</ItemGroup>
4140

41+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
42+
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
43+
</ItemGroup>
44+
4245
<ItemGroup>
4346
<ProjectReference Include="..\Microsoft.Identity.Web.Certificateless\Microsoft.Identity.Web.Certificateless.csproj" />
4447
<ProjectReference Include="..\Microsoft.Identity.Web.Certificate\Microsoft.Identity.Web.Certificate.csproj" />

src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@
2525
<PackageReference Include="Microsoft.IdentityModel.Validators" Version="$(MicrosoftIdentityModelVersion)" />
2626
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelVersion)" />
2727
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(MicrosoftIdentityModelVersion)" />
28-
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
2928
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
3029
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
3130
</ItemGroup>
32-
31+
32+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
33+
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
34+
</ItemGroup>
35+
3336
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFramework)' == 'netstandard2.0'">
3437
<Compile Remove="*.cs" />
3538
<Compile Remove="AppServicesAuth\**" />

0 commit comments

Comments
 (0)