Skip to content

Commit b3446fa

Browse files
dotnetjunkiedotnetjunkie
committed
Updated package references. Fixes #37 
1 parent 5e2923a commit b3446fa

File tree

11 files changed

+89
-27
lines changed

11 files changed

+89
-27
lines changed

‎src/SimpleInjector.Integration.AspNetCore.Mvc.Core/SimpleInjector.Integration.AspNetCore.Mvc.Core.csproj‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Description>Integration library for ASP.NET Core MVC core features for Simple Injector. This includes controller integration.</Description>
44
<AssemblyTitle>Simple Injector ASP.NET Core MVC Core Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
6-
<VersionPrefix>5.4.0</VersionPrefix>
6+
<VersionPrefix>5.5.0</VersionPrefix>
77
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.3.0</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
10-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<AssemblyName>SimpleInjector.Integration.AspNetCore.Mvc.Core</AssemblyName>
@@ -27,10 +27,17 @@
2727
</PropertyGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
3130
<PackageReference Include="SimpleInjector" Version="5.4.0" />
3231
</ItemGroup>
3332

33+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
34+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
38+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
39+
</ItemGroup>
40+
3441
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
3542
<Reference Include="System" />
3643
<Reference Include="Microsoft.CSharp" />
@@ -43,7 +50,7 @@
4350
<ItemGroup>
4451
<ProjectReference Include="..\SimpleInjector.Integration.AspNetCore\SimpleInjector.Integration.AspNetCore.csproj" />
4552
</ItemGroup>
46-
53+
4754
<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
4855
<Exec Command="dotnet pack --no-build --configuration $(Configuration)" />
4956
</Target>

‎src/SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures/SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures.csproj‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Description>Integration library for ASP.NET Core MVC view features for Simple Injector. This includes view component integration.</Description>
44
<AssemblyTitle>Simple Injector ASP.NET Core MVC View Features Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
6-
<VersionPrefix>5.4.0</VersionPrefix>
6+
<VersionPrefix>5.5.0</VersionPrefix>
77
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.3.0</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
10-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<AssemblyName>SimpleInjector.Integration.AspNetCore.Mvc.ViewFeatures</AssemblyName>
@@ -28,9 +28,16 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31+
<PackageReference Include="SimpleInjector" Version="5.4.0" />
32+
</ItemGroup>
33+
34+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3135
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" />
3236
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.1" />
33-
<PackageReference Include="SimpleInjector" Version="5.4.0" />
37+
</ItemGroup>
38+
39+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
40+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
3441
</ItemGroup>
3542

3643
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

‎src/SimpleInjector.Integration.AspNetCore.Mvc/SimpleInjector.Integration.AspNetCore.Mvc.csproj‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Description>Integration library for ASP.NET Core MVC for Simple Injector. This package adds tag helper and Razor Pages integration on top of the core functionality.</Description>
44
<AssemblyTitle>Simple Injector ASP.NET Core MVC Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
6-
<VersionPrefix>5.4.0</VersionPrefix>
6+
<VersionPrefix>5.5.0</VersionPrefix>
77
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.3.0</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
10-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<AssemblyName>SimpleInjector.Integration.AspNetCore.Mvc</AssemblyName>
@@ -29,9 +29,16 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32+
<PackageReference Include="SimpleInjector" Version="5.4.0" />
33+
</ItemGroup>
34+
35+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3236
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.1" />
3337
<PackageReference Include="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.1.1" />
34-
<PackageReference Include="SimpleInjector" Version="5.4.0" />
38+
</ItemGroup>
39+
40+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
41+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
3542
</ItemGroup>
3643

3744
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

‎src/SimpleInjector.Integration.AspNetCore.Mvc/SimpleInjectorAspNetCoreBuilderMvcExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static SimpleInjectorAspNetCoreBuilder AddTagHelperActivation(
7070
// fail because of the dependencies these tag helpers have. This means that OOTB tag helpers need
7171
// to remain created by the framework's DefaultTagHelperActivator, hence the selector predicate.
7272
Predicate<Type> selector = applicationTypeSelector ??
73-
(type => !type.GetTypeInfo().Namespace.StartsWith("Microsoft")
73+
(type => type.GetTypeInfo().Namespace?.StartsWith("Microsoft") != true
7474
&& !type.GetTypeInfo().Name.Contains("__Generated__"));
7575

7676
var manager = GetApplicationPartManager(builder.Services, nameof(AddTagHelperActivation));
@@ -228,6 +228,6 @@ private static object GetInstance(this IServiceProvider provider, ServiceDescrip
228228
? descriptor.ImplementationInstance
229229
: descriptor.ImplementationType != null
230230
? ActivatorUtilities.GetServiceOrCreateInstance(provider, descriptor.ImplementationType)
231-
: descriptor.ImplementationFactory(provider);
231+
: descriptor.ImplementationFactory?.Invoke(provider)!;
232232
}
233233
}

‎src/SimpleInjector.Integration.AspNetCore/SimpleInjector.Integration.AspNetCore.csproj‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<Description>Integration library for ASP.NET Core for Simple Injector.</Description>
44
<AssemblyTitle>Simple Injector ASP.NET Core Integration</AssemblyTitle>
55
<NeutralLanguage>en-US</NeutralLanguage>
6-
<VersionPrefix>5.4.0</VersionPrefix>
6+
<VersionPrefix>5.5.0</VersionPrefix>
77
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.3.0</PackageReleaseNotes>
88
<AssemblyVersion>5.0.0.0</AssemblyVersion>
99
<Authors>Simple Injector Contributors</Authors>
10-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1313
<AssemblyName>SimpleInjector.Integration.AspNetCore</AssemblyName>
@@ -29,10 +29,17 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32+
<PackageReference Include="SimpleInjector" Version="5.4.0" />
33+
</ItemGroup>
34+
35+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3236
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.22" />
3337
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" />
3438
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" />
35-
<PackageReference Include="SimpleInjector" Version="5.4.0" />
39+
</ItemGroup>
40+
41+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
42+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
3643
</ItemGroup>
3744

3845
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

‎src/SimpleInjector.Integration.AspNetCore/SimpleInjectorAspNetIntegrationExtensions.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static T GetRequestService<T>(this IApplicationBuilder builder)
4242
{
4343
Requires.IsNotNull(builder, nameof(builder));
4444

45-
return GetRequestServiceProvider(builder.GetApplicationServices(), typeof(T)).GetService<T>();
45+
return GetRequestServiceProvider(builder.GetApplicationServices(), typeof(T)).GetService<T>()!;
4646
}
4747

4848
/// <summary>
@@ -58,8 +58,10 @@ public static T GetRequiredRequestService<T>(this IApplicationBuilder builder)
5858
{
5959
Requires.IsNotNull(builder, nameof(builder));
6060

61+
#pragma warning disable CS8714 // Nullability of type argument doesn't match 'notnull' constraint.
6162
return GetRequestServiceProvider(
6263
builder.GetApplicationServices(), typeof(T)).GetRequiredService<T>();
64+
#pragma warning restore CS8714
6365
}
6466

6567
// WARNING: Although most of the extension methods in this class can become obsolete, because of the

‎src/SimpleInjector.Integration.AspNetCore/SimpleInjectorHttpContextExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static class SimpleInjectorHttpContextExtensions
1818
/// </summary>
1919
/// <param name="httpContext">The <see cref="HttpContext"/> to retrieve the <see cref="Scope"/> from.</param>
2020
/// <returns>The scope or null.</returns>
21-
public static Scope? GetScope(this HttpContext httpContext) => (Scope)httpContext.Items[HttpContextKey];
21+
public static Scope? GetScope(this HttpContext httpContext) => (Scope?)httpContext.Items[HttpContextKey];
2222

2323
internal static HttpContext? GetHttpContext(this Scope scope) => scope.GetItem(HttpContextKey) as HttpContext;
2424

‎src/SimpleInjector.Integration.GenericHost/SimpleInjector.Integration.GenericHost.csproj‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</Description>
66
<AssemblyTitle>Simple Injector Generic Host Integration</AssemblyTitle>
77
<NeutralLanguage>en-US</NeutralLanguage>
8-
<VersionPrefix>5.4.0</VersionPrefix>
8+
<VersionPrefix>5.5.0</VersionPrefix>
99
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.3.0</PackageReleaseNotes>
1010
<AssemblyVersion>5.0.0.0</AssemblyVersion>
1111
<Authors>Simple Injector Contributors</Authors>
12-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
12+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
1313
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1414
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1515
<AssemblyName>SimpleInjector.Integration.GenericHost</AssemblyName>
@@ -32,11 +32,24 @@
3232
</PropertyGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
36-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
3735
<PackageReference Include="SimpleInjector" Version="5.4.0" />
3836
</ItemGroup>
3937

38+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
39+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
40+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
41+
</ItemGroup>
42+
43+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
44+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
46+
</ItemGroup>
47+
48+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
49+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
50+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
51+
</ItemGroup>
52+
4053
<ItemGroup>
4154
<None Include="..\Graphics\simpleinjector.png" Pack="true" PackagePath="" />
4255
</ItemGroup>

‎src/SimpleInjector.Integration.ServiceCollection/RootLogger.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ internal sealed class RootLogger : ILogger
1313
// This constructor needs to be public for Simple Injector to create this type.
1414
public RootLogger(ILoggerFactory factory) => this.logger = factory.CreateLogger(string.Empty);
1515

16-
public IDisposable BeginScope<TState>(TState state) => this.logger.BeginScope(state);
16+
IDisposable ILogger.BeginScope<TState>(TState state) => this.logger.BeginScope(state)!;
1717

1818
public bool IsEnabled(LogLevel logLevel) => this.logger.IsEnabled(logLevel);
1919

2020
public void Log<TState>(
2121
LogLevel logLevel,
2222
EventId eventId,
2323
TState state,
24-
Exception exception,
25-
Func<TState, Exception, string> formatter) =>
24+
Exception? exception,
25+
Func<TState, Exception?, string> formatter) =>
2626
this.logger.Log(logLevel, eventId, state, exception, formatter);
2727
}
2828
}

‎src/SimpleInjector.Integration.ServiceCollection/SimpleInjector.Integration.ServiceCollection.csproj‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</Description>
66
<AssemblyTitle>Simple Injector IServiceCollection Integration</AssemblyTitle>
77
<NeutralLanguage>en-US</NeutralLanguage>
8-
<VersionPrefix>5.4.0</VersionPrefix>
8+
<VersionPrefix>5.5.0</VersionPrefix>
99
<PackageReleaseNotes>https://github.com/simpleinjector/SimpleInjector.Integration.AspNetCore/releases/tag/v5.3.0</PackageReleaseNotes>
1010
<AssemblyVersion>5.0.0.0</AssemblyVersion>
1111
<Authors>Simple Injector Contributors</Authors>
12-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
12+
<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
1313
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1414
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1515
<AssemblyName>SimpleInjector.Integration.ServiceCollection</AssemblyName>
@@ -32,11 +32,28 @@
3232
</PropertyGroup>
3333

3434
<ItemGroup>
35+
<PackageReference Include="SimpleInjector" Version="5.4.0" />
36+
</ItemGroup>
37+
38+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
3539
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
3640
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
3741
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="2.1.1" />
3842
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
39-
<PackageReference Include="SimpleInjector" Version="5.4.0" />
43+
</ItemGroup>
44+
45+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
46+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
47+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
48+
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.16" />
49+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
50+
</ItemGroup>
51+
52+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
53+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
54+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
55+
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.5" />
56+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
4057
</ItemGroup>
4158

4259
<ItemGroup>

0 commit comments

Comments
 (0)