зеркало из https://github.com/dotnet/msbuild.git
Merge branches 'proto/binfmt-condt-changewave' and 'translate-null-for-new-field' into vs17.8
And bump version to 17.8.1
This commit is contained in:
Коммит
585e09762f
|
@ -2,7 +2,7 @@
|
|||
<!-- 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. -->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>17.8.0</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
|
||||
<VersionPrefix>17.8.1</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
|
||||
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
|
||||
<AssemblyVersion>15.1.0.0</AssemblyVersion>
|
||||
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
|
||||
using System;
|
||||
|
@ -436,7 +436,7 @@ namespace Microsoft.Build.BackEnd
|
|||
private void HandleTaskHostTaskComplete(TaskHostTaskComplete taskHostTaskComplete)
|
||||
{
|
||||
#if FEATURE_REPORTFILEACCESSES
|
||||
if (taskHostTaskComplete.FileAccessData.Count > 0)
|
||||
if (taskHostTaskComplete.FileAccessData?.Count > 0)
|
||||
{
|
||||
IFileAccessManager fileAccessManager = ((IFileAccessManager)_buildComponentHost.GetComponent(BuildComponentType.FileAccessManager));
|
||||
foreach (FileAccessData fileAccessData in taskHostTaskComplete.FileAccessData)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
|
||||
using System;
|
||||
|
@ -245,6 +245,9 @@ namespace Microsoft.Build.BackEnd
|
|||
translator.TranslateDictionary(ref _buildProcessEnvironment, StringComparer.OrdinalIgnoreCase);
|
||||
#if FEATURE_REPORTFILEACCESSES
|
||||
translator.Translate(ref _fileAccessData);
|
||||
#else
|
||||
bool hasFileAccessData = false;
|
||||
translator.Translate(ref hasFileAccessData);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче