Skip to content

Commit 6ba6852

Browse files
junerjuner
committed
add Directory.Build.props and Directory.Build.targets and enable nullable
1 parent ee9a397 commit 6ba6852

9 files changed

+47
-20
lines changed

‎Directory.Build.props

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Deterministic>true</Deterministic>
4+
<Nullable>enable</Nullable>
5+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6+
<RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</RepoRoot>
7+
<PathMap>$(RepoRoot)=.</PathMap>
8+
<LangVersion>latest</LangVersion>
9+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
10+
<FileVersion>1.0.0.0</FileVersion>
11+
<Version>1.0.0.0</Version>
12+
</PropertyGroup>
13+
</Project>

‎Directory.Build.targets

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Update="DryIoc.Microsoft.DependencyInjection" Version="4.1.0" />
4+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
5+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
6+
<PackageReference Update="MSTest.TestAdapter" Version="2.1.0" />
7+
<PackageReference Update="MSTest.TestFramework" Version="2.1.0" />
8+
<PackageReference Update="coverlet.collector" Version="1.2.0" />
9+
<PackageReference Update="Prism.DryIoc" Version="8.0.0.1909" />
10+
</ItemGroup>
11+
</Project>

‎DryIoc.Microsoft.DependencyInjection.Extension/DryIoc.Microsoft.DependencyInjection.Extension.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netstandard2.0</TargetFramework>
4-
<LangVersion>latest</LangVersion>
54
<PackageId>DryIoc.Microsoft.DependencyInjection.Extension</PackageId>
65
<PackageVersion>1.0.0</PackageVersion>
76
<Authors>juner</Authors>
@@ -20,8 +19,8 @@
2019
<RepositoryType>git</RepositoryType>
2120
</PropertyGroup>
2221
<ItemGroup>
23-
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="4.1.0" />
24-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.6" />
22+
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" />
23+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
2524
</ItemGroup>
2625
<ItemGroup>
2726
<None Include="..\LICENSE">

‎DryIoc.Microsoft.DependencyInjection.Extension/ServiceCollectionExtensions.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ namespace DryIoc.Microsoft.DependencyInjection.Extension
77
{
88
public static class ServiceCollectionExtensions
99
{
10-
public static IContainer RegisterServices(this IContainer container, Action<IServiceCollection> Action, Func<IRegistrator, ServiceDescriptor, bool> registerDescriptor = null)
10+
public static IContainer RegisterServices(this IContainer container, Action<IServiceCollection> Action, Func<IRegistrator, ServiceDescriptor, bool>? registerDescriptor = null)
1111
{
1212
var descriptors = new ServiceCollection();
1313
Action.Invoke(descriptors);
1414
DependencyInjectionAdapter(container, descriptors, registerDescriptor);
1515
return container;
1616
}
17-
static void DependencyInjectionAdapter(IContainer container, IEnumerable<ServiceDescriptor> descriptors = null,
18-
Func<IRegistrator, ServiceDescriptor, bool> registerDescriptor = null)
17+
static void DependencyInjectionAdapter(IContainer container, IEnumerable<ServiceDescriptor>? descriptors = null,
18+
Func<IRegistrator, ServiceDescriptor, bool>? registerDescriptor = null)
1919
{
2020
container.Use<IServiceScopeFactory>(r => new DryIocServiceScopeFactory(r));
2121
// Registers service collection
@@ -24,7 +24,7 @@ static void DependencyInjectionAdapter(IContainer container, IEnumerable<Service
2424
var Provider = container.BuildServiceProvider();
2525
container.RegisterInstance(Provider);
2626
}
27-
static void Populate(IContainer container, IEnumerable<ServiceDescriptor> descriptors, Func<IRegistrator, ServiceDescriptor, bool> registerDescriptor = null)
27+
static void Populate(IContainer container, IEnumerable<ServiceDescriptor> descriptors, Func<IRegistrator, ServiceDescriptor, bool>? registerDescriptor = null)
2828
{
2929
var d = descriptors.GroupBy(v => v.ServiceType).Select(v => (ServiceType: v.Key, Descriptors: v.ToList()));
3030
if (registerDescriptor is null)

‎DryIoc.Microsoft.DependencyInjection.Tests/DryIoc.Microsoft.DependencyInjection.Extension.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
12-
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
13-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
11+
<PackageReference Include="MSTest.TestAdapter" />
12+
<PackageReference Include="MSTest.TestFramework" />
13+
<PackageReference Include="coverlet.collector"/>
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎DryIoc.Microsoft.DependencyInjection.Tests/ServiceCollectionExtensionsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ interface IB<T>
218218
}
219219
class B1<T> : IB<T>
220220
{
221-
public T Value { get; set; }
221+
public T Value { get; set; } = default!;
222222
}
223223
class B2<T> : IB<T>
224224
{
225-
public T Value { get; set; }
225+
public T Value { get; set; } = default!;
226226

227227
}
228228
}

‎Prism.DryIoc.Tests/DryIoc.Microsoft.DependencyInjection.Extension.Prism.DryIoc.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
12-
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
13-
<PackageReference Include="coverlet.collector" Version="1.2.0" />
14-
<PackageReference Include="Prism.DryIoc" Version="8.0.0.1909" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
11+
<PackageReference Include="MSTest.TestAdapter" />
12+
<PackageReference Include="MSTest.TestFramework" />
13+
<PackageReference Include="coverlet.collector" />
14+
<PackageReference Include="Prism.DryIoc" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎Prism.DryIoc.Tests/ServiceCollectionExtensionsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ interface IB<T>
236236
}
237237
class B1<T> : IB<T>
238238
{
239-
public T Value { get; set; }
239+
public T Value { get; set; } = default!;
240240
}
241241
class B2<T> : IB<T>
242242
{
243-
public T Value { get; set; }
243+
public T Value { get; set; } = default!;
244244
}
245245
}
246246
}

‎Prism.Extensions.ServiceCollection.sln

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DryIoc.Microsoft.DependencyInjection.Extension.Tests", "DryIoc.Microsoft.DependencyInjection.Tests\DryIoc.Microsoft.DependencyInjection.Extension.Tests.csproj", "{727A075B-33B7-4082-937A-F3C42DBF5DD4}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CB80EE5C-4BDD-42E9-AB54-47989399DA0A}"
11+
ProjectSection(SolutionItems) = preProject
12+
Directory.Build.props = Directory.Build.props
13+
Directory.Build.targets = Directory.Build.targets
14+
EndProjectSection
1115
EndProject
1216
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DryIoc.Microsoft.DependencyInjection.Extension.Prism.DryIoc.Tests", "Prism.DryIoc.Tests\DryIoc.Microsoft.DependencyInjection.Extension.Prism.DryIoc.Tests.csproj", "{C18CF685-3BA2-44C4-8CFA-8ABB9455FADE}"
1317
EndProject

0 commit comments

Comments
 (0)