Move to Microsoft.Windows.Globalization namespace

Author: stefansjfw

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
             }
         }
 

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">

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.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>

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.cpp

@@ -3,15 +3,15 @@
 
 #include "pch.h"
 #include "ApplicationLanguages.h"
-#include "ApplicationLanguages.g.cpp"
+#include "Microsoft.Windows.Globalization.ApplicationLanguages.g.cpp"
 
 #include <winrt/Windows.Globalization.h>
 
 #include <AppModel.Identity.h>
 
 #include "Helper.h"
 
-namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
+namespace winrt::Microsoft::Windows::Globalization::implementation
 {
     hstring ApplicationLanguages::m_language;
 
@@ -44,7 +44,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
     {
         bool isValidLanguageTag = IsWellFormedLanguageTag(language.c_str());
 
-        THROW_HR_IF_MSG(E_INVALIDARG, isValidLanguageTag, "The parameter is incorrect");
+        THROW_HR_IF_MSG(E_INVALIDARG, !isValidLanguageTag, "The parameter is incorrect");
 
         static wil::srwlock lock;
 
@@ -56,4 +56,4 @@ namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
             winrt::Windows::Globalization::ApplicationLanguages::PrimaryLanguageOverride(language);
         }
     }
-} // namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
+} // namespace winrt::Microsoft::Windows::Globalization::implementation

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/ApplicationLanguages.h

@@ -2,9 +2,9 @@
 // Licensed under the MIT License.
 
 #pragma once
-#include "ApplicationLanguages.g.h"
+#include "Microsoft.Windows.Globalization.ApplicationLanguages.g.h"
 
-namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
+namespace winrt::Microsoft::Windows::Globalization::implementation
 {
     struct ApplicationLanguages
     {
@@ -18,11 +18,11 @@ namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
     private:
         static hstring m_language;
     };
-} // namespace winrt::Microsoft::Windows::ApplicationModel::Resources::implementation
+} // namespace winrt::Microsoft::Windows::Globalization::implementation
 
-namespace winrt::Microsoft::Windows::ApplicationModel::Resources::factory_implementation
+namespace winrt::Microsoft::Windows::Globalization::factory_implementation
 {
     struct ApplicationLanguages : ApplicationLanguagesT<ApplicationLanguages, implementation::ApplicationLanguages>
     {
     };
-} // namespace winrt::Microsoft::Windows::ApplicationModel::Resources::factory_implementation
+} // namespace winrt::Microsoft::Windows::Globalization::factory_implementation

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Helper.cpp

@@ -100,7 +100,7 @@ bool IsWellFormedLanguageTag(const wchar_t* languageTag)
 
     while (ok && (*test != L'\0'))
     {
-        // we accept letters, numbers, dash and semi-colon (as list separator)
+        // we accept letters, numbers and dash
         if (((*test >= L'0') && (*test <= L'9')) || ((*test >= L'a') && (*test <= L'z')) || ((*test >= L'A') && (*test <= L'Z')) ||
             (*test == L'-'))
         {

dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl

@@ -113,6 +113,12 @@ namespace Microsoft.Windows.ApplicationModel.Resources
         static String TargetSize { get; };
         static String Theme { get; };
     }
+} // namespace Microsoft.Windows.ApplicationModel.Resources
+
+namespace Microsoft.Windows.Globalization
+{
+    [contractversion(1)]
+    apicontract MrtCoreContract{};
 
     [contract(MrtCoreContract, 2)]
     runtimeclass ApplicationLanguages
@@ -122,4 +128,4 @@ namespace Microsoft.Windows.ApplicationModel.Resources
         static String PrimaryLanguageOverride;
     }
 
-} // namespace Microsoft.Windows.ApplicationModel. Resources
+} // namespace Microsoft.Windows.Globalization

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()