Skip to content

Commit 0f4c6e5

Browse files
authored
[release/8.0.3xx] Update dependencies from microsoft/vstest (#39656)
2 parents b4d072a + 080f012 commit 0f4c6e5

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<!-- End: Package sources from dotnet-emsdk -->
88
<!-- Begin: Package sources from dotnet-format -->
99
<add key="darc-pub-dotnet-format-ac0d855" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-ac0d8555/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-format-ac0d855-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-ac0d8555-1/nuget/v3/index.json" />
1011
<!-- End: Package sources from dotnet-format -->
1112
<!-- Begin: Package sources from dotnet-aspnetcore -->
1213
<!-- End: Package sources from dotnet-aspnetcore -->

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,18 @@
183183
<Uri>https://github.com/nuget/nuget.client</Uri>
184184
<Sha>1845d6bd450a7453d573035371c9fec43683d1ef</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24169-03">
186+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-preview-24170-01">
187187
<Uri>https://github.com/microsoft/vstest</Uri>
188-
<Sha>fb859a78be3d76ee38d5630ad86a17ab124ebbcf</Sha>
188+
<Sha>6957756d70d6ade74e239a38ad709db5cb39fe0d</Sha>
189189
<SourceBuild RepoName="vstest" ManagedOnly="true" />
190190
</Dependency>
191-
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.10.0-preview-24169-03">
191+
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.10.0-preview-24170-01">
192192
<Uri>https://github.com/microsoft/vstest</Uri>
193-
<Sha>fb859a78be3d76ee38d5630ad86a17ab124ebbcf</Sha>
193+
<Sha>6957756d70d6ade74e239a38ad709db5cb39fe0d</Sha>
194194
</Dependency>
195-
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.10.0-preview-24169-03">
195+
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.10.0-preview-24170-01">
196196
<Uri>https://github.com/microsoft/vstest</Uri>
197-
<Sha>fb859a78be3d76ee38d5630ad86a17ab124ebbcf</Sha>
197+
<Sha>6957756d70d6ade74e239a38ad709db5cb39fe0d</Sha>
198198
</Dependency>
199199
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.2">
200200
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
</PropertyGroup>
100100
<PropertyGroup>
101101
<!-- Dependencies from https://github.com/Microsoft/vstest -->
102-
<MicrosoftNETTestSdkPackageVersion>17.10.0-preview-24169-03</MicrosoftNETTestSdkPackageVersion>
103-
<MicrosoftTestPlatformCLIPackageVersion>17.10.0-preview-24169-03</MicrosoftTestPlatformCLIPackageVersion>
104-
<MicrosoftTestPlatformBuildPackageVersion>17.10.0-preview-24169-03</MicrosoftTestPlatformBuildPackageVersion>
102+
<MicrosoftNETTestSdkPackageVersion>17.10.0-preview-24170-01</MicrosoftNETTestSdkPackageVersion>
103+
<MicrosoftTestPlatformCLIPackageVersion>17.10.0-preview-24170-01</MicrosoftTestPlatformCLIPackageVersion>
104+
<MicrosoftTestPlatformBuildPackageVersion>17.10.0-preview-24170-01</MicrosoftTestPlatformBuildPackageVersion>
105105
</PropertyGroup>
106106
<PropertyGroup>
107107
<!-- Dependencies from https://github.com/dotnet/runtime -->

src/Tests/dotnet-new.Tests/DotnetNewSearchTests.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,7 @@ public int Compare(string? left, string? right)
958958
bool rightIsShrunk = right.EndsWith("...");
959959
if (!(leftIsShrunk ^ rightIsShrunk))
960960
{
961+
// return string.Compare(left, right, StringComparison.CurrentCultureIgnoreCase);
961962
return string.Compare(left, right, StringComparison.CurrentCultureIgnoreCase);
962963
}
963964

@@ -967,8 +968,9 @@ public int Compare(string? left, string? right)
967968
}
968969
if (leftIsShrunk && right.StartsWith(left.Substring(0, left.Length - 3), StringComparison.CurrentCultureIgnoreCase))
969970
{
970-
return 1;
971+
return -1;
971972
}
973+
// return string.Compare(left, right, StringComparison.CurrentCultureIgnoreCase);
972974
return string.Compare(left, right, StringComparison.CurrentCultureIgnoreCase);
973975
}
974976
}
@@ -994,11 +996,11 @@ public int Compare(string? x, string? y)
994996

995997
if (x != "<1k")
996998
{
997-
_ = int.TryParse(x.Trim().AsSpan(0, x.Length - 1), out xInt);
999+
_ = int.TryParse(x.Trim().AsSpan(0, x.Length - 1), System.Globalization.NumberStyles.AllowThousands, null, out xInt);
9981000
}
9991001
if (y != "<1k")
10001002
{
1001-
_ = int.TryParse(y.Trim().AsSpan(0, y.Length - 1), out yInt);
1003+
_ = int.TryParse(y.Trim().AsSpan(0, y.Length - 1), System.Globalization.NumberStyles.AllowThousands, null, out yInt);
10021004
}
10031005
return xInt.CompareTo(yInt);
10041006
}

0 commit comments

Comments
 (0)