Skip to content

Commit 3617a9f

Browse files
authored
Share files instead of duplicating them (#3692)
1 parent fe3a8d3 commit 3617a9f

File tree

8 files changed

+5
-200
lines changed

8 files changed

+5
-200
lines changed

src/Microsoft.TestPlatform.Common/Utilities/TPDebug.cs renamed to TPDebug.cs

File renamed without changes.

src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogDataCollector.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Linq;
1111
using System.Xml;
1212

13+
using Microsoft.VisualStudio.TestPlatform;
1314
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
1415
using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
1516
using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;

src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
</ItemGroup>
2626
<ItemGroup>
2727
<Compile Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
28+
<Compile Include="..\..\..\NullableAttributes.cs" Link="NullableAttributes.cs" />
29+
<Compile Include="..\..\..\TPDebug.cs" Link="TPDebug.cs" />
2830
</ItemGroup>
2931
<ItemGroup>
3032
<EmbeddedResource Include="Resources\Resources.resx" />

src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableAttributes.cs

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

src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/TPDebug.cs

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

src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<ItemGroup>
1515
<Compile Include="..\..\NullableAttributes.cs" Link="NullableAttributes.cs" />
1616
<Compile Include="..\..\scripts\build\ExternalAssemblyVersions.cs" Link="ExternalAssemblyVersions.cs" />
17+
<Compile Include="..\..\TPDebug.cs" Link="TPDebug.cs" />
1718
</ItemGroup>
1819
<ItemGroup>
1920
<EmbeddedResource Include="Resources\Resources.resx" />

src/Microsoft.TestPlatform.Common/Utilities/Debug.cs

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

src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Linq;
77
using System.Threading.Tasks;
88

9-
using Microsoft.TestPlatform;
109
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
1110
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
1211
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
@@ -138,7 +137,7 @@ public bool HandlePartialDiscoveryComplete(IProxyDiscoveryManager proxyDiscovery
138137
var partiallyDiscoveredCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered).Count;
139138
var fullyDiscoveredCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered).Count;
140139
var expectedCount = _availableTestSources;
141-
Debug.Assert(notDiscoveredCount + partiallyDiscoveredCount + fullyDiscoveredCount == expectedCount,
140+
TPDebug.Assert(notDiscoveredCount + partiallyDiscoveredCount + fullyDiscoveredCount == expectedCount,
142141
$"Total count of sources ({expectedCount}) should match the count of sources with status not discovered ({notDiscoveredCount}), partially discovered ({partiallyDiscoveredCount}) and fully discovered ({fullyDiscoveredCount}).");
143142
#endif
144143

0 commit comments

Comments
 (0)