Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Share files instead of duplicating them #3692

Merged
merged 1 commit into from
May 30, 2022
Merged

Share files instead of duplicating them #3692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ....TestPlatform.Common/Utilities/TPDebug.cs → TPDebug.cs
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...taCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/EventLogDataCollector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using System.Linq;
using System.Xml;

using Microsoft.VisualStudio.TestPlatform;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
Expand Down
2 changes: 2 additions & 0 deletions ...m.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
</ItemGroup>
<ItemGroup>
<Compile Include="$(TestPlatformRoot)src\Microsoft.TestPlatform.TestHostProvider\Properties\TestExtensionTypesAttribute.cs" Link="Properties\TestExtensionTypesAttribute.cs" />
<Compile Include="..\..\..\NullableAttributes.cs" Link="NullableAttributes.cs" />
<Compile Include="..\..\..\TPDebug.cs" Link="TPDebug.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Resources.resx" />
Expand Down
153 changes: 0 additions & 153 deletions src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/NullableAttributes.cs
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/TPDebug.cs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<ItemGroup>
<Compile Include="..\..\NullableAttributes.cs" Link="NullableAttributes.cs" />
<Compile Include="..\..\scripts\build\ExternalAssemblyVersions.cs" Link="ExternalAssemblyVersions.cs" />
<Compile Include="..\..\TPDebug.cs" Link="TPDebug.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Resources.resx" />
Expand Down
23 changes: 0 additions & 23 deletions src/Microsoft.TestPlatform.Common/Utilities/Debug.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Linq;
using System.Threading.Tasks;

using Microsoft.TestPlatform;
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
Expand Down Expand Up @@ -138,7 +137,7 @@ public bool HandlePartialDiscoveryComplete(IProxyDiscoveryManager proxyDiscovery
var partiallyDiscoveredCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.PartiallyDiscovered).Count;
var fullyDiscoveredCount = _dataAggregator.GetSourcesWithStatus(DiscoveryStatus.FullyDiscovered).Count;
var expectedCount = _availableTestSources;
Debug.Assert(notDiscoveredCount + partiallyDiscoveredCount + fullyDiscoveredCount == expectedCount,
TPDebug.Assert(notDiscoveredCount + partiallyDiscoveredCount + fullyDiscoveredCount == expectedCount,
$"Total count of sources ({expectedCount}) should match the count of sources with status not discovered ({notDiscoveredCount}), partially discovered ({partiallyDiscoveredCount}) and fully discovered ({fullyDiscoveredCount}).");
#endif

Expand Down