From 725525a747d7dc96335e6419e293fef6f40f0589 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Tue, 22 Mar 2016 13:36:41 -0700 Subject: [PATCH 1/4] Move NOETW define from framework to configuration In System.Management.Automation we want to build ETW events for CORECLR on windows --- src/System.Management.Automation/project.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 8cecdd245c..800f381a6d 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -11,7 +11,7 @@ "configurations": { "Linux": { "compilationOptions": { - "define": [ "LINUX" ] + "define": [ "LINUX", "NOETW" ] } } }, @@ -24,10 +24,11 @@ "netstandard1.5": { "imports": [ "dnxcore50" ], "compilationOptions": { - "define": [ "CORECLR", "NOETW" ] + "define": [ "CORECLR" ] }, "dependencies": { - "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*", + "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*", + "Microsoft.PowerShell.CoreCLR.Eventing": "1.0.0-*", "Microsoft.CSharp": "4.0.1-rc2-23921", "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc2-23921", From e0a4363ca3cec4c366fa0be62ac796fc33c72932 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Tue, 22 Mar 2016 13:37:43 -0700 Subject: [PATCH 2/4] Bump submodules versions to include ETW changes --- src/monad | 2 +- src/windows-build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/monad b/src/monad index 700a59d46f..7f8e5dd2f5 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit 700a59d46f92d1aae68ba69adfa4767c11ecd74e +Subproject commit 7f8e5dd2f54dbc4d44f4095ff67fae4224431309 diff --git a/src/windows-build b/src/windows-build index 7df8aef262..03767adae4 160000 --- a/src/windows-build +++ b/src/windows-build @@ -1 +1 @@ -Subproject commit 7df8aef26282debebd31845135ece9ce85b781e3 +Subproject commit 03767adae4b0d42b48f6fcd5f97f3b673d176356 From b73e6da8e83b4bed5e7e7aa7e6ee7ee9ce03c14b Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Tue, 22 Mar 2016 13:42:22 -0700 Subject: [PATCH 3/4] Add Microsoft.PowerShell.CoreCLR.Eventing project --- .../AssemblyInfo.cs | 5 ++ .../project.json | 73 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs create mode 100644 src/Microsoft.PowerShell.CoreCLR.Eventing/project.json diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs new file mode 100644 index 0000000000..ddc37ef73c --- /dev/null +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs @@ -0,0 +1,5 @@ +using System.Runtime.CompilerServices; +using System.Reflection; +[assembly:InternalsVisibleTo("System.Management.Automation")] +[assembly:AssemblyFileVersionAttribute("1.0.0.0")] +[assembly:AssemblyVersion("1.0.0.0")] diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json new file mode 100644 index 0000000000..0f5612298f --- /dev/null +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json @@ -0,0 +1,73 @@ +{ + "name": "Microsoft.PowerShell.CoreCLR.Eventing", + "version": "1.0.0-*", + "authors": [ "sevoroby" ], + + "compilationOptions": { + "warningsAsErrors": true, + "allowUnsafe": true + }, + + "configurations": { + "Linux": { + "compilationOptions": { + "define": [ "NOETW" ] + } + } + }, + + "frameworks": { + "netstandard1.5": { + "imports": [ "dnxcore50" ], + "compilationOptions": { + "define": [ "CORECLR" ] + }, + "dependencies": { + "NETStandard.Library": "1.5.0-rc2-23921", + "System.Security.Principal": "4.0.1-rc2-23921", + "System.Security.Principal.Windows": "4.0.0-rc2-23921", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23921", + "System.Security.SecureString": "1.0.0-*" + } + } + }, + + "compile": [ "../windows-build/gen/CORECLR_EVENTING/*.cs" ], + + "compileFiles": [ + "../monad/monad/src/DotNetCode/Eventing/EventDescriptor.cs", + "../monad/monad/src/DotNetCode/Eventing/EventProvider.cs", + "../monad/monad/src/DotNetCode/Eventing/EventProviderTraceListener.cs", + "../monad/monad/src/DotNetCode/Eventing/UnsafeNativeMethods.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/CoTaskMemSafeHandle.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/CoTaskMemUnicodeSafeHandle.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventBookmark.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventKeyword.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLevel.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogConfiguration.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogException.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogHandle.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogInformation.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogLink.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogPropertySelector.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogQuery.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogReader.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogRecord.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogSession.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventLogStatus.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventMetadata.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventOpcode.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventProperty.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventPropertyContext.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventRecord.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/EventTask.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/NativeWrapper.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/ProviderMetadata.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/ProviderMetadataCachedInformation.cs", + "../monad/monad/src/DotNetCode/Eventing/Reader/Winmeta.cs" + ], + + "namedResource": { + "DotNetEventingStrings": "../windows-build/gen/CORECLR_EVENTING/DotNetEventingStrings.resources" + } +} From f742cad86077e2cd820402ef7da3a8154dbca267 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Tue, 22 Mar 2016 14:20:57 -0700 Subject: [PATCH 4/4] Bump submodule version to include !NOETW guards --- src/monad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monad b/src/monad index 7f8e5dd2f5..860eb5d211 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit 7f8e5dd2f54dbc4d44f4095ff67fae4224431309 +Subproject commit 860eb5d211b8fff4e015ac59ccb58da2f59a6b58