Skip to content

Commit 82d8ccb

Browse files
vancemvancem
authored
Merge pull request #504 from vancem/UpdateVersions
Update the version numbers for both TraceEvent and PerfView
2 parents 10fce89 + dda66f4 commit 82d8ccb

12 files changed

+113
-47
lines changed

‎README.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# PerfView OverView
12
PerfView is a free performance-analysis tool that helps isolate CPU and memory-related performance issues. It is a Windows tool, but it also has some support for analyzing data collected on Linux machines. It works for a wide variety of scenarios, but has a number of special features for investigating performance issues in code written for the .NET runtime.
23

34
If you are unfamiliar with PerfView, there are [PerfView video tutorials](http://channel9.msdn.com/Series/PerfView-Tutorial).
@@ -167,7 +168,20 @@ The code is broken into several main sections:
167168
* Zip - a clone of System.IO.Compression.dll so that PerfView can run on pre V4.5 runtimes (probably will delete)
168169
* [HtmlJs](src/HtmlJs/Readme.md) - contains a version of the GUI based on HTML and JavaScript (for Linux support). (experimental)
169170

170-
### Other Documenation
171+
# The TraceEvent Library (Nuget Package)
172+
173+
PerfView is built on top of a stand alone Nuget package called Microsoft.Diagnostics.Tracing (or TraceEvent for short).
174+
You can download it from [Nuget's TraceEvent page](https://www.nuget.org/packages/Microsoft.Diagnostics.Tracing.TraceEvent/) or
175+
by using the Nuget tool or visual studio to reference the package.
176+
177+
This package does most of the hard work of creating and parsing the event data generated by the operating system
178+
and organizing it in interesting ways. PerfView can be thought of as a GUI veneer over this library. Thus
179+
if you had need to do automated monitoring or want to use the data you see in PerfView in ways that don't make
180+
sense as an extension to PerfView, you can use the TraceEvent library to do this.
181+
182+
See the [TraceEvent Library Documentation](documentation/TraceEvent/TraceEventLibrary.md) for more.
183+
184+
### Other Documentation
171185

172186
These docs are for specialized scenarios
173187

‎documentation/TraceEvent/TraceEventLibrary.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
# The Microsoft.Diagnostics.Tracing.TraceEvent Library
3+
4+
5+
6+
* [TraceEvent Programmers Guide](./TraceEventProgrammersGuide.md) - To understand the
7+
basic architecture and usefulness from a programmer's perspective.
8+
9+
10+
11+
* Samples - TODO
12+
13+
* Release Notes - the [Releases](https://github.com/Microsoft/perfview/releases) page
14+
for PerfView also shows the releases for the TraceEvent library. Note that PerfView's
15+
version numbers and TraceEvent Version numbers are not kept in lock step.
16+
The version numbers that begin with T are for TraceEvent, the ones with V coorespond to PerfView.

‎documentation/TraceEventProgrammersGuide.md ‎documentation/TraceEvent/TraceEventProgrammersGuide.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# The TraceEvent Library Programmers Guide
2-
3-
Vance Morrison
1+
# The TraceEvent Library Programmers Guide
42

53
## Introduction: Strongly Typed (Semantic) Logging
64

‎documentation/publicationInstructions/UpdatingPerfViewDownload.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##Tools Needed: Get the Download management Studio application
1+
## Tools Needed: Get the Download management Studio application
22

33
* http://downloadservice/managementconsole/
44

‎src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<PropertyGroup>
24-
<PerfViewVersion>1.9.71.0</PerfViewVersion>
24+
<PerfViewVersion>2.0.0.0</PerfViewVersion>
2525
</PropertyGroup>
2626

2727
<!-- versions of dependencies that more than one project use -->

‎src/FastSerialization/FastSerialization.csproj

+8-6
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,24 @@
1212
<Copyright>Copyright © Microsoft 2010</Copyright>
1313
</PropertyGroup>
1414

15+
<PropertyGroup>
16+
<DefineConstants>$(DefineConstants);GROWABLEARRAY_PUBLIC;STREAMREADER_PUBLIC;FASTSERIALIZATION_PUBLIC</DefineConstants>
17+
</PropertyGroup>
18+
19+
<!-- ******************* Signing Support *********************** -->
1520
<ItemGroup>
16-
<FilesToSign Include="$(OutDir)\Microsoft.Diagnostics.FastSerialization.dll">
21+
<FilesToSign Include="$(TargetPath)">
1722
<Authenticode>Microsoft</Authenticode>
1823
<StrongName>StrongName</StrongName>
1924
</FilesToSign>
25+
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
2026
</ItemGroup>
2127

28+
<!-- .NET Strong Name Signing -->
2229
<PropertyGroup>
23-
<DefineConstants>$(DefineConstants);GROWABLEARRAY_PUBLIC;STREAMREADER_PUBLIC;FASTSERIALIZATION_PUBLIC</DefineConstants>
2430
<SignAssembly Condition="'$(SIGNING_BUILD)'!= ''">true</SignAssembly>
2531
<DelaySign>true</DelaySign>
2632
<AssemblyOriginatorKeyFile>..\MSFT.snk</AssemblyOriginatorKeyFile>
2733
</PropertyGroup>
2834

29-
<ItemGroup>
30-
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
31-
</ItemGroup>
32-
3335
</Project>

‎src/PerfView/PerfView.csproj

+8-7
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
<FileVersion>$(PerfViewVersion)</FileVersion>
1515
</PropertyGroup>
1616

17-
<ItemGroup>
18-
<FilesToSign Include="$(OutDir)\PerfView.exe">
19-
<Authenticode>Microsoft</Authenticode>
20-
</FilesToSign>
21-
</ItemGroup>
22-
2317
<ItemGroup>
2418
<AssemblyAttribute Include="PerfView.Properties.BuildDateAttribute">
2519
<_Parameter1>$([System.DateTime]::Now.ToString(`r`))</_Parameter1>
@@ -47,7 +41,6 @@
4741
</ItemGroup>
4842

4943
<ItemGroup>
50-
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
5144
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles" Version="$(MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion)" PrivateAssets="all" />
5245
<PackageReference Include="PerfView.SupportFiles" Version="$(PerfViewSupportFilesVersion)" PrivateAssets="all" />
5346
</ItemGroup>
@@ -459,4 +452,12 @@
459452
</PropertyGroup>
460453
</Target>
461454

455+
<!-- ******************* Signing Support *********************** -->
456+
<ItemGroup>
457+
<FilesToSign Include="$(TargetPath)">
458+
<Authenticode>Microsoft</Authenticode>
459+
</FilesToSign>
460+
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
461+
</ItemGroup>
462+
462463
</Project>

‎src/PerfView/SupportFiles/UsersGuide.htm

+9
Original file line numberDiff line numberDiff line change
@@ -8077,6 +8077,15 @@ <h2>
80778077
</ul>
80788078
</li>
80798079
-->
8080+
<li>
8081+
Version 2.0.0 1/5/18
8082+
<ul>
8083+
<li> Officially update the version number to 2.0 in preparation for signing and releasing officially.
8084+
Only the version number update happens here.
8085+
</li>
8086+
8087+
</ul>
8088+
</li>
80808089
<li>
80818090
Version 1.9.71 1/3/18
80828091
<ul>

‎src/PerfView64/PerfView64.csproj

+9-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,12 @@
4444
</Resource>
4545
</ItemGroup>
4646

47-
</Project>
47+
<!-- ******************* Signing Support *********************** -->
48+
<ItemGroup>
49+
<FilesToSign Include="$(TargetPath)">
50+
<Authenticode>Microsoft</Authenticode>
51+
</FilesToSign>
52+
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
53+
</ItemGroup>
54+
55+
</Project>

‎src/TraceEvent/Microsoft.Diagnostics.Tracing.TraceEvent.nuspec

+7-5
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,21 @@
1010
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<description>
13-
Event Tracing for Windows (ETW) is a powerful logging mechanism built into the Windows OS and is used extensively in Windows. You can also log ETW events yourself code using the System.Diagnostics.Tracing.EventSource class.
13+
Event Tracing for Windows (ETW) is a powerful logging mechanism built into the Windows OS and is used extensively in Windows.
14+
You can also log ETW events yourself code using the System.Diagnostics.Tracing.EventSource class.
1415

15-
The TraceEvent library conains the classes needed to control ETW providers (including EventSources) and parse the events they emit.
16+
The TraceEvent library conains the classes needed to control ETW providers (including .NET EventSources)
17+
and parse the events they emit.
1618

1719
The library includes
1820
-- TraceEventSession which can enable ETW providers,
1921
-- EtwTraceEventSource which lets you read the stream of ETW events, and
2022
-- TraceLog which is is digested form of ETW events which include decoded stack traces associated with the events.
21-
22-
Also see the TraceEvent Samples NuGet package for example uses of this library.
23+
24+
See https://github.com/Microsoft/perfview/blob/master/documentation/TraceEvent/TraceEventLibrary.md for more.
2325
</description>
2426
<summary>TraceEvent is a .NET Framework library for capturing and analyzing ETW events.</summary>
25-
<releaseNotes>https://github.com/Microsoft/perfview/releases/tag/V$version$</releaseNotes>
27+
<releaseNotes>https://github.com/Microsoft/perfview/releases/tag/T$version$</releaseNotes>
2628
<copyright>Copyright © Microsoft Corporation</copyright>
2729
<tags>TraceEvent EventSource Microsoft ETW Event Tracing for Windows</tags>
2830
</metadata>

‎src/TraceEvent/TraceEvent.Tests/TraceEvent.Tests.csproj

+16-7
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
1515
</PropertyGroup>
1616

17-
<PropertyGroup>
18-
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
19-
<SignAssembly Condition="'$(SIGNING_BUILD)'!= ''">true</SignAssembly>
20-
<DelaySign>true</DelaySign>
21-
<AssemblyOriginatorKeyFile>..\..\MSFT.snk</AssemblyOriginatorKeyFile>
22-
</PropertyGroup>
23-
2417
<ItemGroup>
2518
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
2619
<PackageReference Include="xunit" Version="$(XunitVersion)" />
@@ -53,4 +46,20 @@
5346
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
5447
</ItemGroup>
5548

49+
<!-- ******************* Signing Support *********************** -->
50+
<!-- We don't need to actually sign this official, but we do need
51+
to use the right key because TraceEvent (which is signed)
52+
needs to give this DLL 'InternalVisibleTo' and signed DLLs
53+
can only give this to other signed DLLs. But since we run
54+
on dev machines with signing validation skipped, we can
55+
delay sign it and never real sign it. Note that we don't
56+
even delay sign it unless we are on a SIGNING_BUILD -->
57+
58+
<PropertyGroup>
59+
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
60+
<SignAssembly Condition="'$(SIGNING_BUILD)'!= ''">true</SignAssembly>
61+
<DelaySign>true</DelaySign>
62+
<AssemblyOriginatorKeyFile>..\..\MSFT.snk</AssemblyOriginatorKeyFile>
63+
</PropertyGroup>
64+
5665
</Project>

‎src/TraceEvent/TraceEvent.csproj

+22-15
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<Description>TraceEvent library.</Description>
1414
<Company>Microsoft</Company>
1515
<Copyright>Copyright © Microsoft 2010</Copyright>
16-
<Version>2.0.2.0</Version>
17-
<FileVersion>2.0.2.0</FileVersion>
18-
<InformationalVersion>2.0.2-dev</InformationalVersion>
16+
<Version>2.0.2</Version>
17+
<FileVersion>2.0.2</FileVersion>
18+
<InformationalVersion>2.0.2</InformationalVersion>
1919
<NeutralLanguage>en</NeutralLanguage>
2020

2121
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -24,12 +24,6 @@
2424
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecProperties</GenerateNuspecDependsOn>
2525
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<FilesToSign Include="$(OutDir)\Microsoft.Diagnostics.Tracing.TraceEvent.dll">
29-
<Authenticode>Microsoft</Authenticode>
30-
<StrongName>StrongName</StrongName>
31-
</FilesToSign>
32-
</ItemGroup>
3327

3428
<Target Name="SetNuspecProperties">
3529
<PropertyGroup>
@@ -40,11 +34,6 @@
4034
<PropertyGroup>
4135
<DefineConstants>$(DefineConstants);COMMAND_PUBLIC;PEFILE_PUBLIC;PERFVIEW</DefineConstants>
4236
<NoWarn>$(NoWarn),0649,0618</NoWarn>
43-
44-
<DefineConstants Condition="'$(SIGNING_BUILD)'!=''">$(DefineConstants);SIGNING_BUILD</DefineConstants>
45-
<SignAssembly Condition="'$(SIGNING_BUILD)'!= ''">true</SignAssembly>
46-
<AssemblyOriginatorKeyFile>..\MSFT.snk</AssemblyOriginatorKeyFile>
47-
<DelaySign>true</DelaySign>
4837
</PropertyGroup>
4938

5039
<!--
@@ -80,7 +69,6 @@
8069
</Choose>
8170

8271
<ItemGroup>
83-
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
8472
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles" Version="$(MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion)" />
8573
<PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
8674
</ItemGroup>
@@ -139,6 +127,7 @@
139127
<Visible>False</Visible>
140128
</None>
141129

130+
<!-- *********************************************************** -->
142131
<!-- Copying thee managed binaries explicitly should not be needed because the
143132
dependency logic should just do it for us, but for some reason ths only
144133
works for the net45 target framework and not the netstandard1.6. We
@@ -161,4 +150,22 @@
161150
<None Include="Microsoft.Diagnostics.Tracing.TraceEvent.props" />
162151
</ItemGroup>
163152

153+
154+
<!-- ******************* Signing Support *********************** -->
155+
<ItemGroup>
156+
<FilesToSign Include="$(TargetPath)">
157+
<Authenticode>Microsoft</Authenticode>
158+
<StrongName>StrongName</StrongName>
159+
</FilesToSign>
160+
<PackageReference Include="MicroBuild.Core" Version="0.2.0" />
161+
</ItemGroup>
162+
163+
<!-- .NET Strong Name Signing -->
164+
<PropertyGroup>
165+
<DefineConstants Condition="'$(SIGNING_BUILD)'!=''">$(DefineConstants);SIGNING_BUILD</DefineConstants>
166+
<SignAssembly Condition="'$(SIGNING_BUILD)'!= ''">true</SignAssembly>
167+
<DelaySign>true</DelaySign>
168+
<AssemblyOriginatorKeyFile>..\MSFT.snk</AssemblyOriginatorKeyFile>
169+
</PropertyGroup>
170+
164171
</Project>

0 commit comments

Comments
 (0)