Skip to content

Commit e721f4c

Browse files
devleaddevlead
committed
Merge branch 'develop'
2 parents 8bb0f97 + e9f2ee1 commit e721f4c

5 files changed

Lines changed: 46 additions & 67 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
os: [windows-latest, ubuntu-latest, macos-latest]
2323
steps:
2424
- name: Get the sources
25-
uses: actions/checkout@v6
25+
uses: actions/checkout@v7
2626
with:
2727
fetch-depth: 0
2828

‎cake.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env dotnet
12
#:sdk Cake.Sdk@6.2.0
23
#:property IncludeAdditionalFiles=./build/*.cs
34
@@ -133,6 +134,7 @@
133134
NoBuild = true,
134135
NoRestore = true,
135136
OutputDirectory = data.NuGetOutputPath,
137+
ArgumentCustomization = args => args.Append("/m:1"),
136138
MSBuildSettings = data.MSBuildSettings
137139
}
138140
)
@@ -149,6 +151,7 @@
149151
static (context, data) => {
150152
context.CopyDirectory(data.ProjectRoot.Combine("Devlead.Testing.MockHttp.Tests"), data.IntegrationTestPath);
151153
context.CopyFile(data.ProjectRoot.CombineWithFilePath("Directory.Packages.props"), data.IntegrationTestPath.CombineWithFilePath("Directory.Packages.props"));
154+
context.CopyFile(data.ProjectRoot.CombineWithFilePath("Devlead.Testing.MockHttp.slnx"), data.IntegrationTestPath.CombineWithFilePath("Devlead.Testing.MockHttp.slnx"));
152155
context.CopyFile("nuget.config", data.IntegrationTestPath.CombineWithFilePath("nuget.config"));
153156
context.DotNetAddPackage(
154157
"Devlead.Testing.MockHttp",
@@ -165,7 +168,7 @@
165168
.Does<BuildData>(
166169
static (context, data) => {
167170
context.DotNetTest(
168-
data.IntegrationTestPath.FullPath,
171+
data.IntegrationTestPath.CombineWithFilePath("Devlead.Testing.MockHttp.Tests.csproj").FullPath,
169172
new DotNetTestSettings {
170173
Configuration = "IntegrationTest"
171174
}

‎src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.Dependencies.props‎

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,30 @@
11
<Project>
2-
<ItemGroup>
3-
<PackageReference Include="Argon.Xml" />
4-
<PackageReference Include="Verify" />
5-
</ItemGroup>
6-
7-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
8-
<PackageReference Include="Verify.Http" VersionOverride="6.4.1" Pack="false" />
9-
<PackageFile PackFolder="Dependency" Include="Verify.Http" Version="6.4.1" />
10-
11-
<PackageReference Include="Microsoft.Extensions.Http" VersionOverride="8.0.1" Pack="false" />
12-
<PackageFile PackFolder="Dependency" Include="Microsoft.Extensions.Http" Version="8.0.1" />
13-
14-
<PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="8.0.28" Pack="false" />
15-
<PackageFile PackFolder="Dependency" Include="Microsoft.Net.Http.Headers" Version="8.0.28" />
16-
17-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="8.0.3" Pack="false" />
18-
<PackageFile PackFolder="Dependency" Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
19-
20-
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="8.10.0" Pack="false" />
21-
<PackageFile PackFolder="Dependency" Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
22-
</ItemGroup>
23-
24-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
25-
<PackageReference Include="Verify.Http" VersionOverride="7.4.0" Pack="false" />
26-
<PackageFile PackFolder="Dependency" Include="Verify.Http" Version="7.4.0" />
27-
28-
<PackageReference Include="Microsoft.Extensions.Http" VersionOverride="9.0.17" Pack="false" />
29-
<PackageFile PackFolder="Dependency" Include="Microsoft.Extensions.Http" Version="9.0.16" />
30-
31-
<PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="9.0.17" Pack="false" />
32-
<PackageFile PackFolder="Dependency" Include="Microsoft.Net.Http.Headers" Version="9.0.17" />
33-
34-
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="9.10.0" Pack="false" />
35-
<PackageFile PackFolder="Dependency" Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0" />
36-
</ItemGroup>
37-
38-
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
39-
<PackageReference Include="Verify.Http" VersionOverride="7.5.1" Pack="false" />
40-
<PackageFile PackFolder="Dependency" Include="Verify.Http" Version="7.5.1" />
41-
42-
<PackageReference Include="Microsoft.Extensions.Http" VersionOverride="10.0.8" Pack="false" />
43-
<PackageFile PackFolder="Dependency" Include="Microsoft.Extensions.Http" Version="10.0.8" />
44-
45-
<PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="10.0.9" Pack="false" />
46-
<PackageFile PackFolder="Dependency" Include="Microsoft.Net.Http.Headers" Version="10.0.9" />
47-
48-
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="10.7.0" Pack="false" />
49-
<PackageFile PackFolder="Dependency" Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.7.0" />
50-
</ItemGroup>
2+
3+
<ItemGroup>
4+
<PackageReference Include="Argon.Xml" />
5+
<PackageReference Include="Verify" />
6+
</ItemGroup>
7+
8+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
9+
<PackageReference Include="Verify.Http" VersionOverride="6.4.1" />
10+
<PackageReference Include="Microsoft.Extensions.Http" VersionOverride="8.0.1" />
11+
<PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="8.0.28" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="8.0.3" />
13+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="8.10.0" />
14+
</ItemGroup>
15+
16+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
17+
<PackageReference Include="Verify.Http" VersionOverride="7.4.0" />
18+
<PackageReference Include="Microsoft.Extensions.Http" VersionOverride="9.0.17" />
19+
<PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="9.0.17" />
20+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="9.10.0" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
24+
<PackageReference Include="Verify.Http" VersionOverride="7.5.1" />
25+
<PackageReference Include="Microsoft.Extensions.Http" VersionOverride="10.0.8" />
26+
<PackageReference Include="Microsoft.Net.Http.Headers" VersionOverride="10.0.9" />
27+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" VersionOverride="10.7.0" />
28+
</ItemGroup>
29+
5130
</Project>

‎src/Devlead.Testing.MockHttp/Devlead.Testing.MockHttp.csproj‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,20 @@
77
<PackageReadmeFile>README.md</PackageReadmeFile>
88
<PackageIcon>icon/devlead.testing.mockhttp.png</PackageIcon>
99
<IsPackable>true</IsPackable>
10-
<PackBuildOutput>false</PackBuildOutput>
11-
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
12-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
13-
<ContentTargetFolders>contentFiles</ContentTargetFolders>
10+
<SourcePackRoot>Devlead</SourcePackRoot>
11+
<SourcePackIncludeGeneratedUsings>false</SourcePackIncludeGeneratedUsings>
1412
</PropertyGroup>
15-
<ItemGroup>
16-
<PackageFile Condition="'$(Configuration)'!='Debug'" Include="**/*.cs" Exclude="obj/**;bin/**" PackagePath="$(ContentTargetFolders)\cs\$(TargetFramework)\Devlead\%(RelativeDir)%(Filename)%(Extension)" />
17-
</ItemGroup>
1813

1914
<ItemGroup>
20-
<PackageFile Include="../../icon/LICENSE.md" PackagePath="icon/LICENSE.md" />
21-
<PackageFile Include="../../icon/devlead.testing.mockhttp.png" PackagePath="icon/devlead.testing.mockhttp.png" />
22-
<PackageFile Include="../../README.md" PackagePath="README.md" />
15+
<PackageReference Include="Devlead.SourcePack" PrivateAssets="all" />
2316
</ItemGroup>
2417

2518
<ItemGroup>
26-
<PackageReference Include="NuGetizer" PrivateAssets="all" />
19+
<SourcePackFile Include="../../icon/LICENSE.md" Kind="Metadata" PackagePath="icon/LICENSE.md" />
20+
<SourcePackFile Include="../../icon/devlead.testing.mockhttp.png" Kind="Metadata" PackagePath="icon/devlead.testing.mockhttp.png" />
21+
<SourcePackFile Include="../../README.md" Kind="Metadata" />
2722
</ItemGroup>
2823

2924
<Import Project="Devlead.Testing.MockHttp.Dependencies.props" />
25+
3026
</Project>

‎src/Directory.Packages.props‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
5+
<CentralPackageVersionOverrideEnabled>true</CentralPackageVersionOverrideEnabled>
56
</PropertyGroup>
67
<ItemGroup>
78
<PackageVersion Include="Argon.Xml" Version="0.34.0" />
8-
<PackageVersion Include="Verify" Version="31.19.1" />
9+
<PackageVersion Include="Devlead.SourcePack" Version="2026.6.23.3" />
10+
<PackageVersion Include="Verify" Version="31.20.0" />
911
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
1012
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.7.0" />
1113
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="10.0.9" />
12-
<PackageVersion Include="Microsoft.Extensions.Http " Version="10.0.8" />
14+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.8" />
1315
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
1416
<PackageVersion Include="MimeTypes" Version="2.5.2" />
15-
<PackageVersion Include="NuGetizer" Version="1.4.7" />
1617
<PackageVersion Include="NUnit" Version="4.6.1" />
1718
<PackageVersion Include="NUnit.Analyzers" Version="4.14.0" />
1819
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
1920
<PackageVersion Include="System.Linq.Async" Version="7.0.1" />
20-
<PackageVersion Include="Verify.NUnit" Version="31.19.1" />
21+
<PackageVersion Include="Verify.NUnit" Version="31.20.0" />
2122
<PackageVersion Include="Verify.Http" Version="7.5.1" />
2223
</ItemGroup>
23-
</Project>
24+
</Project>

0 commit comments

Comments
 (0)