Skip to content

Commit a99800c

Browse files
keegan-carusoKeegan Caruso
keegan-caruso
and
Keegan Caruso
authored
Remove inbox dependencies (#3332)
* Remove inbox deps and cleans up csprojs * Fix internal API checks --------- Co-authored-by: Keegan Caruso <[email protected]>
1 parent 5dfeb45 commit a99800c

File tree

15 files changed

+19
-39
lines changed

15 files changed

+19
-39
lines changed

‎src/Microsoft.Identity.Web.Certificate/Microsoft.Identity.Web.Certificate.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<PackageReference Include="Azure.Security.KeyVault.Certificates" Version="$(AzureSecurityKeyVaultCertificatesVersion)" />
2020
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingVersion)" />
2121
<PackageReference Include="Microsoft.Identity.Abstractions" Version="$(MicrosoftIdentityAbstractionsVersion)" />
22+
</ItemGroup>
23+
24+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
2225
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2326
</ItemGroup>
2427

‎src/Microsoft.Identity.Web.Certificateless/Microsoft.Identity.Web.Certificateless.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingVersion)" />
2323
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens " Version="$(MicrosoftIdentityModelVersion)" />
2424
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
25+
</ItemGroup>
26+
27+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
2528
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2629
</ItemGroup>
2730

‎src/Microsoft.Identity.Web.GraphServiceClientBeta/Microsoft.Identity.Web.GraphServiceClientBeta.csproj

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,8 @@
3232
<ItemGroup>
3333
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />
3434
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Unshipped.txt" />
35-
<AdditionalFiles Remove="PublicAPI/net6.0/InternalAPI.Shipped.txt" />
36-
<None Remove="PublicAPI\net7.0\InternalAPI.Shipped.txt" />
37-
<None Remove="PublicAPI\net7.0\InternalAPI.Unshipped.txt" />
38-
<None Remove="PublicAPI\net9.0\InternalAPI.Shipped.txt" />
39-
<None Remove="PublicAPI\net9.0\InternalAPI.Unshipped.txt" />
40-
<None Remove="PublicAPI\net8.0\InternalAPI.Shipped.txt" />
41-
<None Remove="PublicAPI\net8.0\InternalAPI.Unshipped.txt" />
42-
<None Remove="PublicAPI\netstandard2.0\InternalAPI.Shipped.txt" />
43-
<None Remove="PublicAPI\netstandard2.0\InternalAPI.Unshipped.txt" />
4435
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/InternalAPI.Shipped.txt" />
4536
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/InternalAPI.Unshipped.txt" />
46-
<AdditionalFiles Include="PublicAPI\net7.0\InternalAPI.Shipped.txt" />
47-
<AdditionalFiles Include="PublicAPI\net7.0\InternalAPI.Unshipped.txt" />
48-
<AdditionalFiles Include="PublicAPI\net9.0\InternalAPI.Shipped.txt" />
49-
<AdditionalFiles Include="PublicAPI\net9.0\InternalAPI.Unshipped.txt" />
50-
<AdditionalFiles Include="PublicAPI\net8.0\InternalAPI.Shipped.txt" />
51-
<AdditionalFiles Include="PublicAPI\net8.0\InternalAPI.Unshipped.txt" />
52-
<AdditionalFiles Include="PublicAPI\netstandard2.0\InternalAPI.Shipped.txt" />
53-
<AdditionalFiles Include="PublicAPI\netstandard2.0\InternalAPI.Unshipped.txt" />
5437
</ItemGroup>
5538

5639
</Project>

‎src/Microsoft.Identity.Web.GraphServiceClientBeta/PublicAPI/net8.0/InternalAPI.Shipped.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
static Microsoft.Identity.Web.GraphBetaServiceCollectionExtensions.AddGraphBetaServiceClient(Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> void
2+
static Microsoft.Identity.Web.GraphBetaServiceCollectionExtensions.AddGraphBetaServiceClientWithLifetime(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime) -> void

‎src/Microsoft.Identity.Web.GraphServiceClientBeta/PublicAPI/net9.0/InternalAPI.Shipped.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
static Microsoft.Identity.Web.GraphBetaServiceCollectionExtensions.AddGraphBetaServiceClient(Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> void
2+
static Microsoft.Identity.Web.GraphBetaServiceCollectionExtensions.AddGraphBetaServiceClientWithLifetime(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime) -> void

‎src/Microsoft.Identity.Web.GraphServiceClientBeta/PublicAPI/netstandard2.0/InternalAPI.Shipped.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
static Microsoft.Identity.Web.GraphBetaServiceCollectionExtensions.AddGraphBetaServiceClient(Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> void
2+
static Microsoft.Identity.Web.GraphBetaServiceCollectionExtensions.AddGraphBetaServiceClientWithLifetime(Microsoft.Extensions.DependencyInjection.IServiceCollection services, Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime) -> void

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<ItemGroup>
2626
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.24" />
2727
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.24" />
28+
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
2829
<PackageReference Include="Microsoft.Graph" Version="$(MicrosoftGraphVersion)" />
2930
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="$(MicrosoftIdentityModelVersion)" />
3031
<PackageReference Include="Microsoft.IdentityModel.Validators" Version="$(MicrosoftIdentityModelVersion)" />
@@ -39,10 +40,6 @@
3940
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
4041
</ItemGroup>
4142

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

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
43
<Title>Microsoft Identity Web Token Acquisition</Title>
54
<Product>Microsoft Identity Web Acquisition</Product>
65
<Description>Implementation for higher level API for confidential client applications (ASP.NET Core and SDK/.NET).</Description>
@@ -19,8 +18,10 @@
1918
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftExtensionsConfigurationBinderVersion)" />
2019
</ItemGroup>
2120

22-
<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'netstandard2.0'">
21+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFramework)' == 'netstandard2.0'">
2322
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationBinderVersion)" />
23+
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
2425
</ItemGroup>
2526

2627
<ItemGroup>
@@ -30,26 +31,21 @@
3031
</None>
3132
</ItemGroup>
3233

33-
<ItemGroup>
34+
<ItemGroup>
3435
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
3536
<PackageReference Include="Microsoft.IdentityModel.Logging" Version="$(MicrosoftIdentityModelVersion)" />
3637
<PackageReference Include="Microsoft.IdentityModel.LoggingExtensions" Version="$(MicrosoftIdentityModelVersion)" />
3738
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="$(MicrosoftIdentityModelVersion)" />
3839
<PackageReference Include="Microsoft.Identity.Abstractions" Version="$(MicrosoftIdentityAbstractionsVersion)" />
3940
</ItemGroup>
4041

41-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
42-
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
43-
</ItemGroup>
44-
4542
<ItemGroup>
4643
<ProjectReference Include="..\Microsoft.Identity.Web.Certificateless\Microsoft.Identity.Web.Certificateless.csproj" />
4744
<ProjectReference Include="..\Microsoft.Identity.Web.Certificate\Microsoft.Identity.Web.Certificate.csproj" />
4845
<ProjectReference Include="..\Microsoft.Identity.Web.TokenCache\Microsoft.Identity.Web.TokenCache.csproj" />
4946
</ItemGroup>
5047

5148
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFramework)' == 'netstandard2.0'">
52-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
5349
<Compile Remove="AspNetCore\*.cs" />
5450
</ItemGroup>
5551

‎src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
2020
</ItemGroup>
2121

22-
<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
22+
<ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
2323
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
2424
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
2525
<PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="$(MicrosoftAspNetCoreDataProtectionVersion)" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
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="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2928
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
3029
</ItemGroup>
3130

3231
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
3332
<PackageReference Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
33+
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
3434
</ItemGroup>
3535

3636
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' Or '$(TargetFramework)' == 'netstandard2.0'">

0 commit comments

Comments
 (0)