[Test fix] Test failure: tracing_eventsource._eventpipeandetw_eventpipeandetw_eventpi...

- Fixes dotnet/coreclr#19302

Commit migrated from https://github.com/dotnet/coreclr/commit/95207c60d472047aeb1688d04f23b77216aafeae

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index 20f0fec..3e271da 100644 (file)
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -40,7 +40,7 @@
     <IbcDataPackageVersion>99.99.99-master-20190208.1</IbcDataPackageVersion>
     <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
-    <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.34</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
+    <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.36</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
     <CommandLineParserVersion>2.2.0</CommandLineParserVersion>
 
     <!-- Scenario tests install this version of Microsoft.NetCore.App, then patch coreclr binaries via xcopy. At the moment it is
@@ -91,7 +91,7 @@
       <BuildInfoPath>$(BaseDotNetBuildInfo)optimization/$(DependencyBranch)/IBC</BuildInfoPath>
       <CurrentRef>$(IbcDataCurrentRef)</CurrentRef>
     </RemoteDependencyBuildInfo>
-    
+
     <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
       <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
     </DependencyBuildInfo>

diff --git a/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj b/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
index d8e0b99..6962042 100644 (file)
--- a/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
+++ b/src/coreclr/tests/src/tracing/eventsource/eventpipeandetw/eventpipeandetw.csproj
@@ -16,7 +16,13 @@
 
     <!-- Test unsupported outside of windows -->
     <TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
-    <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
+
+    <!--
+      Test is blocking official build, disabling it for now.
+      For more information check: #19302, #22045, #22826.
+      Issue to re-enable test tracked by #22891.
+      -->
+    <DisableProjectBuild>true</DisableProjectBuild>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup>