Skip to content

Commit 998e74e

Browse files
JaynieBaiJaynieBai
authored
Merge branch 'main' into darc-main-7005720d-a3a0-48d6-9e1c-8caed0e65f9e
2 parents 73849cf + bcc2dc6 commit 998e74e

File tree

196 files changed

+1322
-1331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+1322
-1331
lines changed

‎.exp-insertions.yml‎

Lines changed: 0 additions & 236 deletions
This file was deleted.

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,13 @@
141141
<Uri>https://github.com/nuget/nuget.client</Uri>
142142
<Sha>181b65dad9f440c7a31fe673abc59c258f224ada</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25157.4">
144+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25164.10">
145145
<Uri>https://github.com/dotnet/roslyn</Uri>
146-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
146+
<Sha>517e95f9430d387e0e387a23fa2c8351a0863c4a</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25157.4">
148+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25164.10">
149149
<Uri>https://github.com/dotnet/roslyn</Uri>
150-
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
150+
<Sha>517e95f9430d387e0e387a23fa2c8351a0863c4a</Sha>
151151
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
152152
</Dependency>
153153
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25164.2">

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.14.0</VersionPrefix>
6-
<PackageValidationBaselineVersion>17.13.0-preview-24611-01</PackageValidationBaselineVersion>
5+
<VersionPrefix>17.15.0</VersionPrefix>
6+
<PackageValidationBaselineVersion>17.14.0-preview-25161-14</PackageValidationBaselineVersion>
77
<AssemblyVersion>15.1.0.0</AssemblyVersion>
88
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
99
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
@@ -78,7 +78,7 @@
7878
<DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1))</DotNetCliVersion>
7979
<MicrosoftCodeAnalysisCollectionsVersion>4.2.0-1.22102.8</MicrosoftCodeAnalysisCollectionsVersion>
8080
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25164.2</MicrosoftDotNetXUnitExtensionsVersion>
81-
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25157.4</MicrosoftNetCompilersToolsetVersion>
81+
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25164.10</MicrosoftNetCompilersToolsetVersion>
8282
<NuGetBuildTasksVersion>6.14.0-preview.1.66</NuGetBuildTasksVersion>
8383
</PropertyGroup>
8484
<PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">

‎src/Build.UnitTests/BackEnd/CacheAggregator_Tests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public void NoCachesProducesEmptyCaches()
3333
var aggregation = aggregator.Aggregate();
3434

3535
aggregation.ConfigCache.ShouldNotBeNull();
36-
aggregation.ConfigCache.GetEnumerator().ToEnumerable().ShouldBeEmpty();
36+
aggregation.ConfigCache.ShouldBeEmpty();
3737

3838
aggregation.ResultsCache.ShouldNotBeNull();
39-
aggregation.ResultsCache.GetEnumerator().ToEnumerable().ShouldBeEmpty();
39+
aggregation.ResultsCache.ShouldBeEmpty();
4040

4141
aggregation.LastConfigurationId.ShouldBe(0);
4242
}
@@ -246,9 +246,9 @@ private void AssertAggregation((ConfigCache configCache, ResultsCache resultsCac
246246
var currentConfigurationIndex = 0;
247247
var currentBuildResultIndex = 0;
248248

249-
var aggregatedConfigs = aggregation.ConfigCache.GetEnumerator().ToArray();
249+
var aggregatedConfigs = aggregation.ConfigCache.ToArray();
250250

251-
var aggregatedResults = aggregation.ResultsCache.GetEnumerator().ToArray();
251+
var aggregatedResults = aggregation.ResultsCache.ToArray();
252252

253253
foreach (var (configCache, resultsCache) in inputCaches)
254254
{

‎src/Build.UnitTests/BackEnd/ConfigCache_Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public void ConfigCacheShouldBeTranslatable(object obj)
101101
TranslationHelpers.GetReadTranslator().Translate(ref copy);
102102

103103
// test _configurations
104-
var initialConfigurations = initial.GetEnumerator().ToArray();
105-
var copiedConfigurations = copy.GetEnumerator().ToArray();
104+
var initialConfigurations = initial.ToArray();
105+
var copiedConfigurations = copy.ToArray();
106106

107107
Assert.Equal(copiedConfigurations, initialConfigurations, EqualityComparer<BuildRequestConfiguration>.Default);
108108

‎src/Build.UnitTests/BackEnd/ResultsCache_Tests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void CacheCanBeEnumerated()
8080
result2.AddResultsForTarget("result2target1", BuildResultUtilities.GetEmptyFailingTargetResult());
8181
cache.AddResult(result2);
8282

83-
var results = cache.GetEnumerator().ToArray();
83+
var results = cache.ToArray();
8484

8585
results.Length.ShouldBe(2);
8686

‎src/Build.UnitTests/FileUtilitiesRegex_Tests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,6 @@ public void PatternEmptyString_LegacyRegex()
532532
{
533533
UncPattern.IsMatch(string.Empty).ShouldBeFalse();
534534
StartsWithUncPattern.IsMatch(string.Empty).ShouldBeFalse();
535-
StartsWithUncPattern.Match(string.Empty).Success.ShouldBeFalse();
536535
}
537536

538537
[Fact]

‎src/Build.UnitTests/Globbing/MSBuildGlob_Tests.cs‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System;
5+
using System.Buffers;
56
using System.Collections.Generic;
67
using System.IO;
78
using System.Linq;
@@ -70,9 +71,12 @@ public void GlobFromRelativeGlobRootNormalizesRootAgainstCurrentDirectory()
7071
[Fact]
7172
public void GlobFromRootWithInvalidPathThrows()
7273
{
73-
foreach (var invalidPathChar in FileUtilities.InvalidPathChars)
74+
for (int i = 0; i < 128; i++)
7475
{
75-
Assert.Throws<ArgumentException>(() => MSBuildGlob.Parse(invalidPathChar.ToString(), "*"));
76+
if (FileUtilities.InvalidPathChars.Contains((char)i))
77+
{
78+
Assert.Throws<ArgumentException>(() => MSBuildGlob.Parse(((char)i).ToString(), "*"));
79+
}
7680
}
7781
}
7882

@@ -182,12 +186,15 @@ public void GlobMatchShouldReturnFalseIfArgumentContainsInvalidPathOrFileCharact
182186
{
183187
var glob = MSBuildGlob.Parse("*");
184188

185-
foreach (var invalidPathChar in FileUtilities.InvalidPathChars)
189+
for (int i = 0; i < 128; i++)
186190
{
187-
Assert.False(glob.IsMatch(invalidPathChar.ToString()));
191+
if (FileUtilities.InvalidPathChars.Contains((char)i))
192+
{
193+
Assert.False(glob.IsMatch(((char)i).ToString()));
194+
}
188195
}
189196

190-
foreach (var invalidFileChar in FileUtilities.InvalidFileNameChars)
197+
foreach (var invalidFileChar in FileUtilities.InvalidFileNameCharsArray)
191198
{
192199
if (invalidFileChar == '\\' || invalidFileChar == '/')
193200
{

‎src/Build.UnitTests/Graph/IsolateProjects_Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,8 @@ public void UndeclaredReferenceBuildResultNotPresentInOutputCache()
338338
var deserializedOutputCacheRoot = CacheSerialization.DeserializeCaches(outputCaches[topoSortedProjectGraphNodes[1]]);
339339
deserializedOutputCacheDeclaredReference.exception.ShouldBeNull();
340340
deserializedOutputCacheRoot.exception.ShouldBeNull();
341-
BuildResult[] declaredReferenceBuildResults = deserializedOutputCacheDeclaredReference.ResultsCache.GetEnumerator().ToArray();
342-
BuildResult[] rootBuildResults = deserializedOutputCacheRoot.ResultsCache.GetEnumerator().ToArray();
341+
BuildResult[] declaredReferenceBuildResults = deserializedOutputCacheDeclaredReference.ResultsCache.ToArray();
342+
BuildResult[] rootBuildResults = deserializedOutputCacheRoot.ResultsCache.ToArray();
343343

344344
// Both the root and declared reference projects should only have one build result.
345345
declaredReferenceBuildResults.Length.ShouldBe(1);

‎src/Build.UnitTests/Graph/ResultCacheBasedBuilds_Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,13 @@ public void OutputCacheShouldNotContainInformationFromInputCaches()
356356

357357
deserializationInfo.exception.ShouldBeNull();
358358

359-
var buildResults = deserializationInfo.ResultsCache.GetEnumerator().ToArray();
359+
var buildResults = deserializationInfo.ResultsCache.ToArray();
360360
buildResults.ShouldHaveSingleItem();
361361

362362
var rootNodeBuildResult = buildResults.First();
363363
rootNodeBuildResult.ResultsByTarget["Build"].Items.Select(i => i.ItemSpec).ToArray().ShouldBe(expectedOutput[rootNode]);
364364

365-
var configEntries = deserializationInfo.ConfigCache.GetEnumerator().ToArray();
365+
var configEntries = deserializationInfo.ConfigCache.ToArray();
366366
configEntries.ShouldHaveSingleItem();
367367

368368
configEntries.First().ConfigurationId.ShouldBe(rootNodeBuildResult.ConfigurationId);

0 commit comments

Comments
 (0)