Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderVersion>2.0.0</MicrosoftDiaSymReaderVersion>
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
<TraceEventVersion>3.1.28</TraceEventVersion>
<TraceEventVersion>3.1.16</TraceEventVersion>
<MicrosoftDiagnosticsNetCoreClientVersion>0.2.621003</MicrosoftDiagnosticsNetCoreClientVersion>
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
Expand All @@ -144,7 +144,6 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.6.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftOneCollectRecordTraceVersion>0.1.32221</MicrosoftOneCollectRecordTraceVersion>
<NUnitVersion>3.12.0</NUnitVersion>
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
<CoverletCollectorVersion>6.0.4</CoverletCollectorVersion>
Expand Down
16 changes: 0 additions & 16 deletions src/tests/Common/helixpublishwitharcade.proj
Original file line number Diff line number Diff line change
Expand Up @@ -414,28 +414,12 @@
<XUnitLogCheckerCommand>$(XUnitLogCheckerHelixPath)XUnitLogChecker$(ExeSuffix) $(XUnitLogCheckerArgs)</XUnitLogCheckerCommand>
</PropertyGroup>

<ItemGroup>
<_ExtraTestExecutablesListFiles Remote="@(_ExtraTestExecutablesListFiles)" />
<_ExtraTestExecutablesListFiles Include="@(_MergedPayloadFiles)"
Condition="$([System.String]::Copy('%(Identity)').ToLower().EndsWith('helix-extra-executables.list'))" />
<_ExtraTestExecutables Remove="@(_ExtraTestExecutables)" />
</ItemGroup>
<ReadLinesFromFile File="%(_ExtraTestExecutablesListFiles.Identity)" Condition="'@(_ExtraTestExecutablesListFiles)' != ''">
<Output TaskParameter="Lines" ItemName="_ExtraTestExecutables" />
</ReadLinesFromFile>
<ItemGroup>
<_ExtraTestExecutables Remove="@(_ExtraTestExecutables)" Condition="'%(Identity)' == ''" />
</ItemGroup>

<ItemGroup>
<!-- We need to ensure that the test run script is marked as executable. -->
<HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' == 'true'" Include="set TEST_HARNESS_STRIPE_TO_EXECUTE=.0.1" />
<HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="export TEST_HARNESS_STRIPE_TO_EXECUTE=.0.1" />
<HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true'" Include="chmod +x $(_MergedWrapperRunScriptRelative)" />

<!-- Tests may depend on other executables. Copying files to Helix removes execute permissions, so mark them as executable as well. -->
<HelixCommandLines Condition="'$(TestWrapperTargetsWindows)' != 'true' and Exists('$(TestBinDir)%(Identity)')" Include="@(_ExtraTestExecutables->'chmod +x %(Identity)')" />

<HelixCommandLines Include="$(_WorkaroundForNuGetMigrations)" />

<!-- Force assemblies to lazy-load for LLVM AOT test runs to enable using tests that fail at AOT time (and as a result can't be AOTd) -->
Expand Down
1 change: 0 additions & 1 deletion src/tests/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<RestoreProjects Include="Common\XHarnessRunnerLibrary\XHarnessRunnerLibrary.csproj" />
<RestoreProjects Include="Common\external\external.csproj" />
<RestoreProjects Include="Common\ilasm\ilasm.ilproj" />
<RestoreProjects Include="tracing\userevents\common\userevents_common.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/tests/issues.targets
Original file line number Diff line number Diff line change
Expand Up @@ -1535,9 +1535,6 @@
<ExcludeList Include="$(XunitTestBinBase)/baseservices/exceptions/UnhandledExceptionHandler/NoEffectInMainThread/*">
<Issue>Test issue. The test relies on overriding the process return code.</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/tracing/userevents/**">
<Issue>Record-Trace's diagnostic port detection logic relies on memfd-based double mapping</Issue>
</ExcludeList>
</ItemGroup>

<!-- Known failures for mono runtime on Windows -->
Expand Down
29 changes: 0 additions & 29 deletions src/tests/tracing/userevents/README.md

This file was deleted.

182 changes: 0 additions & 182 deletions src/tests/tracing/userevents/activity/activity.cs

This file was deleted.

19 changes: 0 additions & 19 deletions src/tests/tracing/userevents/activity/activity.csproj

This file was deleted.

5 changes: 0 additions & 5 deletions src/tests/tracing/userevents/activity/activity.script

This file was deleted.

63 changes: 0 additions & 63 deletions src/tests/tracing/userevents/basic/basic.cs

This file was deleted.

19 changes: 0 additions & 19 deletions src/tests/tracing/userevents/basic/basic.csproj

This file was deleted.

2 changes: 0 additions & 2 deletions src/tests/tracing/userevents/basic/basic.script

This file was deleted.

6 changes: 0 additions & 6 deletions src/tests/tracing/userevents/common/NuGet.config

This file was deleted.

Loading
Loading