Skip to content

Commit 62f3dfe

Browse files
Arash-SabetArash-Sabet
committed
Merge branch 'main' into pr/221
2 parents 8a6c0e7 + bf691b4 commit 62f3dfe

File tree

6 files changed

+53
-724
lines changed

6 files changed

+53
-724
lines changed

‎LICENSE‎

Lines changed: 4 additions & 671 deletions
Large diffs are not rendered by default.

‎azure-pipeline-PR.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pool:
1414
steps:
1515
- script: echo Build Number $(name)
1616
- task: UseDotNet@2
17-
displayName: 'Use .NET 7.0 sdk'
17+
displayName: 'Use .NET 8.0 sdk'
1818
inputs:
1919
packageType: sdk
2020
version: 8.0.100
@@ -37,13 +37,4 @@ steps:
3737
**/Xunit.Microsoft.DependencyInjection.csproj
3838
**/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj
3939
arguments: '--configuration $(BuildConfiguration)'
40-
- task: NuGetCommand@2
41-
displayName: 'Packing'
42-
inputs:
43-
command: 'pack'
44-
packagesToPack: |
45-
**/Xunit.Microsoft.DependencyInjection.csproj
46-
**/examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj
47-
versioningScheme: 'byEnvVar'
48-
versionEnvVar: 'Build.BuildNumber'
4940

‎azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pool:
2121
steps:
2222
- script: echo Build Number $(name)
2323
- task: UseDotNet@2
24-
displayName: 'Use .NET 7.0 sdk'
24+
displayName: 'Use .NET 8.0 sdk'
2525
inputs:
2626
packageType: sdk
2727
version: 8.0.100

‎examples/Xunit.Microsoft.DependencyInjection.ExampleTests/Xunit.Microsoft.DependencyInjection.ExampleTests.csproj‎

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,45 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<LangVersion>latest</LangVersion>
6-
<IsPackable>false</IsPackable>
7-
<Nullable>enable</Nullable>
8-
<ImplicitUsings>enable</ImplicitUsings>
9-
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14-
<PackageReference Include="xunit" Version="2.6.3" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
16-
<PrivateAssets>all</PrivateAssets>
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="6.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
27-
</ItemGroup>
28-
<ItemGroup>
29-
<None Remove="appsettings.json" />
30-
</ItemGroup>
31-
<ItemGroup>
32-
<Content Include="appsettings.json">
33-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
34-
</Content>
35-
</ItemGroup>
36-
<ItemGroup>
37-
<ProjectReference Include="..\..\src\Xunit.Microsoft.DependencyInjection.csproj" />
38-
<ProjectReference Include="..\Xunit.Microsoft.DependencyInjection.ExampleTests.CalculationService\Xunit.Microsoft.DependencyInjection.ExampleTests.CalculationService.csproj" />
39-
</ItemGroup>
40-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<LangVersion>latest</LangVersion>
6+
<IsPackable>false</IsPackable>
7+
<Nullable>enable</Nullable>
8+
<ImplicitUsings>enable</ImplicitUsings>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
14+
<PackageReference Include="xunit" Version="2.6.5" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
19+
<PackageReference Include="coverlet.collector" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<Folder Include="Fixtures\" />
31+
<Folder Include="Services\" />
32+
</ItemGroup>
33+
<ItemGroup>
34+
<None Remove="appsettings.json" />
35+
</ItemGroup>
36+
<ItemGroup>
37+
<Content Include="appsettings.json">
38+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
39+
</Content>
40+
</ItemGroup>
41+
<ItemGroup>
42+
<ProjectReference Include="..\..\src\Xunit.Microsoft.DependencyInjection.csproj" />
43+
<ProjectReference Include="..\Xunit.Microsoft.DependencyInjection.ExampleTests.CalculationService\Xunit.Microsoft.DependencyInjection.ExampleTests.CalculationService.csproj" />
44+
</ItemGroup>
45+
</Project>

‎src/Xunit.Microsoft.DependencyInjection.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
1313
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
15-
<PackageReference Include="xunit.core" Version="2.6.3" />
15+
<PackageReference Include="xunit.core" Version="2.6.5" />
1616
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
1717
</ItemGroup>
1818
<ItemGroup>

‎src/package.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<iconUrl>http://umplify.com/wp-content/uploads/2017/11/umplify_logo.png</iconUrl>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1313
<description>This package contains the necessary classes and features to leverage Xunit's fixture class for Microsoft dependency inection framework.</description>
14-
<copyright>2023 - All rights reserved, Umplify Technologies Inc.</copyright>
14+
<copyright>2024 - All rights reserved, Umplify Technologies Inc.</copyright>
1515
<tags>xunit dependency-injection microsoft-dependency-injection xunit-dependency-injection</tags>
1616
</metadata>
1717
</package>

0 commit comments

Comments
 (0)