microsoft · kmahone · Jun 28, 2024 · Feb 9, 2024 · Jun 6, 2024 · Jun 7, 2024
diff --git a/BuildAll.ps1 b/BuildAll.ps1
@@ -332,6 +332,7 @@ Try {
                 Copy-Item -path "BuildOutput\$configurationForMrtAndAnyCPU\$platformToRun\Microsoft.Windows.ApplicationModel.Resources.Projection\Microsoft.Windows.ApplicationModel.Resources.Projection.dll" -destination "$BasePath\lib\net6.0-windows10.0.17763.0" -force
                 Copy-Item -path "BuildOutput\$configurationForMrtAndAnyCPU\$platformToRun\Microsoft.Windows.ApplicationModel.Resources.Projection\Microsoft.Windows.ApplicationModel.Resources.Projection.pdb" -destination "$BasePath\lib\net6.0-windows10.0.17763.0" -force
                 Copy-Item -path "BuildOutput\$configurationForMrtAndAnyCPU\$platformToRun\Microsoft.Windows.ApplicationModel.Resources\Microsoft.Windows.ApplicationModel.Resources.winmd" -destination "$BasePath\lib\uap10.0" -force
+                Copy-Item -path "BuildOutput\$configurationForMrtAndAnyCPU\$platformToRun\Microsoft.Windows.ApplicationModel.Resources\Microsoft.Windows.Globalization.winmd" -destination "$BasePath\lib\uap10.0" -force
             }
         }
 

diff --git a/build/NuSpecs/AppxManifest.xml b/build/NuSpecs/AppxManifest.xml
@@ -22,6 +22,7 @@
           <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.Resources.ResourceCandidate" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.Resources.ResourceLoader" ThreadingModel="both" />
           <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.Resources.ResourceManager" ThreadingModel="both" />
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.Globalization.ApplicationLanguages" ThreadingModel="both" />
       </InProcessServer>
     </Extension>
     <Extension Category="windows.activatableClass.inProcessServer">

diff --git a/...Model.Resources/projection/Microsoft.Windows.ApplicationModel.Resources.Projection.csproj b/...Model.Resources/projection/Microsoft.Windows.ApplicationModel.Resources.Projection.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <CSWinRTIncludes>Microsoft.Windows.ApplicationModel.Resources</CSWinRTIncludes>
+    <CSWinRTIncludes>Microsoft.Windows.Globalization;Microsoft.Windows.ApplicationModel.Resources</CSWinRTIncludes>
     <CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata>
     <NoWarn>MSB3271</NoWarn>
   </PropertyGroup>
@@ -30,10 +30,11 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>	
+  </PropertyGroup>
 
   <ItemGroup>
     <CsWinRTInputs Include="$(OutDir)/**/*.winmd" />
+    <CsWinRTInputs Include="$(BaseOutputPath)/Microsoft.Windows.ApplicationModel.Resources/Microsoft.Windows.Globalization.winmd" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.cpp b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.cpp
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation and Contributors.
+// Licensed under the MIT License.
+
+#include "pch.h"
+#include "ApplicationLanguages.h"
+#include "Microsoft.Windows.Globalization.ApplicationLanguages.g.cpp"
+
+#include <bcp47mrm.h>
+#include <winrt/Windows.Globalization.h>
+
+#include <AppModel.Identity.h>
+
+namespace winrt::Microsoft::Windows::Globalization::implementation
+{
+    hstring ApplicationLanguages::m_language;
+    wil::srwlock ApplicationLanguages::m_lock;
+
+
+    winrt::Windows::Foundation::Collections::IVectorView<hstring> ApplicationLanguages::Languages()
+    {
+        return winrt::Windows::Globalization::ApplicationLanguages::Languages();
+    }
+
+    winrt::Windows::Foundation::Collections::IVectorView<hstring> ApplicationLanguages::ManifestLanguages()
+    {
+        if (AppModel::Identity::IsPackagedProcess())
+        {
+            return winrt::Windows::Globalization::ApplicationLanguages::ManifestLanguages();
+        }
+        else
+        {
+            return {};
+        }
+    }
+
+    hstring ApplicationLanguages::PrimaryLanguageOverride()
+    {
+        auto criticalSection{ m_lock.lock_shared() };
+        return m_language;
+    }
+
+    void ApplicationLanguages::PrimaryLanguageOverride(hstring const& language)
+    {
+        bool isValidLanguageTag = IsWellFormedTag(language.c_str());
+
+        THROW_HR_IF_MSG(E_INVALIDARG, !isValidLanguageTag, "The parameter is incorrect");
+
+        auto criticalSection {m_lock.lock_exclusive()};
+        m_language = language;
+
+        if (AppModel::Identity::IsPackagedProcess())
+        {
+            winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride(language);
+        }
+    }
+} // namespace winrt::Microsoft::Windows::Globalization::implementation
diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.h b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.h
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation and Contributors.
+// Licensed under the MIT License.
+
+#pragma once
+#include "Microsoft.Windows.Globalization.ApplicationLanguages.g.h"
+
+namespace winrt::Microsoft::Windows::Globalization::implementation
+{
+    struct ApplicationLanguages
+    {
+        ApplicationLanguages() = delete;
+
+        static winrt::Windows::Foundation::Collections::IVectorView<hstring> Languages();
+        static winrt::Windows::Foundation::Collections::IVectorView<hstring> ManifestLanguages();
+        static hstring PrimaryLanguageOverride();
+        static void PrimaryLanguageOverride(hstring const& language);
+
+    private:
+        static hstring m_language;
+        static wil::srwlock m_lock;
+    };
+} // namespace winrt::Microsoft::Windows::Globalization::implementation
+
+namespace winrt::Microsoft::Windows::Globalization::factory_implementation
+{
+    struct ApplicationLanguages : ApplicationLanguagesT<ApplicationLanguages, implementation::ApplicationLanguages>
+    {
+    };
+} // namespace winrt::Microsoft::Windows::Globalization::factory_implementation
diff --git a/...t.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl b/...t.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl
@@ -1,9 +1,9 @@
-// Copyright (c) Microsoft Corporation and Contributors.
+// Copyright (c) Microsoft Corporation and Contributors.
 // Licensed under the MIT License.
 
 namespace Microsoft.Windows.ApplicationModel.Resources
 {
-    [contractversion(1)]
+    [contractversion(2)]
     apicontract MrtCoreContract{};
 
     [contract(MrtCoreContract, 1)]
@@ -114,3 +114,15 @@ namespace Microsoft.Windows.ApplicationModel.Resources
         static String Theme { get; };
     }
 } // namespace Microsoft.Windows.ApplicationModel.Resources
+
+namespace Microsoft.Windows.Globalization
+{
+    [contract(Microsoft.Windows.ApplicationModel.Resources.MrtCoreContract, 2)]
+    runtimeclass ApplicationLanguages
+    {
+        static IVectorView<String> Languages { get; };
+        static IVectorView<String> ManifestLanguages { get; };
+        static String PrimaryLanguageOverride;
+    }
+
+} // namespace Microsoft.Windows.Globalization
diff --git a/...ndows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj b/...ndows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj
@@ -17,7 +17,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.18362.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.20348.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
     <!-- Need to add this otherwise the ADO build won't copy mrm.dll to output directory, and eventually the file will miss in ManagedTest.build.appxrecipe and make
          the tests fail to run in ADO pipeline -->
@@ -90,12 +90,13 @@
       </DisableSpecificWarnings>
       <PreprocessorDefinitions>_WINRT_DLL;WIN32_LEAN_AND_MEAN;WINRT_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)\dev\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
       <ModuleDefinitionFile>Microsoft.Windows.ApplicationModel.Resources.def</ModuleDefinitionFile>
-      <AdditionalDependencies>$(OutDir)..\mrm\MRM.lib;onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(OutDir)..\mrm\MRM.lib;onecoreuap.lib;bcp47mrm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
@@ -109,6 +110,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="ApplicationLanguages.h" />
     <ClInclude Include="Helper.h" />
     <ClInclude Include="KnownResourceQualifierName.h" />
     <ClInclude Include="pch.h" />
@@ -120,6 +122,7 @@
     <ClInclude Include="ResourceNotFoundEventArgs.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="ApplicationLanguages.cpp" />
     <ClCompile Include="Helper.cpp" />
     <ClCompile Include="KnownResourceQualifierName.cpp" />
     <ClCompile Include="pch.cpp">
@@ -140,7 +143,7 @@
     <None Include="Microsoft.Windows.ApplicationModel.Resources.def" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Microsoft.Windows.ApplicationModel.Resources.rc">      
+    <ResourceCompile Include="Microsoft.Windows.ApplicationModel.Resources.rc">
       <AdditionalIncludeDirectories>$(RepoRoot);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
   </ItemGroup>
@@ -171,6 +174,7 @@
     <Import Project="$(NugetPackageDirectory)\Microsoft.SourceLink.Common.$(MicrosoftSourceLinkCommonVersion)\build\Microsoft.SourceLink.Common.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.Common.$(MicrosoftSourceLinkCommonVersion)\build\Microsoft.SourceLink.Common.targets')" />
     <Import Project="$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets')" />
     <Import Project="$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets')" />
+    <Import Project="$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -185,5 +189,6 @@
     <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Build.Tasks.Git.$(MicrosoftBuildTasksGitVersion)\build\Microsoft.Build.Tasks.Git.targets'))" />
     <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.props'))" />
     <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.SourceLink.GitHub.$(MicrosoftSourceLinkGitHubVersion)\build\Microsoft.SourceLink.GitHub.targets'))" />
+    <Error Condition="!Exists('$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NugetPackageDirectory)\Microsoft.Windows.ImplementationLibrary.$(MicrosoftWindowsImplementationLibraryVersion)\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/...plicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj.filters b/...plicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj.filters
@@ -29,6 +29,9 @@
     <ClCompile Include="KnownResourceQualifierName.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ApplicationLanguages.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h">
@@ -58,6 +61,9 @@
     <ClInclude Include="KnownResourceQualifierName.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="ApplicationLanguages.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="Microsoft.Windows.ApplicationModel.Resources.idl" />
@@ -75,4 +81,7 @@
       <UniqueIdentifier>{54696afe-f42a-494a-bc24-3fd0d4192122}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Microsoft.Windows.ApplicationModel.Resources.rc" />
+  </ItemGroup>
 </Project>
diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ResourceContext.cpp b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ResourceContext.cpp
@@ -8,6 +8,10 @@
 
 const wchar_t c_languageQualifierName[] = L"Language";
 
+#include "ApplicationLanguages.h"
+
+using namespace winrt::Microsoft::Windows::Globalization;
+
 namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
 {
 void ResourceContext::InitializeQualifierNames()
@@ -97,6 +101,10 @@ void ResourceContext::Apply()
             winrt::check_hresult(MrmSetQualifier(m_resourceContext, eachValue.Key().c_str(), eachValue.Value().c_str()));
         }
     }
+    if (!ApplicationLanguages::PrimaryLanguageOverride().empty())
+    {
+        winrt::check_hresult(MrmSetQualifier(m_resourceContext, c_languageQualifierName, ApplicationLanguages::PrimaryLanguageOverride().c_str()));
+    }
 }
 
 hstring ResourceContext::GetLangugageContext()

diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/packages.config b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/packages.config
@@ -4,4 +4,5 @@
   <package id="Microsoft.SourceLink.Common" version="1.1.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.SourceLink.GitHub" version="1.1.1" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
-</packages>
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220914.1" targetFramework="native" />
+</packages>
diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/pch.h b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/pch.h
@@ -7,6 +7,9 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include "..\..\core\src\MRM.h"
 
+#include <wil/result_macros.h>
+#include <wil/resource.h>
+
 struct StringResourceFreer
 {
     void operator()(wchar_t* resource) { MrmFreeResource(resource); }