Skip to content

Commit 85aa8a1

Browse files
Arash-SabetArash-Sabet
authored
Merge pull request #331 from Umplify/copilot/add-required-dependencies-package
Add automatic dependency inclusion and central package management
2 parents f0b2785 + 852af45 commit 85aa8a1

File tree

6 files changed

+54
-38
lines changed

6 files changed

+54
-38
lines changed

‎Directory.Packages.props‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<!-- Microsoft.Extensions packages (core dependencies) -->
8+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
9+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
10+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
11+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.10" />
12+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" />
13+
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.10" />
14+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.10" />
15+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
16+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.10" />
17+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.10" />
18+
<!-- xUnit packages -->
19+
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.1.0" />
20+
<PackageVersion Include="xunit.v3" Version="3.1.0" />
21+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
22+
<!-- Development and build tools -->
23+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
24+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
25+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
26+
</ItemGroup>
27+
</Project>

‎README.md‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,7 @@ dotnet add package Xunit.Microsoft.DependencyInjection
6464
<PackageReference Include="Xunit.Microsoft.DependencyInjection" Version="9.2.0" />
6565
```
6666

67-
### Required Dependencies
68-
69-
Your test project also needs the following Microsoft.Extensions packages for full functionality:
70-
71-
```xml
72-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
73-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
74-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.9" />
75-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
76-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.9" />
77-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
78-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
79-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
80-
```
67+
**✨ That's it!** All required Microsoft.Extensions dependencies are now automatically included with the package, so you don't need to manually add them to your test project.
8168

8269
### Quick Start Example
8370

‎azure-pipeline-PR.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
displayName: 'Use .NET 9.0 sdk'
1818
inputs:
1919
packageType: sdk
20-
version: 9.0.305
20+
version: 9.0.306
2121
installationPath: $(Agent.ToolsDirectory)/dotnet
2222
- script: echo Started restoring the source code
2323
- task: DotNetCoreCLI@2

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
variables:
22
Major: 9
33
Minor: 2
4-
Revision: 1
4+
Revision: 2
55
BuildConfiguration: Release
66

77
name: $(Major).$(Minor).$(Revision)
@@ -25,7 +25,7 @@ steps:
2525
displayName: 'Use .NET 9.0 sdk'
2626
inputs:
2727
packageType: sdk
28-
version: 9.0.305
28+
version: 9.0.306
2929
installationPath: $(Agent.ToolsDirectory)/dotnet
3030
- script: echo Started restoring the source code
3131
- task: DotNetCoreCLI@2

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,17 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
16-
<PackageReference Include="xunit.v3" Version="3.1.0" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
14+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
16+
<PackageReference Include="xunit.v3" />
17+
<PackageReference Include="xunit.runner.visualstudio">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="coverlet.collector" Version="6.0.4">
21+
<PackageReference Include="coverlet.collector">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
</PackageReference>
25-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9" />
27-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.9" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.9" />
30-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
31-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
3225
</ItemGroup>
3326
<ItemGroup>
3427
<None Remove="appsettings.json" />

‎src/Xunit.Microsoft.DependencyInjection.csproj‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77

88
<!-- Version configuration - can be overridden by build system -->
9-
<Version Condition="'$(Version)' == ''">9.2.1</Version>
9+
<Version Condition="'$(Version)' == ''">9.2.2</Version>
1010

1111
<!-- NuGet Package Properties -->
1212
<PackageId>Xunit.Microsoft.DependencyInjection</PackageId>
@@ -40,14 +40,23 @@
4040
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4141
</PropertyGroup>
4242
<ItemGroup>
43-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
44-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" />
45-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
46-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.9" />
47-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
48-
<PackageReference Include="xunit.v3.extensibility.core" Version="3.1.0" />
49-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
50-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
43+
<!-- Core Microsoft.Extensions dependencies - automatically included for users -->
44+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
45+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
46+
<PackageReference Include="Microsoft.Extensions.Configuration" />
47+
<PackageReference Include="Microsoft.Extensions.Options" />
48+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
49+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" />
50+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
51+
<PackageReference Include="Microsoft.Extensions.Logging" />
52+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
53+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
54+
55+
<!-- xUnit dependency -->
56+
<PackageReference Include="xunit.v3.extensibility.core" />
57+
58+
<!-- Build tools -->
59+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
5160
</ItemGroup>
5261
<ItemGroup>
5362
<None Include="..\README.md" Pack="true" PackagePath="\" />

0 commit comments

Comments
 (0)