Skip to content

Commit 725f29b

Browse files
authored
Update TraceEvent version (#46655)
* update TraceEvent version * remove MicrosoftDiagnosticsTracingTraceEventPackageVersion and consolidate using TraceEventVersion * Fix profiler test
1 parent b95de55 commit 725f29b

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

eng/Versions.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
127127
<NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
128128
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
129-
<MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.49</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
130129
<MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
131130
<MicrosoftDiagnosticsNETCoreClientVersion>0.2.61701</MicrosoftDiagnosticsNETCoreClientVersion>
132131
<!--
@@ -147,7 +146,7 @@
147146
<XUnitVersion>2.4.1</XUnitVersion>
148147
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
149148
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
150-
<TraceEventVersion>2.0.5</TraceEventVersion>
149+
<TraceEventVersion>2.0.64</TraceEventVersion>
151150
<NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
152151
<MoqVersion>4.12.0</MoqVersion>
153152
<FsCheckVersion>2.14.3</FsCheckVersion>

src/tests/Common/external/external.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<PackageReference Include="xunit.performance.core" Version="$(XunitPerformanceApiPackageVersion)" />
7575
<PackageReference Include="xunit.performance.execution" Version="$(XunitPerformanceApiPackageVersion)" />
7676
<PackageReference Include="xunit.performance.metrics" Version="$(XunitPerformanceApiPackageVersion)" />
77-
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)" />
77+
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(TraceEventVersion)" />
7878
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
7979
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
8080
<PackageReference Include="xunit" Version="$(XUnitVersion)" />

src/tests/performance/Scenario/JitBench/JitBench.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Version>$(CommandLineParserVersion)</Version>
1212
</PackageReference>
1313
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent">
14-
<Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version>
14+
<Version>$(TraceEventVersion)</Version>
1515
</PackageReference>
1616
<PackageReference Include="xunit.performance.api">
1717
<Version>$(XunitPerformanceApiPackageVersion)</Version>

src/tests/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Version>$(CommandLineParserVersion)</Version>
1919
</PackageReference>
2020
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent">
21-
<Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version>
21+
<Version>$(TraceEventVersion)</Version>
2222
</PackageReference>
2323
<PackageReference Include="xunit.performance.api">
2424
<Version>$(XunitPerformanceApiPackageVersion)</Version>

src/tests/profiler/native/eventpipeprofiler/eventpipewritingprofiler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ HRESULT EventPipeWritingProfiler::Initialize(IUnknown* pICorProfilerInfoUnk)
6464
0, // Keywords
6565
1, // Version
6666
COR_PRF_EVENTPIPE_LOGALWAYS, // Level
67-
12, // opcode
67+
0, // opcode
6868
true, // Needs stack
6969
allTypesParamsCount, // size of params
7070
allTypesParams, // Param descriptors

0 commit comments

Comments
 (0)