Skip to content

Commit db94a53

Browse files
committed
add test helper to enable dependency solver
1 parent 5751b3d commit db94a53

File tree

2 files changed

+33
-21
lines changed

2 files changed

+33
-21
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
namespace NuGetUpdater.Core.Test;
2+
3+
/// <summary>
4+
/// Prepares the environment to use the new dependency solver.
5+
/// </summary>
6+
public class DependencySolverEnvironment : TemporaryEnvironment
7+
{
8+
public DependencySolverEnvironment(bool useDependencySolver = true)
9+
: base([("UseNewNugetPackageResolver", useDependencySolver ? "true" : "false")])
10+
{
11+
}
12+
}

nuget/helpers/lib/NuGetUpdater/NuGetUpdater.Core.Test/Update/UpdateWorkerTests.Sdk.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
5454
}
5555

5656
[Theory]
57-
[InlineData("true")]
58-
[InlineData(null)]
59-
public async Task UpdateVersionChildElement_InProjectFile_ForPackageReferenceIncludeTheory(string variableValue)
57+
[InlineData(true)]
58+
[InlineData(false)]
59+
public async Task UpdateVersionChildElement_InProjectFile_ForPackageReferenceIncludeTheory(bool useDependencySolver)
6060
{
6161
// update Some.Package from 9.0.1 to 13.0.1
62-
using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
62+
using var _ = new DependencySolverEnvironment(useDependencySolver);
6363
await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
6464
packages:
6565
[
@@ -99,7 +99,7 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
9999
public async Task CallingResolveDependencyConflictsNew()
100100
{
101101
// update Microsoft.CodeAnalysis.Common from 4.9.2 to 4.10.0
102-
using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", "true")]);
102+
using var _ = new DependencySolverEnvironment();
103103
await TestUpdateForProject("Microsoft.CodeAnalysis.Common", "4.9.2", "4.10.0",
104104
// initial
105105
projectContents: $"""
@@ -535,11 +535,11 @@ await TestUpdateForProject("Some.Package", "9.0.1", "13.0.1",
535535
}
536536

537537
[Theory]
538-
[InlineData(null)]
539-
[InlineData("true")]
540-
public async Task AddPackageReference_InProjectFile_ForTransientDependency(string variableValue)
538+
[InlineData(true)]
539+
[InlineData(false)]
540+
public async Task AddPackageReference_InProjectFile_ForTransientDependency(bool useDependencySolver)
541541
{
542-
using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
542+
using var _ = new DependencySolverEnvironment(useDependencySolver);
543543
// add transient package Some.Transient.Dependency from 5.0.1 to 5.0.2
544544
await TestUpdateForProject("Some.Transient.Dependency", "5.0.1", "5.0.2", isTransitive: true,
545545
packages:
@@ -2915,11 +2915,11 @@ await TestUpdateForProject("Some.Package", "12.0.1", "13.0.1",
29152915
}
29162916

29172917
[Theory]
2918-
[InlineData("true")]
2919-
[InlineData(null)]
2920-
public async Task NoChange_IfThereAreIncoherentVersions(string variableValue)
2918+
[InlineData(true)]
2919+
[InlineData(false)]
2920+
public async Task NoChange_IfThereAreIncoherentVersions(bool useDependencySolver)
29212921
{
2922-
using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
2922+
using var _ = new DependencySolverEnvironment(useDependencySolver);
29232923

29242924
// trying to update `Transitive.Dependency` to 1.1.0 would normally pull `Some.Package` from 1.0.0 to 1.1.0,
29252925
// but the TFM doesn't allow it
@@ -3005,11 +3005,11 @@ await TestUpdateForProject("Some.Package", "7.0.1", "13.0.1",
30053005
}
30063006

30073007
[Theory]
3008-
[InlineData("true")]
3009-
[InlineData(null)]
3010-
public async Task UnresolvablePropertyDoesNotStopOtherUpdates(string variableValue)
3008+
[InlineData(true)]
3009+
[InlineData(false)]
3010+
public async Task UnresolvablePropertyDoesNotStopOtherUpdates(bool useDependencySolver)
30113011
{
3012-
using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
3012+
using var _ = new DependencySolverEnvironment(useDependencySolver);
30133013

30143014
// the property `$(SomeUnresolvableProperty)` cannot be resolved
30153015
await TestUpdateForProject("Some.Package", "7.0.1", "13.0.1",
@@ -3045,11 +3045,11 @@ await TestUpdateForProject("Some.Package", "7.0.1", "13.0.1",
30453045
}
30463046

30473047
[Theory]
3048-
[InlineData("true")]
3049-
[InlineData(null)]
3050-
public async Task UpdatingPackageAlsoUpdatesAnythingWithADependencyOnTheUpdatedPackage(string variableValue)
3048+
[InlineData(true)]
3049+
[InlineData(false)]
3050+
public async Task UpdatingPackageAlsoUpdatesAnythingWithADependencyOnTheUpdatedPackage(bool useDependencySolver)
30513051
{
3052-
using var env = new TemporaryEnvironment([("UseNewNugetPackageResolver", variableValue)]);
3052+
using var _ = new DependencySolverEnvironment(useDependencySolver);
30533053

30543054
// updating Some.Package from 3.3.30 requires that Some.Package.Extensions also be updated
30553055
await TestUpdateForProject("Some.Package", "3.3.30", "3.4.3",

0 commit comments

Comments
 (0)