Remove public headers for Insights internal helpers and inline logic (#6285)

* refactor to remove public includes

* Add comment referencing canonical source implementations

Author: agniuks

build/CopyFilesToStagingDir.ps1

@@ -165,8 +165,6 @@ PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\decimalcppwinrt.h $NugetDir\i
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\MsixDynamicDependency.h $NugetDir\include
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\wil_msixdynamicdependency.h $NugetDir\include
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\WindowsAppRuntimeInsights.h $NugetDir\include\
-PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\AppModel.Identity.IsPackagedProcess.h $NugetDir\include\
-PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\WindowsAppRuntime.SelfContained.h $NugetDir\include\
 PublishFile $FullBuildOutput\WindowsAppRuntime_DLL\Security.AccessControl.h $NugetDir\include\
 #
 # Libraries (*.lib)

dev/Common/Common.vcxitems

@@ -36,7 +36,5 @@
   <ItemGroup>
     <PublicHeaders Include="$(MSBuildThisFileDirectory)WindowsAppRuntimeAutoInitializer.cs" />
     <PublicHeaders Include="$(MSBuildThisFileDirectory)WindowsAppRuntimeAutoInitializer.cpp" />
-    <PublicHeaders Include="$(MSBuildThisFileDirectory)AppModel.Identity.IsPackagedProcess.h" />
-    <PublicHeaders Include="$(MSBuildThisFileDirectory)WindowsAppRuntime.SelfContained.h" />
   </ItemGroup>
 </Project>

dev/WindowsAppRuntime_Insights/WindowsAppRuntimeInsights.h

@@ -13,8 +13,7 @@
 
 #include <wil/resource.h>
 #include <string>
-#include "AppModel.Identity.IsPackagedProcess.h"
-#include "WindowsAppRuntime.SelfContained.h"
+#include <appmodel.h>
     namespace Microsoft::WindowsAppRuntime::Insights
     {
     enum class TraceLoggingInformationFlags : std::uint32_t
@@ -43,6 +42,10 @@
             return channel;
         }
 
+        // Inlined from the canonical implementations (see for reference):
+        //   IsPackagedProcess: dev/Common/AppModel.Identity.IsPackagedProcess.h
+        //   IsSelfContained:   dev/Common/WindowsAppRuntime.SelfContained.h / .cpp
+        // Duplicated here to avoid exposing those headers as public API.
         static std::uint32_t TraceLoggingInformationFlags()
         {
             static std::uint32_t flags{ []() -> std::uint32_t {
@@ -53,16 +56,34 @@
                     f |= Insights::TraceLoggingInformationFlags::IsDebuggerPresent;
                 }
 
-                bool isPackagedProcess{};
-                if (SUCCEEDED_LOG(::AppModel::Identity::IsPackagedProcess_nothrow(isPackagedProcess)) && isPackagedProcess)
                 {
-                    f |= Insights::TraceLoggingInformationFlags::IsPackagedProcess;
+                    UINT32 n{};
+                    const auto rc{ ::GetCurrentPackageFullName(&n, nullptr) };
+                    if ((rc != APPMODEL_ERROR_NO_PACKAGE) && (rc != ERROR_INSUFFICIENT_BUFFER))
+                    {
+                        LOG_HR(HRESULT_FROM_WIN32(rc));
+                    }
+                    else if (rc == ERROR_INSUFFICIENT_BUFFER)
+                    {
+                        f |= Insights::TraceLoggingInformationFlags::IsPackagedProcess;
+                    }
                 }
 
-                bool isSelfContained{};
-                if (SUCCEEDED_LOG(::WindowsAppRuntime::SelfContained::IsSelfContained_nothrow(isSelfContained)) && isSelfContained)
                 {
-                    f |= Insights::TraceLoggingInformationFlags::IsSelfContained;
+                    auto module{ ::GetModuleHandleW(L"Microsoft.WindowsAppRuntime.dll") };
+                    if (module)
+                    {
+                        using IsSelfContainedFn = HRESULT(__stdcall*)(BOOL*);
+                        auto fn{ reinterpret_cast<IsSelfContainedFn>(::GetProcAddress(module, "WindowsAppRuntime_IsSelfContained")) };
+                        if (fn)
+                        {
+                            BOOL result{};
+                            if (SUCCEEDED_LOG(fn(&result)) && result)
+                            {
+                                f |= Insights::TraceLoggingInformationFlags::IsSelfContained;
+                            }
+                        }
+                    }
                 }
 
                 return static_cast<std::uint32_t>(f);