Skip to content

Commit 57e2f53

Browse files
TuatanTuatan
authored
Merge pull request #34 from Microsoft/develop
2.1.1 release
2 parents 7cd3813 + e78bc40 commit 57e2f53

File tree

130 files changed

+2140
-3359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+2140
-3359
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![Nuget](https://img.shields.io/nuget/vpre/Tx.All.svg)](https://www.nuget.org/packages/Tx.All/)
2-
![Build](https://ecs10.visualstudio.com/_apis/public/build/definitions/79dfec19-0be4-4364-86ec-b0b3146b0dc3/19/badge)
2+
[![Build status](https://ci.appveyor.com/api/projects/status/6n09scr9d74lb9vp?svg=true)](https://ci.appveyor.com/project/SergeyBaranchenkov/tx-6doyh)
33

44
# Tx (LINQ to Logs and Traces)
55

‎References/LinqPad/LINQPad.exe‎

12.3 MB
Binary file not shown.

‎References/LinqPad/LINQPad.exe.config‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,48 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup useLegacyV2RuntimeActivationPolicy="true">
4-
<supportedRuntime version="v4.0"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
55
</startup>
66
<runtime>
77
<legacyUnhandledExceptionPolicy enabled="1" />
8+
<loadFromRemoteSources enabled="true" />
9+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
10+
<dependentAssembly>
11+
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
12+
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
13+
</dependentAssembly>
14+
<dependentAssembly>
15+
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
17+
</dependentAssembly>
18+
<dependentAssembly>
19+
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
20+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
21+
</dependentAssembly>
22+
<dependentAssembly>
23+
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
24+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
25+
</dependentAssembly>
26+
<dependentAssembly>
27+
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
28+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
29+
</dependentAssembly>
30+
<dependentAssembly>
31+
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
32+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
33+
</dependentAssembly>
34+
<dependentAssembly>
35+
<assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
36+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
37+
</dependentAssembly>
38+
<dependentAssembly>
39+
<assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
40+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
41+
</dependentAssembly>
42+
<probing privatePath="ngen003" />
43+
</assemblyBinding>
844
</runtime>
45+
<appSettings>
46+
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
47+
</appSettings>
948
</configuration>

‎Samples/LinqPad/Queries/create_samples_package.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
del c:\bin\samples.zip
2-
..\..\..\Tools\zip -r c:\bin\samples.zip header.xml NoManifest HTTP.sys IE_IIS "Performance Counters" SqlXevent WcfTroubleshooting
1+
if exist %1 del %1 || goto failFast
2+
..\..\..\Tools\zip -r %1 header.xml NoManifest HTTP.sys IE_IIS "Performance Counters" SqlXevent WcfTroubleshooting

‎Source/AssemblyInfo.cs‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Source/Build.cmd‎

Lines changed: 59 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,81 @@
1-
set bin="c:\Bin"
1+
set sourceFolder=%~dp0
2+
set dropFolder=%~dp0
23

3-
if not exist "%bin%" mkdir %bin% || goto failFast
4+
(
5+
set /p versionParam=
6+
)<%sourceFolder%version.txt
47

5-
if "%1"=="NoBuild" goto noBuild
8+
echo %versionParam%
69

7-
pushd %~dp0
8-
9-
msbuild Tx.sln /p:Configuration=Release45 /p:Platform="Any CPU" || goto failFast
10-
msbuild Tx.sln /p:Configuration=Debug45 /p:Platform="Any CPU" || goto failFast
10+
rem set msbuildPath="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe"
11+
set msbuildPath="msbuild"
1112

13+
pushd
14+
cd /d %sourceFolder%SetVersion || goto failFast
15+
dotnet restore || goto failFast
16+
dotnet msbuild /p:Configuration=Release || goto failFast
1217
popd
1318

14-
:noBuild
19+
pushd %sourceFolder%..\Samples\LinqPad\Queries || goto failFast
20+
call create_samples_package.cmd %dropFolder%samples.zip
21+
popd
1522

16-
copy ..\tools\NuGet.exe %bin%\ || goto failFast
17-
copy ..\tools\zip.exe %bin%\ || goto failFast
18-
copy ..\tools\PushPackages.cmd %bin%\ || goto failFast
23+
call :pack Tx.Core || goto failFast
24+
call :pack Tx.Windows || goto failFast
25+
call :pack Tx.Bond || goto failFast
26+
call :pack Tx.Network || goto failFast
27+
call :pack Tx.SqlServer || goto failFast
1928

20-
pushd ..\Samples\LinqPad\Queries || goto failFast
21-
call create_samples_package.cmd
29+
pushd
30+
%sourceFolder%SetVersion\bin\Release\SetVersion.exe %versionParam% %sourceFolder%Tx.Windows.TypeGeneration\Tx.Windows.TypeGeneration.csproj || goto failFast
31+
cd /d %sourceFolder%Tx.Windows.TypeGeneration || goto failFast
32+
dotnet restore || goto failFast
33+
dotnet build -c=Release || goto failFast
34+
%sourceFolder%SetVersion\bin\Release\SetVersion.exe %versionParam% %sourceFolder%EtwEventTypeGen\EtwEventTypeGen.csproj || goto failFast
35+
%sourceFolder%SetVersion\bin\Release\SetVersion.exe %versionParam% %sourceFolder%EtwEventTypeGen\Properties\Tx.Windows.TypeGeneration.nuspec || goto failFast
36+
cd /d %sourceFolder%EtwEventTypeGen || goto failFast
37+
dotnet restore || goto failFast
38+
dotnet build -c=Release || goto failFast
39+
copy %sourceFolder%EtwEventTypeGen\Properties\Tx.Windows.TypeGeneration.nuspec %sourceFolder%EtwEventTypeGen\bin\Release\net45\ || goto failFast
40+
cd /d %sourceFolder%EtwEventTypeGen\bin\Release\net45 || goto failFast
41+
%sourceFolder%..\tools\NuGet pack Tx.Windows.TypeGeneration.nuspec || goto failFast
42+
move %sourceFolder%EtwEventTypeGen\bin\Release\net45\Tx.Windows.TypeGeneration.%versionParam%*.nupkg %dropFolder% || goto failFast
2243
popd
2344

2445
pushd
25-
26-
cd /d %bin%\Debug || goto failFast
27-
call :setVersion || goto failFast
28-
call :packAll || goto failFast
29-
30-
cd /d %bin%\Release || goto failFast
31-
call :setVersion || goto failFast
32-
call :packAll || goto failFast
33-
34-
cd /d %bin%\Release\Net45 || goto failFast
35-
..\..\zip.exe ..\..\Tx.LinqPad.lpx header.xml System.Reactive.Interfaces.dll System.Reactive.Core.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Forms.dll Tx.Core.dll Tx.Windows.dll Tx.Windows.TypeGeneration.dll Tx.SqlServer.dll msvcr100.dll xe.dll Microsoft.SqlServer.XE.Core.dll Microsoft.SqlServer.XEvent.Configuration.dll Microsoft.SqlServer.XEvent.dll Microsoft.SqlServer.XEvent.Linq.dll Microsoft.SqlServer.XEvent.Targets.dll Tx.LinqPad.dll HTTP_Server.man HTTP_Server.etl BasicPerfCounters.blg CrossMachineHTTP.etl CrossMachineIE.etl IE_Client.man sqltrace.xel Microsoft.Windows.ApplicationServer.Applications.man SampleWcfTrace.etl || goto failFast
36-
46+
%sourceFolder%SetVersion\bin\Release\SetVersion.exe %versionParam% %sourceFolder%Tx.Linqpad\Tx.Linqpad.csproj || goto failFast
47+
cd /d %sourceFolder%Tx.Linqpad || goto failFast
48+
dotnet restore || goto failFast
49+
%msbuildPath% /p:Configuration=Release || goto failFast
50+
cd /d %sourceFolder%Tx.Linqpad\bin\Release\net46 || goto failFast
51+
%sourceFolder%..\tools\zip.exe %dropFolder%Tx.LinqPad.lpx header.xml System.Reactive.Interfaces.dll System.Reactive.Core.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Forms.dll Tx.Core.dll Tx.Windows.dll Tx.Windows.TypeGeneration.dll Tx.SqlServer.dll %sourceFolder%..\References\XEvent\msvcr100.dll %sourceFolder%..\References\XEvent\xe.dll Microsoft.SqlServer.XE.Core.dll Microsoft.SqlServer.XEvent.Configuration.dll Microsoft.SqlServer.XEvent.dll Microsoft.SqlServer.XEvent.Linq.dll Microsoft.SqlServer.XEvent.Targets.dll Tx.LinqPad.dll HTTP_Server.man HTTP_Server.etl BasicPerfCounters.blg CrossMachineHTTP.etl CrossMachineIE.etl IE_Client.man sqltrace.xel Microsoft.Windows.ApplicationServer.Applications.man SampleWcfTrace.etl || goto failFast
3752
popd
38-
goto end
3953

40-
:setVersion
41-
42-
pushd Net45\Properties || goto failFast
43-
..\SetVersion.exe || goto failFast
54+
pushd
55+
%sourceFolder%SetVersion\bin\Release\SetVersion.exe %versionParam% %sourceFolder%Tx.All\Tx.All.nuspec || goto failFast
56+
cd /d %sourceFolder%Tx.All || goto failFast
57+
%sourceFolder%..\tools\NuGet pack Tx.All.nuspec || goto failFast
58+
move %sourceFolder%Tx.All\Tx.All.*.nupkg %dropFolder%\ || goto failFast
4459
popd
4560

46-
exit /b 0
61+
cd %dropFolder%
62+
del /q Tx.%versionParam%.zip
63+
%sourceFolder%..\tools\zip.exe Tx.%versionParam%.zip samples.zip Tx.LinqPad.lpx || goto failFast
4764

48-
:packAll
49-
call :pack Tx.Core || goto failFast
50-
call :pack Tx.Windows || goto failFast
51-
call :pack Tx.Bond || goto failFast
52-
call :pack Tx.Network || goto failFast
53-
call :pack Tx.Windows.TypeGeneration || goto failFast
54-
call :pack Tx.SqlServer || goto failFast
55-
call :pack Tx.All || goto failFast
65+
for /f "usebackq delims=|" %%f in (`dir /b "*.nupkg"`) do %sourceFolder%..\tools\zip.exe Tx.%versionParam%.zip %%f
5666

57-
exit /b 0
67+
goto end
5868

5969
:pack %1
60-
call Net45\Properties\%1.Layout.cmd || goto failFast
61-
cd /d %1 || goto failFast
62-
copy ..\Net45\Properties\%1.nuspec || goto failFast
63-
..\..\NuGet pack %1.nuspec || goto failFast
64-
move *.nupkg ..\ || goto failFast
65-
cd ..
66-
rd /s/q %1 || goto failFast
67-
exit /b 0
70+
71+
%sourceFolder%SetVersion\bin\Release\SetVersion.exe %versionParam% %sourceFolder%%1\%1.csproj || goto failFast
72+
73+
pushd
74+
cd /d %sourceFolder%%1 || goto failFast
75+
dotnet restore || goto failFast
76+
dotnet build -c=Release || goto failFast
77+
move %sourceFolder%%1\bin\Release\%1.*.nupkg %dropFolder% || goto failFast
78+
popd
6879

6980
:end
7081
cd %~dp0

‎Source/EtwEventTypeGen/EtwEventTypeGen.csproj‎

Lines changed: 4 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{D8051D89-46E1-47E0-AA9A-9B352AE3CC11}</ProjectGuid>
94
<OutputType>Exe</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>Microsoft.Etw</RootNamespace>
12-
<AssemblyName>EtwEventTypeGen</AssemblyName>
13-
<FileAlignment>512</FileAlignment>
14-
<SccProjectName>
15-
</SccProjectName>
16-
<SccLocalPath>
17-
</SccLocalPath>
18-
<SccAuxPath>
19-
</SccAuxPath>
20-
<SccProvider>
21-
</SccProvider>
5+
<TargetFramework>net45</TargetFramework>
6+
<Version>2.1.1</Version>
227
</PropertyGroup>
23-
<Import Project="..\..\Common.targets" />
24-
<PropertyGroup>
25-
<CPReferencePath>..\..\References\$(BuildFlavor)</CPReferencePath>
26-
</PropertyGroup>
27-
<PropertyGroup>
28-
<SignAssembly>true</SignAssembly>
29-
</PropertyGroup>
30-
<PropertyGroup>
31-
<AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="Accessibility">
35-
<EmbedInteropTypes>True</EmbedInteropTypes>
36-
</Reference>
37-
<Reference Include="System" />
38-
<Reference Include="System.Core" />
39-
<Reference Include="System.Xml.Linq" />
40-
<Reference Include="Microsoft.CSharp" />
41-
<Reference Include="System.Xml" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="Program.cs" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<None Include="..\key.snk" />
48-
</ItemGroup>
498
<ItemGroup>
50-
<ProjectReference Include="..\Tx.Windows.TypeGeneration\Tx.Windows.TypeGeneration.csproj">
51-
<Project>{a4517abd-d558-42f3-8fe4-2a6ba3074014}</Project>
52-
<Name>Tx.Windows.TypeGeneration</Name>
53-
</ProjectReference>
54-
<ProjectReference Include="..\Tx.Windows\Tx.Windows.csproj">
55-
<Project>{c4043abb-ec40-4194-b15b-c0d13c2cf5c8}</Project>
56-
<Name>Tx.Windows</Name>
57-
</ProjectReference>
9+
<ProjectReference Include="..\Tx.Windows.TypeGeneration\Tx.Windows.TypeGeneration.csproj" />
5810
</ItemGroup>
59-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
60-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61-
Other similar extension points exist, see Microsoft.Common.targets.
62-
<Target Name="BeforeBuild">
63-
</Target>
64-
<Target Name="AfterBuild">
65-
</Target>
66-
-->
6711
</Project>

‎Source/EtwEventTypeGen/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎Source/EtwEventTypeGen/Properties/Tx.Windows.TypeGeneration.nuspec‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package>
3+
<metadata>
4+
<id>Tx.Windows.TypeGeneration</id>
5+
<title>Tx.Windows.TypeGeneration</title>
6+
<!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
7+
<version>2.1.1</version>
8+
<description>Tx (LINQ to Logs and Traces) components for generation of C# types representing Event Tracing for Windows (ETW) and Event Log events</description>
9+
<authors>Microsoft</authors>
10+
<copyright>Copyright © Microsoft. All Rights Reserved</copyright>
11+
<projectUrl>http://tx.codeplex.com</projectUrl>
12+
<licenseUrl>http://tx.codeplex.com/license</licenseUrl>
13+
<language>en-us</language>
14+
<tags>Tx Traces Logs Playback Replay ETW</tags>
15+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
16+
<dependencies>
17+
<dependency id="Tx.Windows" version="2.1.1" />
18+
</dependencies>
19+
</metadata>
20+
<files>
21+
<file src="Tx.Windows.TypeGeneration.dll" target="lib\net45" />
22+
<file src="Tx.Windows.TypeGeneration.pdb" target="lib\net45" />
23+
<file src="Tx.Windows.TypeGeneration.xml" target="lib\net45" />
24+
<file src="EtwEventTypeGen.exe" target="tools\net45" />
25+
<file src="EtwEventTypeGen.pdb" target="tools\net45" />
26+
</files>
27+
</package>

‎Source/SetVersion/App.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
5+
</startup>
6+
</configuration>

0 commit comments

Comments
 (0)