Merge branch 'main' into user/drustheaxe/devcheck-checkdependencies-exitcode

Author: DrusTheAxe

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -35,7 +35,7 @@ body:
       label: NuGet package version
       description: Specify the version of Windows App SDK (or Project Reunion) you're using.
       options:
-        - "Windows App SDK 1.6.1: 1.6.240923002"
+        - "Windows App SDK 1.6.2: 1.6.241106002"
         - "Windows App SDK 1.6 Preview 2: 1.6.240821007-preview2"
         - "Windows App SDK 1.6 Experimental 2: 1.6.240701003-experimental2"
   - type: dropdown

dev/MRTCore/mrt/Core/src/MRM.cpp

@@ -1023,7 +1023,7 @@ STDAPI MrmGetFilePathFromName(_In_opt_ PCWSTR filename, _Outptr_ PWSTR* filePath
         std::unique_ptr<wchar_t, decltype(&MrmFreeResource)> outputPath(rawOutputPath, MrmFreeResource);
         RETURN_IF_FAILED(PathCchCombineEx(
             outputPath.get(),
-            size,
+            length,
             path.get(),
             filenameToUse,
             PATHCCH_ALLOW_LONG_PATHS));

dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.rc

@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation and Contributors.
+// Licensed under the MIT License.
+
+#include <winresrc.h>
+#define VERSIONINFO_FILENAME "Microsoft.Windows.ApplicationModel.Background.UniversalBGTask.dll"
+#include "build\VersionInfo\AssemblyInfo.ver"

dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj

@@ -124,6 +124,11 @@
     <None Include="packages.config" />
     <None Include="WindowsAppRuntime_UniversalBGTaskDLL.def" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="WindowsAppRuntime_UniversalBGTaskDLL.rc">
+      <AdditionalIncludeDirectories>$(RepoRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.CppWinRT.$(MicrosoftWindowsCppWinRTVersion)\build\native\Microsoft.Windows.CppWinRT.targets')" />

dev/WindowsAppRuntime_UniversalBGTaskDLL/WindowsAppRuntime_UniversalBGTaskDLL.vcxproj.filters

@@ -27,4 +27,9 @@
   <ItemGroup>
     <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="WindowsAppRunTime_UniversalBGTask.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>