Skip to content

Commit 04fde49

Browse files
rainersigwaldmaridematteGangWang01
committed
Merge vs17.8
Suppress package-compat warnings related to #9330. Co-authored-by: Mariana Dematte <[email protected]> Co-authored-by: Gang Wang <[email protected]>
2 parents 3a2f9ba + 195e7f5 commit 04fde49

Some content is hidden

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

52 files changed

+833
-505
lines changed

eng/dependabot/Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageVersion Include="LargeAddressAware" Version="1.0.5" />
2020
<PackageVersion Update="LargeAddressAware" Condition="'$(LargeAddressAwareVersion)' != ''" Version="$(LargeAddressAwareVersion)" />
2121

22-
<PackageVersion Include="Microsoft.BuildXL.Processes" Version="0.1.0-20230727.4.2" />
22+
<PackageVersion Include="Microsoft.BuildXL.Processes" Version="0.1.0-20230929.2" />
2323
<PackageVersion Update="Microsoft.BuildXL.Processes" Condition="'$(BuildXLProcessesVersion)' != ''" Version="$(BuildXLProcessesVersion)" />
2424

2525
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.2.2146" PrivateAssets="All" />

src/Build.UnitTests/BackEnd/TaskHostTaskComplete_Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Collections.Generic;
66
using Microsoft.Build.BackEnd;
77
using Microsoft.Build.Framework;
8-
using Microsoft.Build.Framework.FileAccess;
8+
using Microsoft.Build.Experimental.FileAccess;
99
using Microsoft.Build.Shared;
1010
using Microsoft.Build.Utilities;
1111
using Xunit;

src/Build/BackEnd/Components/Communications/DetouredNodeLauncher.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using BuildXL.Processes;
1111
using BuildXL.Utilities.Core;
1212
using Microsoft.Build.Exceptions;
13+
using Microsoft.Build.Experimental.FileAccess;
1314
using Microsoft.Build.FileAccesses;
1415
using Microsoft.Build.Internal;
1516
using Microsoft.Build.Shared;
@@ -160,20 +161,20 @@ public override void HandleDebugMessage(DebugData debugData)
160161
}
161162

162163
public override void HandleFileAccess(FileAccessData fileAccessData) => _fileAccessManager.ReportFileAccess(
163-
new Framework.FileAccess.FileAccessData(
164-
(Framework.FileAccess.ReportedFileOperation)fileAccessData.Operation,
165-
(Framework.FileAccess.RequestedAccess)fileAccessData.RequestedAccess,
164+
new Experimental.FileAccess.FileAccessData(
165+
(Experimental.FileAccess.ReportedFileOperation)fileAccessData.Operation,
166+
(Experimental.FileAccess.RequestedAccess)fileAccessData.RequestedAccess,
166167
fileAccessData.ProcessId,
167168
fileAccessData.Error,
168-
(Framework.FileAccess.DesiredAccess)fileAccessData.DesiredAccess,
169-
(Framework.FileAccess.FlagsAndAttributes)fileAccessData.FlagsAndAttributes,
169+
(Experimental.FileAccess.DesiredAccess)fileAccessData.DesiredAccess,
170+
(Experimental.FileAccess.FlagsAndAttributes)fileAccessData.FlagsAndAttributes,
170171
fileAccessData.Path,
171172
fileAccessData.ProcessArgs,
172173
fileAccessData.IsAnAugmentedFileAccess),
173174
_nodeId);
174175

175176
public override void HandleProcessData(ProcessData processData) => _fileAccessManager.ReportProcess(
176-
new Framework.FileAccess.ProcessData(
177+
new Experimental.FileAccess.ProcessData(
177178
processData.ProcessName,
178179
processData.ProcessId,
179180
processData.ParentProcessId,

src/Build/BackEnd/Components/FileAccesses/FileAccessManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using System.Threading;
1010
using Microsoft.Build.BackEnd;
1111
using Microsoft.Build.Execution;
12-
using Microsoft.Build.Framework.FileAccess;
12+
using Microsoft.Build.Experimental.FileAccess;
1313
using Microsoft.Build.Shared;
1414

1515
namespace Microsoft.Build.FileAccesses

src/Build/BackEnd/Components/FileAccesses/FileAccessReport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.Build.BackEnd;
5-
using Microsoft.Build.Framework.FileAccess;
5+
using Microsoft.Build.Experimental.FileAccess;
66

77
namespace Microsoft.Build.FileAccesses
88
{

src/Build/BackEnd/Components/FileAccesses/IFileAccessManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System;
66
using System.Threading;
77
using Microsoft.Build.BackEnd;
8-
using Microsoft.Build.Framework.FileAccess;
8+
using Microsoft.Build.Experimental.FileAccess;
99

1010
namespace Microsoft.Build.FileAccesses
1111
{

src/Build/BackEnd/Components/FileAccesses/OutOfProcNodeFileAccessManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System;
66
using System.Threading;
77
using Microsoft.Build.BackEnd;
8-
using Microsoft.Build.Framework.FileAccess;
8+
using Microsoft.Build.Experimental.FileAccess;
99
using Microsoft.Build.Shared;
1010

1111
namespace Microsoft.Build.FileAccesses

src/Build/BackEnd/Components/FileAccesses/ProcessReport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.Build.BackEnd;
5-
using Microsoft.Build.Framework.FileAccess;
5+
using Microsoft.Build.Experimental.FileAccess;
66

77
namespace Microsoft.Build.FileAccesses
88
{

src/Build/BackEnd/Components/ProjectCache/ProjectCachePluginBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77
using Microsoft.Build.Execution;
8-
using Microsoft.Build.Framework.FileAccess;
8+
using Microsoft.Build.Experimental.FileAccess;
99

1010
namespace Microsoft.Build.Experimental.ProjectCache
1111
{

src/Build/BackEnd/Components/RequestBuilder/TaskHost.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using Microsoft.Build.Execution;
2020
using Microsoft.Build.FileAccesses;
2121
using Microsoft.Build.Framework;
22-
using Microsoft.Build.Framework.FileAccess;
22+
using Microsoft.Build.Experimental.FileAccess;
2323
using Microsoft.Build.Shared;
2424
using ElementLocation = Microsoft.Build.Construction.ElementLocation;
2525
using TaskItem = Microsoft.Build.Execution.ProjectItemInstance.TaskItem;
@@ -939,17 +939,20 @@ public override bool LogsMessagesOfImportance(MessageImportance importance)
939939
/// <inheritdoc/>
940940
public override bool IsTaskInputLoggingEnabled => _taskHost._host.BuildParameters.LogTaskInputs;
941941

942-
/// <inheritdoc/>
943-
public override void ReportFileAccess(FileAccessData fileAccessData)
944-
{
945942
#if FEATURE_REPORTFILEACCESSES
943+
/// <summary>
944+
/// Reports a file access from a task.
945+
/// </summary>
946+
/// <param name="fileAccessData">The file access to report.</param>
947+
public void ReportFileAccess(FileAccessData fileAccessData)
948+
{
946949
IBuildComponentHost buildComponentHost = _taskHost._host;
947950
if (buildComponentHost.BuildParameters.ReportFileAccesses)
948951
{
949952
((IFileAccessManager)buildComponentHost.GetComponent(BuildComponentType.FileAccessManager)).ReportFileAccess(fileAccessData, buildComponentHost.BuildParameters.NodeId);
950953
}
951-
#endif
952954
}
955+
#endif
953956
}
954957

955958
public EngineServices EngineServices { get; }

0 commit comments

Comments
 (0)