Update MRTCore namespace from Microsoft::ApplicationModel::Resources to Microsoft::Windows::ApplicationModel::Resources (#948)

* Change MRTCore namespace

* update cswinrt

* remove net ref

Author: huichen123

build/AzurePipelinesTemplates/ProjectReunion-RunHelixTests-Job.yml

@@ -87,7 +87,7 @@ jobs:
 #  - task: MSBuild@1
 #    displayName: Build solution ManagedTests
 #    inputs:
-#      solution: dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/unittests/ManagedTest.csproj
+#      solution: dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/unittests/ManagedTest.csproj
 #      platform: $(buildPlatform)
 #      configuration: $(buildConfiguration)  
 

build/NuSpecs/AppxManifest.xml

@@ -17,11 +17,11 @@
   <Extensions>
     <Extension Category="windows.activatableClass.inProcessServer">
       <InProcessServer>
-        <Path>Microsoft.ApplicationModel.Resources.dll</Path>
-          <ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.Resources.KnownResourceQualifierName" ThreadingModel="both" />
-          <ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.Resources.ResourceCandidate" ThreadingModel="both" />
-          <ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.Resources.ResourceLoader" ThreadingModel="both" />
-          <ActivatableClass ActivatableClassId="Microsoft.ApplicationModel.Resources.ResourceManager" ThreadingModel="both" />
+        <Path>Microsoft.Windows.ApplicationModel.Resources.dll</Path>
+          <ActivatableClass ActivatableClassId="Microsoft.Windows.ApplicationModel.Resources.KnownResourceQualifierName" ThreadingModel="both" />
+          <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" />
       </InProcessServer>
     </Extension>
     <Extension Category="windows.activatableClass.inProcessServer">

build/NuSpecs/Microsoft.ProjectReunion.Foundation.targets

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ApplicationModel.Resources.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.ApplicationModel.Resources.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.ProjectReunion.Bootstrap.targets" Condition="'$(MSBuildProjectExtension)' != '.wapproj'" />
 
   <ItemGroup>

build/NuSpecs/ProjectReunion-Nuget-Native.props

@@ -1,6 +1,6 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ApplicationModel.Resources.props"/>
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.ApplicationModel.Resources.props"/>
   <Import Project="$(MSBuildThisFileDirectory)ProjectReunion-Nuget-Native.C.props" />
   <Import Project="$(MSBuildThisFileDirectory)ProjectReunion-Nuget-Native.WinRt.props" />
 </Project>

build/NuSpecs/ProjectReunion-Nuget-Native.targets

@@ -2,7 +2,7 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="$(MSBuildThisFileDirectory)Microsoft.ApplicationModel.Resources.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.ApplicationModel.Resources.targets"/>
 
   <PropertyGroup>
     <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>

build/build-mrt.yml

@@ -35,7 +35,7 @@ steps:
   displayName: 'NuGet restore of applicationmodel'
   inputs:
     command: 'custom'
-    arguments: 'restore ${{ parameters.MRTSourcesDirectory }}\mrt\microsoft.applicationmodel.resources\src\packages.config -ConfigFile nuget.config -PackagesDirectory ${{ parameters.MRTSourcesDirectory }}\mrt\packages'
+    arguments: 'restore ${{ parameters.MRTSourcesDirectory }}\mrt\microsoft.windows.applicationmodel.resources\src\packages.config -ConfigFile nuget.config -PackagesDirectory ${{ parameters.MRTSourcesDirectory }}\mrt\packages'
 
 # NuGetCommand@2
 - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
@@ -172,29 +172,29 @@ steps:
       mrm\mrm.dll
       mrm\mrm.lib
       mrm\mrm.pdb
-      Microsoft.ApplicationModel.Resources\Microsoft.ApplicationModel.Resources.dll
-      Microsoft.ApplicationModel.Resources\Microsoft.ApplicationModel.Resources.pdb
+      Microsoft.Windows.ApplicationModel.Resources\Microsoft.Windows.ApplicationModel.Resources.dll
+      Microsoft.Windows.ApplicationModel.Resources\Microsoft.Windows.ApplicationModel.Resources.pdb
     TargetFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\lib\$(buildPlatform)'
     flattenFolders: true
 
 - task: CopyFiles@2
   displayName: 'copy projection binaries and symbols for signing'
   condition: and(succeeded(), eq(variables['buildPlatform'], 'x86'))
   inputs:
-    SourceFolder: '${{ parameters.MRTBinariesDirectory }}\Release\$(buildPlatform)\Microsoft.ApplicationModel.Resources.Projection'
+    SourceFolder: '${{ parameters.MRTBinariesDirectory }}\Release\$(buildPlatform)\Microsoft.Windows.ApplicationModel.Resources.Projection'
     Contents: |
-      Microsoft.ApplicationModel.Resources.Projection.dll
-      Microsoft.ApplicationModel.Resources.Projection.pdb
+      Microsoft.Windows.ApplicationModel.Resources.Projection.dll
+      Microsoft.Windows.ApplicationModel.Resources.Projection.pdb
     TargetFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\lib\anycpu\net5.0'
     flattenFolders: false
 
 - task: CopyFiles@2
   displayName: 'copy winmd for signing'
   condition: and(succeeded(), eq(variables['buildPlatform'], 'x86'))
   inputs:
-    SourceFolder: '${{ parameters.MRTBinariesDirectory }}\Release\$(buildPlatform)\Microsoft.ApplicationModel.Resources'
+    SourceFolder: '${{ parameters.MRTBinariesDirectory }}\Release\$(buildPlatform)\Microsoft.Windows.ApplicationModel.Resources'
     Contents: |
-      Microsoft.ApplicationModel.Resources.winmd
+      Microsoft.Windows.ApplicationModel.Resources.winmd
     TargetFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\lib\anycpu'
     flattenFolders: true
 

build/publish-mrt.yml

@@ -23,7 +23,7 @@ steps:
   inputs:
     SourceFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\mrtcore_binaries\lib\anycpu'
     Contents: |
-      Microsoft.ApplicationModel.Resources.winmd
+      Microsoft.Windows.ApplicationModel.Resources.winmd
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\uap10.0\'
     flattenFolders: true
 
@@ -32,7 +32,7 @@ steps:
   inputs:
     SourceFolder: '${{ parameters.MRTSourcesDirectory }}\packaging\Intellisense'
     Contents: |
-      Microsoft.ApplicationModel.Resources.xml
+      Microsoft.Windows.ApplicationModel.Resources.xml
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\uap10.0\'
     flattenFolders: true
 
@@ -44,7 +44,7 @@ steps:
   inputs:
     SourceFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\mrtcore_binaries\lib\anycpu'
     Contents: |
-      Microsoft.ApplicationModel.Resources.winmd
+      Microsoft.Windows.ApplicationModel.Resources.winmd
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\native'
     flattenFolders: true
 
@@ -53,7 +53,7 @@ steps:
   inputs:
     SourceFolder: '${{ parameters.MRTSourcesDirectory }}\packaging\Intellisense'
     Contents: |
-      Microsoft.ApplicationModel.Resources.xml
+      Microsoft.Windows.ApplicationModel.Resources.xml
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\native\'
     flattenFolders: true
 
@@ -62,8 +62,8 @@ steps:
   inputs:
     SourceFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\mrtcore_binaries\lib\anycpu'
     Contents: |
-      net5.0\Microsoft.ApplicationModel.Resources.Projection.pdb
-      net5.0\Microsoft.ApplicationModel.Resources.Projection.dll
+      net5.0\Microsoft.Windows.ApplicationModel.Resources.Projection.pdb
+      net5.0\Microsoft.Windows.ApplicationModel.Resources.Projection.dll
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\net5.0-windows\'
     flattenFolders: true
 
@@ -72,7 +72,7 @@ steps:
   inputs:
     SourceFolder: '${{ parameters.MRTSourcesDirectory }}\packaging\Intellisense'
     Contents: |
-      Microsoft.ApplicationModel.Resources.Projection.xml
+      Microsoft.Windows.ApplicationModel.Resources.Projection.xml
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\lib\net5.0-windows\'
     flattenFolders: true
 
@@ -82,9 +82,9 @@ steps:
     SourceFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\mrtcore_binaries\lib\x86'
     Contents: |
       mrm.pdb
-      Microsoft.ApplicationModel.Resources.pdb
+      Microsoft.Windows.ApplicationModel.Resources.pdb
       mrm.dll
-      Microsoft.ApplicationModel.Resources.dll
+      Microsoft.Windows.ApplicationModel.Resources.dll
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\runtimes\win10-x86\native'
     flattenFolders: true
 
@@ -94,9 +94,9 @@ steps:
     SourceFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\mrtcore_binaries\lib\x64'
     Contents: |
       mrm.pdb
-      Microsoft.ApplicationModel.Resources.pdb
+      Microsoft.Windows.ApplicationModel.Resources.pdb
       mrm.dll
-      Microsoft.ApplicationModel.Resources.dll
+      Microsoft.Windows.ApplicationModel.Resources.dll
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\runtimes\win10-x64\native'
     flattenFolders: true
 
@@ -106,9 +106,9 @@ steps:
     SourceFolder: '$(Build.ArtifactStagingDirectory)\mrt_raw\mrtcore_binaries\lib\ARM64'
     Contents: |
       mrm.pdb
-      Microsoft.ApplicationModel.Resources.pdb
+      Microsoft.Windows.ApplicationModel.Resources.pdb
       mrm.dll
-      Microsoft.ApplicationModel.Resources.dll
+      Microsoft.Windows.ApplicationModel.Resources.dll
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\runtimes\win10-arm64\native'
     flattenFolders: true
 
@@ -144,13 +144,13 @@ steps:
   inputs:
     SourceFolder: '${{ parameters.MRTSourcesDirectory }}\packaging'
     Contents: |
-      Microsoft.ApplicationModel.Resources.PriGen.targets
-      Microsoft.ApplicationModel.Resources.References.targets
-      Microsoft.ApplicationModel.Resources.targets
-      native\Microsoft.ApplicationModel.Resources.C.props
-      native\Microsoft.ApplicationModel.Resources.props
-      native\Microsoft.ApplicationModel.Resources.targets
-      native\Microsoft.ApplicationModel.Resources.WinRt.props
+      Microsoft.Windows.ApplicationModel.Resources.PriGen.targets
+      Microsoft.Windows.ApplicationModel.Resources.References.targets
+      Microsoft.Windows.ApplicationModel.Resources.targets
+      native\Microsoft.Windows.ApplicationModel.Resources.C.props
+      native\Microsoft.Windows.ApplicationModel.Resources.props
+      native\Microsoft.Windows.ApplicationModel.Resources.targets
+      native\Microsoft.Windows.ApplicationModel.Resources.WinRt.props
       README.md
     TargetFolder: '$(Build.ArtifactStagingDirectory)\fullnuget\build'
     flattenFolders: false

dev/MRTCore/README.md

@@ -14,7 +14,7 @@ At its *core* 😎 MRT Core provides support to build resource Package Resource
 Install the NuGet package from [https://aka.ms/MRTCore](https://aka.ms/MRTCore), and you are ready to build PRI files from Visual Studio
 and use MRT Core APIs to load resources in your app.
 
-The C APIs can be found in [mrm.h](mrt/Core/src/MRM.h). The WinRT APIs can be found in [Microsoft.ApplicationModel.Resources.idl](mrt/Microsoft.ApplicationModel.Resources/src/Microsoft.ApplicationModel.Resources.idl).
+The C APIs can be found in [mrm.h](mrt/Core/src/MRM.h). The WinRT APIs can be found in [Microsoft.Windows.ApplicationModel.Resources.idl](mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.idl).
 
 ## Build and Test
 Load [MrtCore.sln](mrt/MrtCore.sln) in Visual Studion 2019, and build the solution. 

dev/MRTCore/mrt/Microsoft.ApplicationModel.Resources/src/ResourceManager.h

@@ -14,7 +14,7 @@ namespace MrtCoreUnpackagedTests
     using WEX.Logging.Interop;
     using WEX.TestExecution;
     using WEX.TestExecution.Markup;
-    using Microsoft.ApplicationModel.Resources;
+    using Microsoft.Windows.ApplicationModel.Resources;
 
     #region Helper class for WinRT activation
     internal class ActivationContext : IDisposable