Skip to content

Update DI package references for netstandard and net4x targets #4874

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

Open
b-higginbotham wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −11
Open

Update DI package references for netstandard and net4x targets #4874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Source/Csla.Web/Csla.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
</ItemGroup>

Expand All @@ -34,4 +34,4 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
</Project>
</Project>
8 changes: 4 additions & 4 deletions Source/Csla/Csla.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
<ItemGroup Condition="$(TargetFramework.StartsWith(&quot;net4&quot;))">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
Expand Down Expand Up @@ -107,8 +107,8 @@
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
Expand Down
6 changes: 1 addition & 5 deletions Source/Csla/Reflection/ServiceProviderMethodCaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ private static ParameterInfo[] GetDIParameters(System.Reflection.MethodInfo meth
var serviceKey = method.ServiceKeys[index];
if (serviceKey != null)
{
#if NET8_0_OR_GREATER
// Use keyed service injection for .NET 8+
if (method.AllowNull[index])
{
Expand All @@ -581,9 +580,6 @@ private static ParameterInfo[] GetDIParameters(System.Reflection.MethodInfo meth
// For required keyed services, use extension method
plist[index] = service.GetRequiredKeyedService(item.ParameterType, serviceKey);
}
#else
throw new NotSupportedException("Keyed service injection is only supported on .NET 8.0 or higher.");
#endif
}
else
{
Expand Down Expand Up @@ -651,4 +647,4 @@ private class ScoredMethodInfo
#endif
}
}
}
}
Loading