Skip to content

Commit

Permalink
Merge branch 'main' into users/segomez/handle-casing-2
Browse files Browse the repository at this point in the history
  • Loading branch information
randhircs authored Nov 25, 2024
2 parents 1ff1e4b + c13991e commit f9f3c91
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion nuget/helpers/lib/NuGetUpdater/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />

<PackageVersion Include="xunit" Version="2.4.2" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<PropertyGroup>
<MicrosoftBuildVersion>17.12.6</MicrosoftBuildVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>6.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>9.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftWebXdtPackageVersion>3.0.0</MicrosoftWebXdtPackageVersion>
<SystemPackagesVersion>4.3.0</SystemPackagesVersion>
<SystemPackagesVersion>4.7.0</SystemPackagesVersion>
<CryptographyPackagesVersion>5.0.0</CryptographyPackagesVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ await RunAsync(
}),
updaterWorker: new TestUpdaterWorker(async input =>
{
Assert.Contains(input.Item3, ["Some.Package", "Some.Package2"]);
Assert.Contains(input.Item3, new List<string> { "Some.Package", "Some.Package2" });
Assert.Equal("1.0.0", input.Item4);
Assert.Equal("1.0.1", input.Item5);
var projectPath = input.Item1 + input.Item2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public async Task DeserializeExperimentsManager_UnsupportedJobFileShape_InfoIsRe
// assert
Assert.False(experimentsManager.UseLegacyDependencySolver);
Assert.False(experimentsManager.UseDirectDiscovery);
Assert.Single(capturingTestLogger.Messages.Where(m => m.Contains("Error deserializing job file")));
Assert.Single(capturingTestLogger.Messages, m => m.Contains("Error deserializing job file"));
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2294,7 +2294,7 @@ public async Task MissingTargetsAreReported()
var resultContents = await File.ReadAllTextAsync(resultOutputPath);
var result = JsonSerializer.Deserialize<UpdateOperationResult>(resultContents, UpdaterWorker.SerializerOptions)!;
Assert.Equal(ErrorType.MissingFile, result.ErrorType);
Assert.Equal(Path.Combine(temporaryDirectory.DirectoryPath, "this.file.does.not.exist.targets"), result.ErrorDetails.ToString());
Assert.Equal(Path.Combine(temporaryDirectory.DirectoryPath, "this.file.does.not.exist.targets"), result.ErrorDetails!.ToString());
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public static void Equal<T>(
return;
}

Assert.True(false, GetAssertMessage(expected, actual, comparer, message));
Assert.Fail(GetAssertMessage(expected, actual, comparer, message));
}

private static bool SequenceEqual<T>(
Expand Down

0 comments on commit f9f3c91

Please sign in to comment.