Merge pull request microsoft#118 from microsoft/develop

Merge Develop to Master for v1.0.26 release

Author: willxie-eng

CHANGELOG.md

@@ -7,7 +7,11 @@ Please format the changes as follows:
 + BugFixes:
 + Updates:
 
+# 1.0.26
+Same functionality as 1.0.25.
+
 # 1.0.25
+This version did not get published due to issues encountered in App Service. Mitigation was taken by repackaging the previously released version (1.0.21) as 1.0.25.
 + Bugfixes:
   + Build header nupkg for AnyCPU
   + Fix unicode character in bldver.rc
@@ -74,4 +78,4 @@ Please format the changes as follows:
 # 1.0.15
 
 + New:
-    + Migrated repo from the internal Microsoft DevDiv account in Azure DevOps.
+    + Migrated repo from the internal Microsoft DevDiv account in Azure DevOps.

build/Version.props

@@ -12,7 +12,7 @@
     -->
     <SemanticVersionMajor>1</SemanticVersionMajor>
     <SemanticVersionMinor>0</SemanticVersionMinor>
-    <SemanticVersionPatch>25</SemanticVersionPatch>
+    <SemanticVersionPatch>26</SemanticVersionPatch>
 
     <FileVersionMajor>15</FileVersionMajor>
     <FileVersionMinor>1</FileVersionMinor>
@@ -36,8 +36,9 @@
     <!--
       Date when Semantic Version was changed.
       Update for every public release.
+      Format is YYYY-MM-DD
     -->
-    <SemanticVersionDate>2019-7-9</SemanticVersionDate>
+    <SemanticVersionDate>2019-08-01</SemanticVersionDate>
 
     <!--
       Build version is used to distinguish internally built NuGet packages.

docs/build.md

@@ -51,6 +51,7 @@ On Windows we use MSBuild, with `.vcxproj` files to build native binaries and `.
 (Debug|Release with x86|x64|AnyCPU).
 
 Alternatively, you may run the script `[CLRInstrumentationEngine repo]\build.ps1` in PowerShell which conducts a local build.
+
 |Flag|Description|
 |-|-|
 IncludeTests|Runs unit tests after build.
@@ -74,4 +75,4 @@ have some limitations for now:
 * Cannot generate InstrumentationEngine.h yet, therefore...
 * It is necessary to build your corresponding flavor/architecture in Windows first so that InstrumentationEngine.h is generated by midl and placed on the expected path.
 * We only support compiling for 64bit Linux and only support specific versions of Alpine, Ubuntu, and Debian.
-* NuGet package building is currently not implemented.
+* NuGet package building is currently not implemented.

src/InstrumentationEngine/MethodJitInfo.cpp

@@ -79,7 +79,16 @@ namespace MicrosoftInstrumentationEngine
         {
             // Note, this will return E_NOTIMPL before framework 4.8, so we don't
             // assert on failure.
-            IfFailRet(pProfilerInfo4->GetILToNativeMapping2(m_functionId, m_rejitId, cMap, pcNeeded, pMap));
+            if (FAILED(hr = (pProfilerInfo4->GetILToNativeMapping2(m_functionId, m_rejitId, cMap, pcNeeded, pMap))))
+            {
+                if (hr != E_NOTIMPL)
+                {
+                    CLogging::LogError(_T("pProfilerInfo4->GetILToNativeMapping2 failed in MicrosoftInstrumentationEngine::CMethodJitInfo::GetILNativeMapping with error 0x%08X"), hr);
+                }
+
+                return hr;
+            }
+
             return S_OK;
         }