-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from Microsoft/develop
2.1.1 release
- Loading branch information
Showing
130 changed files
with
2,140 additions
and
3,359 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,48 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <startup useLegacyV2RuntimeActivationPolicy="true"> | ||
| <supportedRuntime version="v4.0"/> | ||
| <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /> | ||
| </startup> | ||
| <runtime> | ||
| <legacyUnhandledExceptionPolicy enabled="1" /> | ||
| <loadFromRemoteSources enabled="true" /> | ||
| <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> | ||
| </dependentAssembly> | ||
| <dependentAssembly> | ||
| <assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> | ||
| <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" /> | ||
| </dependentAssembly> | ||
| <probing privatePath="ngen003" /> | ||
| </assemblyBinding> | ||
| </runtime> | ||
| <appSettings> | ||
| <add key="EnableWindowsFormsHighDpiAutoResizing" value="true" /> | ||
| </appSettings> | ||
| </configuration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| del c:\bin\samples.zip | ||
| ..\..\..\Tools\zip -r c:\bin\samples.zip header.xml NoManifest HTTP.sys IE_IIS "Performance Counters" SqlXevent WcfTroubleshooting | ||
| if exist %1 del %1 || goto failFast | ||
| ..\..\..\Tools\zip -r %1 header.xml NoManifest HTTP.sys IE_IIS "Performance Counters" SqlXevent WcfTroubleshooting |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProductVersion>8.0.30703</ProductVersion> | ||
| <SchemaVersion>2.0</SchemaVersion> | ||
| <ProjectGuid>{D8051D89-46E1-47E0-AA9A-9B352AE3CC11}</ProjectGuid> | ||
| <OutputType>Exe</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>Microsoft.Etw</RootNamespace> | ||
| <AssemblyName>EtwEventTypeGen</AssemblyName> | ||
| <FileAlignment>512</FileAlignment> | ||
| <SccProjectName> | ||
| </SccProjectName> | ||
| <SccLocalPath> | ||
| </SccLocalPath> | ||
| <SccAuxPath> | ||
| </SccAuxPath> | ||
| <SccProvider> | ||
| </SccProvider> | ||
| <TargetFramework>net45</TargetFramework> | ||
| <Version>2.1.1</Version> | ||
| </PropertyGroup> | ||
| <Import Project="..\..\Common.targets" /> | ||
| <PropertyGroup> | ||
| <CPReferencePath>..\..\References\$(BuildFlavor)</CPReferencePath> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <SignAssembly>true</SignAssembly> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="Accessibility"> | ||
| <EmbedInteropTypes>True</EmbedInteropTypes> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="Program.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="..\key.snk" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\Tx.Windows.TypeGeneration\Tx.Windows.TypeGeneration.csproj"> | ||
| <Project>{a4517abd-d558-42f3-8fe4-2a6ba3074014}</Project> | ||
| <Name>Tx.Windows.TypeGeneration</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\Tx.Windows\Tx.Windows.csproj"> | ||
| <Project>{c4043abb-ec40-4194-b15b-c0d13c2cf5c8}</Project> | ||
| <Name>Tx.Windows</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\Tx.Windows.TypeGeneration\Tx.Windows.TypeGeneration.csproj" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
| Other similar extension points exist, see Microsoft.Common.targets. | ||
| <Target Name="BeforeBuild"> | ||
| </Target> | ||
| <Target Name="AfterBuild"> | ||
| </Target> | ||
| --> | ||
| </Project> |
This file was deleted.
Oops, something went wrong.
27 changes: 27 additions & 0 deletions
27
Source/EtwEventTypeGen/Properties/Tx.Windows.TypeGeneration.nuspec
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <package> | ||
| <metadata> | ||
| <id>Tx.Windows.TypeGeneration</id> | ||
| <title>Tx.Windows.TypeGeneration</title> | ||
| <!-- Automatically updated by build, keeping fixed dev build number here in case of local build --> | ||
| <version>2.1.1</version> | ||
| <description>Tx (LINQ to Logs and Traces) components for generation of C# types representing Event Tracing for Windows (ETW) and Event Log events</description> | ||
| <authors>Microsoft</authors> | ||
| <copyright>Copyright © Microsoft. All Rights Reserved</copyright> | ||
| <projectUrl>http://tx.codeplex.com</projectUrl> | ||
| <licenseUrl>http://tx.codeplex.com/license</licenseUrl> | ||
| <language>en-us</language> | ||
| <tags>Tx Traces Logs Playback Replay ETW</tags> | ||
| <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
| <dependencies> | ||
| <dependency id="Tx.Windows" version="2.1.1" /> | ||
| </dependencies> | ||
| </metadata> | ||
| <files> | ||
| <file src="Tx.Windows.TypeGeneration.dll" target="lib\net45" /> | ||
| <file src="Tx.Windows.TypeGeneration.pdb" target="lib\net45" /> | ||
| <file src="Tx.Windows.TypeGeneration.xml" target="lib\net45" /> | ||
| <file src="EtwEventTypeGen.exe" target="tools\net45" /> | ||
| <file src="EtwEventTypeGen.pdb" target="tools\net45" /> | ||
| </files> | ||
| </package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <configuration> | ||
| <startup> | ||
| <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> | ||
| </startup> | ||
| </configuration> |
Oops, something went wrong.