Skip to content

Commit a7a4d5a

Browse files
committed
Merge remote-tracking branch 'origin/vs17.14' into internal/vs17.14
Conflicts: eng/Versions.props
2 parents 893ba73 + 18a02f8 commit a7a4d5a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
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.6</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
5+
<VersionPrefix>17.14.8</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
66
<PackageValidationBaselineVersion>17.13.9</PackageValidationBaselineVersion>
77
<AssemblyVersion>15.1.0.0</AssemblyVersion>
8-
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
8+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
99
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
1010
<!-- Workaround for https://github.com/dotnet/roslyn/issues/35793 -->
1111
<SemanticVersioningV1>true</SemanticVersioningV1>

src/Build/BackEnd/BuildManager/BuildManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ IEnumerable<ILogger> AppendDebuggingLoggers(IEnumerable<ILogger> loggers)
677677

678678
var logger = new BinaryLogger { Parameters = binlogPath };
679679

680-
return (loggers ?? [logger]);
680+
return (loggers ?? []).Concat([logger]);
681681
}
682682

683683
void InitializeCaches()

src/Tasks/GenerateResource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1705,7 +1705,7 @@ private void UpdateNewestUncorrelatedInputWriteTime()
17051705

17061706
// Check the timestamp of each of the passed-in references to find the newest;
17071707
// and then the additional inputs
1708-
ITaskItem[] inputs = this.References ?? [.. (this.AdditionalInputs ?? [])];
1708+
var inputs = (this.References ?? []).Concat(this.AdditionalInputs ?? []);
17091709

17101710
foreach (ITaskItem input in inputs)
17111711
{

0 commit comments

Comments
 (0)