Feedback

build/repo.targets

@@ -92,7 +92,6 @@
       <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\RequestHandler\bin\$(Configuration)\Win32\aspnetcorerh.pdb" Link="AspNetCoreModuleV2\x86\aspnetcorerh.pdb" />
       <!-- Schema-->
       <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore_schema.xml" Link="AspNetCoreModuleV1\aspnetcore_schema.xml" />
-      <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\ancm.mof" Link="AspNetCoreModuleV1\ancm.mof" />
       <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcore_schema.xml" Link="AspNetCoreModuleV2\aspnetcore_schema.xml" />
       <AncmFiles Include="$(RepositoryRoot)src\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\ancm.mof" Link="AspNetCoreModuleV2\ancm.mof" />
     </ItemGroup>

build/testsite.props

@@ -81,11 +81,11 @@
     </PropertyGroup>
   </Target>
 
-  <Target Name="InjectRequestHandler" AfterTargets="GenerateBuildDependencyFile" DependsOnTargets="PrepareInjectionApp">
+  <Target Name="InjectRequestHandler" AfterTargets="GenerateBuildDependencyFile" DependsOnTargets="PrepareInjectionApp" Condition="'$(ANCMVersion)' == 'V2' Or '$(ANCMVersion)' == ''">
     <Exec Command="$(InjectDepsApp) $(InjectDepsArguments) &quot;$(ProjectDepsFilePath)&quot;" />
   </Target>
 
-  <Target Name="InjectRequestHandlerOnPublish" AfterTargets="GeneratePublishDependencyFile" DependsOnTargets="PrepareInjectionApp">
+  <Target Name="InjectRequestHandlerOnPublish" AfterTargets="GeneratePublishDependencyFile" DependsOnTargets="PrepareInjectionApp" Condition="'$(ANCMVersion)' == 'V2' Or '$(ANCMVersion)' == ''">
     <Exec Command="$(InjectDepsApp) $(InjectDepsArguments) &quot;$(PublishDepsFilePath)&quot;" />
   </Target>
 

src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj

@@ -211,16 +211,12 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="ancm.mof" />
     <None Include="Source.def" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="aspnetcore_schema.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ancm.mof">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="aspnetcore_schema.xml" />
@@ -246,14 +242,11 @@
     <ClInclude Include="Inc\application.h" />
     <ClInclude Include="Inc\applicationmanager.h" />
     <ClInclude Include="Inc\aspnetcoreconfig.h" />
-    <ClInclude Include="Inc\aspnetcore_msg.h" />
     <ClInclude Include="Inc\debugutil.h" />
     <ClInclude Include="Inc\environmentvariablehash.h" />
     <ClInclude Include="Inc\filewatcher.h" />
     <ClInclude Include="Inc\forwarderconnection.h" />
     <ClInclude Include="Inc\forwardinghandler.h" />
-    <ClInclude Include="Inc\fx_ver.h" />
-    <ClInclude Include="Inc\globalmodule.h" />
     <ClInclude Include="Inc\path.h" />
     <ClInclude Include="Inc\processmanager.h" />
     <ClInclude Include="Inc\protocolconfig.h" />
@@ -279,4 +272,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+
+  <ItemGroup>
+    <CustomBuild Include="aspnetcore_msg.mc">
+      <FileType>Document</FileType>
+      <Command>mc %(FullPath)</Command>
+      <Message>Compiling Event Messages ...</Message>
+      <Outputs>%(Filename).rc;%(Filename).h;MSG0409.bin</Outputs>
+    </CustomBuild>
+  </ItemGroup>
 </Project>

src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcore_msg.h

@@ -1,127 +0,0 @@
-/*++
-
-Copyright (c) 2014 Microsoft Corporation
-
-Module Name:
-
-aspnetcore_msg.mc
-
-Abstract:
-
-Asp.Net Core Module localizable messages.
-
---*/
-
-
-#ifndef _ASPNETCORE_MSG_H_
-#define _ASPNETCORE_MSG_H_
-
-//
-//  Values are 32 bit values laid out as follows:
-//
-//   3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
-//   1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
-//  +---+-+-+-----------------------+-------------------------------+
-//  |Sev|C|R|     Facility          |               Code            |
-//  +---+-+-+-----------------------+-------------------------------+
-//
-//  where
-//
-//      Sev - is the severity code
-//
-//          00 - Success
-//          01 - Informational
-//          10 - Warning
-//          11 - Error
-//
-//      C - is the Customer code flag
-//
-//      R - is a reserved bit
-//
-//      Facility - is the facility code
-//
-//      Code - is the facility's status code
-//
-//
-// Define the facility codes
-//
-
-
-//
-// Define the severity codes
-//
-
-
-//
-// MessageId: ASPNETCORE_EVENT_PROCESS_START_ERROR
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_PROCESS_START_ERROR ((DWORD)0x000003E8L)
-
-//
-// MessageId: ASPNETCORE_EVENT_PROCESS_START_SUCCESS
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_PROCESS_START_SUCCESS ((DWORD)0x000003E9L)
-
-//
-// MessageId: ASPNETCORE_EVENT_PROCESS_CRASH
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_PROCESS_CRASH   ((DWORD)0x000003EAL)
-
-//
-// MessageId: ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED ((DWORD)0x000003EBL)
-
-//
-// MessageId: ASPNETCORE_EVENT_CONFIG_ERROR
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_CONFIG_ERROR    ((DWORD)0x000003ECL)
-
-//
-// MessageId: ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE ((DWORD)0x000003EDL)
-
-//
-// MessageId: ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST ((DWORD)0x000003EEL)
-
-//
-// MessageId: ASPNETCORE_EVENT_RECYCLE_APPOFFLINE
-//
-// MessageText:
-//
-// %1
-//
-#define ASPNETCORE_EVENT_RECYCLE_APPOFFLINE ((DWORD)0x000003F4L)
-
-#endif     // _ASPNETCORE_MODULE_MSG_H_

src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h

@@ -1,19 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
 #pragma once
 
-/*++
-
-Copyright (c) 2013 Microsoft Corporation
-
-Module Name:
-
-    forwardinghandler.h
-
-Abstract:
-
-    Handler for handling URLs from out-of-box.
-
---*/
-
 #include "forwarderconnection.h"
 #include "protocolconfig.h"
 #include "serverprocess.h"

src/AspNetCoreModuleV1/AspNetCore/Inc/fx_ver.h

@@ -1,49 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#ifndef __FX_VER_H__
-#define __FX_VER_H__
-#include <string>
-
-// Note: This is not SemVer (esp., in comparing pre-release part, fx_ver_t does not
-// compare multiple dot separated identifiers individually.) ex: 1.0.0-beta.2 vs. 1.0.0-beta.11
-struct fx_ver_t
-{
-	fx_ver_t(int major, int minor, int patch);
-	fx_ver_t(int major, int minor, int patch, const std::wstring& pre);
-	fx_ver_t(int major, int minor, int patch, const std::wstring& pre, const std::wstring& build);
-
-	int get_major() const { return m_major; }
-	int get_minor() const { return m_minor; }
-	int get_patch() const { return m_patch; }
-
-	void set_major(int m) { m_major = m; }
-	void set_minor(int m) { m_minor = m; }
-	void set_patch(int p) { m_patch = p; }
-
-	bool is_prerelease() const { return !m_pre.empty(); }
-
-	std::wstring as_str() const;
-	std::wstring prerelease_glob() const;
-	std::wstring patch_glob() const;
-
-	bool operator ==(const fx_ver_t& b) const;
-	bool operator !=(const fx_ver_t& b) const;
-	bool operator <(const fx_ver_t& b) const;
-	bool operator >(const fx_ver_t& b) const;
-	bool operator <=(const fx_ver_t& b) const;
-	bool operator >=(const fx_ver_t& b) const;
-
-	static bool parse(const std::wstring& ver, fx_ver_t* fx_ver, bool parse_only_production = false);
-
-private:
-	int m_major;
-	int m_minor;
-	int m_patch;
-	std::wstring m_pre;
-	std::wstring m_build;
-
-	static int compare(const fx_ver_t&a, const fx_ver_t& b);
-};
-
-#endif // __FX_VER_H__

src/AspNetCoreModuleV1/AspNetCore/Inc/globalmodule.h

@@ -1,37 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-#pragma once
-
-class ASPNET_CORE_GLOBAL_MODULE : public CGlobalModule
-{
-
-public:
-
-    ASPNET_CORE_GLOBAL_MODULE(
-        APPLICATION_MANAGER* pApplicationManager
-    );
-
-    ~ASPNET_CORE_GLOBAL_MODULE()
-    {
-    }
-
-    VOID Terminate()
-    {
-        // Remove the class from memory.
-        delete this;
-    }
-
-    GLOBAL_NOTIFICATION_STATUS
-    OnGlobalStopListening(
-        _In_ IGlobalStopListeningProvider * pProvider
-    );
-
-    GLOBAL_NOTIFICATION_STATUS
-    OnGlobalConfigurationChange(
-        _In_ IGlobalConfigurationChangeProvider * pProvider
-    );
-
-private:
-    APPLICATION_MANAGER * m_pApplicationManager;
-};

src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
 #pragma once
 
 #define IDS_INVALID_PROPERTY        1000

src/AspNetCoreModuleV1/AspNetCore/ancm.mof

@@ -1,208 +0,0 @@
-#pragma classflags("forceupdate")
-#pragma namespace ("\\\\.\\Root\\WMI")
-#pragma autorecover
-
-/*
- * AspNetCore module trace events layout
- * Uncomment the following class to run mof2trace to generate header file
- * comment it back before checking it in */
-[Dynamic,
-  Description("IIS: WWW Server"),
-  Guid("{3a2a4e84-4c21-4981-ae10-3fda0d9b0f83}"),
-  locale("MS\\0x409")]
-class IIS_Trace:EventTrace
-{
-    [Description ("Enable Flags") : amended,
-        ValueDescriptions{
-            "AspNetCore module events" } : amended,
-        DefineValues{
-            "ETW_IIS_ANCM" },
-        Values{
-            "ANCM" },
-        ValueMap{
-            "0x10000" }
-    ]
-    uint32 Flags;
-
-    [Description ("Levels") : amended,
-        ValueDescriptions{
-            "Abnormal exit or termination",
-            "Severe errors",
-            "Warnings",
-            "Information",
-            "Detailed information" } : amended,
-         DefineValues{
-            "TRACE_LEVEL_FATAL",
-            "TRACE_LEVEL_ERROR",
-            "TRACE_LEVEL_WARNING",
-            "TRACE_LEVEL_INFORMATION",
-            "TRACE_LEVEL_VERBOSE" },
-        Values{
-            "Fatal",
-            "Error",
-            "Warning",
-            "Information",
-            "Verbose" },
-        ValueMap{
-            "0x1",
-            "0x2",
-            "0x3",
-            "0x4",
-            "0x5" },
-        ValueType("index")
-    ]
-    uint32 Level;
-};
-*/
-
-[Dynamic,
- Description("ANCM runtime events") : amended,
- Guid("{82ADEAD7-12B2-4781-BDCA-5A4B6C757191}"),
- EventVersion(1),
- DisplayName("ANCM"),
- EventANCMRuntime,
- locale("MS\\0x409")
-]
-class ANCM_Events:IIS_Trace
-{
-};
-
-[Dynamic,
- Description("Start application success") : amended,
- EventType(1),
- EventLevel(4),
- EventTypeName("ANCM_START_APPLICATION_SUCCESS") : amended
-]
-class ANCMAppStart:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-    [WmiDataId(2),
-     Description("Application Description") : amended,
-     StringTermination("NullTerminated"),
-     format("w"),
-     read]
-     string AppDescription;
-};
-
-[Dynamic,
- Description("Start application failed") : amended,
- EventType(2),
- EventLevel(2),
- EventTypeName("ANCM_START_APPLICATION_FAIL") : amended
-]
-class ANCMAppStartFail:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-    [WmiDataId(2),
-     Description("Application Start Failure Description") : amended,
-     StringTermination("NullTerminated"),
-     format("w"),
-     read]
-     string FailureDescription;
-};
-
-[Dynamic,
- Description("Start forwarding request") : amended,
- EventType(3),
- EventLevel(4),
- EventTypeName("ANCM_REQUEST_FORWARD_START") : amended
-]
-class ANCMForwardStart:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-};
-
-[Dynamic,
- Description("Finish forwarding request") : amended,
- EventType(4),
- EventLevel(4),
- EventTypeName("ANCM_REQUEST_FORWARD_END") : amended
-]
-class ANCMForwardEnd:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-};
-
-[Dynamic,
- Description("Forwarding request failure") : amended,
- EventType(5),
- EventLevel(2),
- EventTypeName("ANCM_REQUEST_FORWARD_FAIL") : amended
-]
-class ANCMForwardFail:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-    [WmiDataId(2),
-     Description("Error code") : amended,
-     format("x"),
-     read]
-     uint32  ErrorCode;
-};
-
-[Dynamic,
- Description("Receiving callback from WinHttp") : amended,
- EventType(6),
- EventLevel(4),
- EventTypeName("ANCM_WINHTTP_CALLBACK") : amended
-]
-class ANCMWinHttpCallBack:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-    [WmiDataId(2),
-     Description("InternetStatus") : amended,
-     format("x"),
-     read]
-     uint32  InternetStatus;
-};
-
-[Dynamic,
- Description("Inprocess executing request failure") : amended,
- EventType(7),
- EventLevel(2),
- EventTypeName("ANCM_EXECUTE_REQUEST_FAIL") : amended
-]
-class ANCMExecuteFailed:ANCM_Events
-{
-    [WmiDataId(1),
-     Description("Context ID") : amended,
-     extension("Guid"),
-     ActivityID,
-     read]
-     object  ContextId;
-    [WmiDataId(2),
-     Description("InternetStatus") : amended,
-     format("x"),
-     read]
-     uint32  ErrorCode;
-};
-

src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc

@@ -0,0 +1,78 @@
+;/*++
+;
+;Copyright (c) 2014 Microsoft Corporation
+;
+;Module Name:
+;
+;    aspnetcore_msg.mc
+;
+;Abstract:
+;
+;    Asp.Net Core Module localizable messages.
+;
+;--*/
+;
+;
+;#ifndef _ASPNETCORE_MSG_H_
+;#define _ASPNETCORE_MSG_H_
+;
+
+SeverityNames=(Success=0x0
+               Informational=0x1
+               Warning=0x2
+               Error=0x3
+              )
+
+MessageIdTypedef=DWORD
+
+Messageid=1000
+SymbolicName=ASPNETCORE_EVENT_PROCESS_START_ERROR
+Language=English
+%1
+.
+
+Messageid=1001
+SymbolicName=ASPNETCORE_EVENT_PROCESS_START_SUCCESS
+Language=English
+%1
+.
+
+Messageid=1002
+SymbolicName=ASPNETCORE_EVENT_PROCESS_CRASH
+Language=English
+%1
+.
+
+Messageid=1003
+SymbolicName=ASPNETCORE_EVENT_RAPID_FAIL_COUNT_EXCEEDED
+Language=English
+%1
+.
+
+Messageid=1004
+SymbolicName=ASPNETCORE_EVENT_CONFIG_ERROR
+Language=English
+%1
+.
+
+Messageid=1005
+SymbolicName=ASPNETCORE_EVENT_GRACEFUL_SHUTDOWN_FAILURE
+Language=English
+%1
+.
+
+Messageid=1006
+SymbolicName=ASPNETCORE_EVENT_SENT_SHUTDOWN_HTTP_REQUEST
+Language=English
+%1
+.
+
+Messageid=1012
+SymbolicName=ASPNETCORE_EVENT_RECYCLE_APPOFFLINE
+Language=English
+%1
+.
+
+;
+;#endif     // _ASPNETCORE_MODULE_MSG_H_
+;

src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx

@@ -109,7 +109,7 @@ inline bool IsSpace(char ch)
 
 #include "filewatcher.h"
 #include "environmentvariablehash.h"
-#include "aspnetcore_msg.h"
+#include "..\aspnetcore_msg.h"
 #include "aspnetcoreconfig.h"
 #include "serverprocess.h"
 #include "processmanager.h"