diff --git a/src/Authoring/WinRT.Host/NetHost.targets b/src/Authoring/WinRT.Host/NetHost.targets index 06fe6fcaa..bb6145a45 100644 --- a/src/Authoring/WinRT.Host/NetHost.targets +++ b/src/Authoring/WinRT.Host/NetHost.targets @@ -12,6 +12,8 @@ win-x86 win-x64 + win-arm + win-arm64 diff --git a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj index ade8ec520..765917e51 100644 --- a/src/Authoring/WinRT.Host/WinRT.Host.vcxproj +++ b/src/Authoring/WinRT.Host/WinRT.Host.vcxproj @@ -1,224 +1,307 @@ - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - Win32Proj - {7e33bcb7-19c5-4061-981d-ba695322708a} - WinRTHost - - - - DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - DynamicLibrary - true - v142 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - false - WinRT.Host - - - false - WinRT.Host - - - false - WinRT.Host - - - false - WinRT.Host - - - - Level3 - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use - MultiThreaded - - - Windows - true - false - module.def - libcpmt.lib;advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib - /ignore:4099 %(AdditionalOptions) - false - libcpmtd.lib - UseLinkTimeCodeGeneration - - - - - Level3 - true - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use - MultiThreaded - - - Windows - true - true - true - false - module.def - advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib - /ignore:4099 %(AdditionalOptions) - false - UseLinkTimeCodeGeneration - - - - - Level3 - true - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use - MultiThreaded - ProgramDatabase - - - Windows - true - false - module.def - libcpmt.lib;advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib - /ignore:4099 %(AdditionalOptions) - false - libcpmtd.lib - UseLinkTimeCodeGeneration - - - - - Level3 - true - true - true - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - Use - MultiThreaded - - - Windows - true - true - true - false - module.def - advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib - /ignore:4099 %(AdditionalOptions) - false - UseLinkTimeCodeGeneration - - - - + + + + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 16.0 + Win32Proj + {7e33bcb7-19c5-4061-981d-ba695322708a} + WinRTHost + + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + true + v142 + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + DynamicLibrary + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + false + WinRT.Host + + + false + WinRT.Host + + + false + WinRT.Host + + + false + WinRT.Host + + + false + WinRT.Host + + + false + WinRT.Host + + + + Level3 + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + MultiThreaded + + + Windows + true + false + module.def + libcpmt.lib;advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib + /ignore:4099 %(AdditionalOptions) + false + libcpmtd.lib + UseLinkTimeCodeGeneration + + + + + Level3 + true + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + MultiThreaded + + + Windows + true + true + true + false + module.def + advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib + /ignore:4099 %(AdditionalOptions) + false + UseLinkTimeCodeGeneration + + + + + Level3 + true + NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + MultiThreaded + ProgramDatabase + + + Windows + true + false + module.def + libcpmt.lib;advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib + /ignore:4099 %(AdditionalOptions) + false + libcpmtd.lib + UseLinkTimeCodeGeneration + + + + + Level3 + true + NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + MultiThreaded + ProgramDatabase + + + Windows + true + false + module.def + libcpmt.lib;advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib + /ignore:4099 %(AdditionalOptions) + false + libcpmtd.lib + UseLinkTimeCodeGeneration + + + + + Level3 + true + true + true + NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + MultiThreaded + + + Windows + true + true + true + false + module.def + advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib + /ignore:4099 %(AdditionalOptions) + false + UseLinkTimeCodeGeneration + + + + + Level3 + true + true + true + NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + MultiThreaded + + + Windows + true + true + true + false + module.def + advapi32.lib;kernel32.lib;user32.lib;%(AdditionalDependencies);WindowsApp.lib + /ignore:4099 %(AdditionalOptions) + false + UseLinkTimeCodeGeneration + + + + - /GL- %(AdditionalOptions) - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - {0bb8f82d-874e-45aa-bca3-20ce0562164a} - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + LINK : fatal error C1047: The object or library file ...libnethost.lib was created by a different version of the compiler than other objects like dllmain.obj... --> + /GL- %(AdditionalOptions) + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + {0bb8f82d-874e-45aa-bca3-20ce0562164a} + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj index 2c2149c4f..a56defaa0 100644 --- a/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj +++ b/src/Tests/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj @@ -3,10 +3,18 @@ + + Debug + ARM64 + Debug Win32 + + Release + ARM64 + Release Win32 @@ -52,7 +60,9 @@ true + true true + true @@ -121,6 +131,21 @@ Console + + + Use + pch.h + Disabled + X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + DebugFull + Console + + Use @@ -153,6 +178,22 @@ true + + + Use + pch.h + X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/src/Tests/HostTest/HostTest.vcxproj b/src/Tests/HostTest/HostTest.vcxproj index 0846aa27b..5bc362edd 100644 --- a/src/Tests/HostTest/HostTest.vcxproj +++ b/src/Tests/HostTest/HostTest.vcxproj @@ -1,260 +1,329 @@ - - - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {b511b7c9-c8e2-47ed-a0d1-538c00747d30} - Win32Proj - Application - v142 - Unicode - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - {ef3326b5-716f-41d2-ab30-4efab30955e2} - - - {c6d580c5-7037-4733-b933-916ff400afe2} - - - {ffa9a78b-f53f-43ee-af87-24a80f4c330a} - - - {0bb8f82d-874e-45aa-bca3-20ce0562164a} - - - {7e33bcb7-19c5-4061-981d-ba695322708a} - - - {25244ced-966e-45f2-9711-1f51e951ff89} - - - - - true - Document - true - true - true - - - true - Document - true - true - true - - - - - true - Document - true - true - true - - - - true - Document - true - true - true - - - true - Document - true - true - true - - - true - Document - true - true - true - - - - - - true - true - true - true - - - true - true - true - true - - - - - true - true - true - true - - - - - true - true - true - true - - - - - true - true - true - true - - - - - true - true - true - true - - - - - true - true - true - true - - - - - - - - true - true - true - true - - - - - - - - - - - - Use - pch.h - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - true - Console - - - - - Use - pch.h - Disabled - X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - - - DebugFull - Console - - - - - Use - pch.h - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - ProgramDatabase - - - true - Console - true - true - - - - - Use - pch.h - X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - ProgramDatabase - - - true - Console - true - true - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - + + + + + + + Debug + ARM64 + + + Debug + Win32 + + + Release + ARM64 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {b511b7c9-c8e2-47ed-a0d1-538c00747d30} + Win32Proj + Application + v142 + Unicode + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + + + + + {ef3326b5-716f-41d2-ab30-4efab30955e2} + + + {c6d580c5-7037-4733-b933-916ff400afe2} + + + {ffa9a78b-f53f-43ee-af87-24a80f4c330a} + + + {0bb8f82d-874e-45aa-bca3-20ce0562164a} + + + {7e33bcb7-19c5-4061-981d-ba695322708a} + + + {25244ced-966e-45f2-9711-1f51e951ff89} + + + + + true + Document + true + true + true + true + true + + + true + Document + true + true + true + true + true + + + + + true + Document + true + true + true + true + true + + + + true + Document + true + true + true + true + true + + + true + Document + true + true + true + true + true + + + true + Document + true + true + true + true + true + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + + + + + + + + + + Use + pch.h + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + true + Console + + + + + Use + pch.h + Disabled + X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + DebugFull + Console + + + + + Use + pch.h + Disabled + X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + DebugFull + Console + + + + + Use + pch.h + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + Use + pch.h + X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + Use + pch.h + X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + + + true + Console + true + true + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + \ No newline at end of file diff --git a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj index 6e2488365..9b9ed5e54 100644 --- a/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj +++ b/src/Tests/TestComponentCSharp/TestComponentCSharp.vcxproj @@ -17,6 +17,10 @@ + + Debug + ARM64 + Debug Win32 @@ -25,6 +29,10 @@ Debug x64 + + Release + ARM64 + Release Win32 @@ -54,13 +62,16 @@ TestComponentCSharp.def TestComponentCSharp.def TestComponentCSharp.def + TestComponentCSharp.def TestComponentCSharp.def + TestComponentCSharp.def MultiThreadedDLL MultiThreadedDLL + MultiThreadedDLL diff --git a/src/build.cmd b/src/build.cmd index 960eff8a8..fc98cf84e 100644 --- a/src/build.cmd +++ b/src/build.cmd @@ -149,6 +149,10 @@ if ErrorLevel 1 ( ) if "%cswinrt_build_only%"=="true" goto :eof +rem Tests are not yet enabled for ARM builds (not supported by Project Reunion) +if %cswinrt_platform%==arm goto :eof +if %cswinrt_platform%==arm64 goto :eof + :test :unittest rem Build/Run xUnit tests, generating xml output report for Azure Devops reporting, via XunitXml.TestLogger NuGet @@ -174,8 +178,6 @@ sn -Vr Microsoft.Windows.SDK.NET.dll vstest.console.exe ObjectLifetimeTests.Lifted.build.appxrecipe /TestAdapterPath:"%USERPROFILE%\.nuget\packages\mstest.testadapter\2.2.4-preview-20210513-02\build\_common" /framework:FrameworkUap10 /logger:trx;LogFileName=%this_dir%\VsTestResults.trx popd - - rem WinUI NuGet package's Microsoft.WinUI.AppX.targets attempts to import a file that does not exist, even when rem executing "dotnet test --no-build ...", which evidently still needs to parse and load the entire project. rem Work around by using a dummy targets file and assigning it to the MsAppxPackageTargets property. @@ -197,7 +199,6 @@ if ErrorLevel 1 ( exit /b !ErrorLevel! ) - :authortest rem Run Authoring tests echo Running cswinrt authoring tests for %cswinrt_platform% %cswinrt_configuration% diff --git a/src/cswinrt.sln b/src/cswinrt.sln index 601b7da7e..f68da54af 100644 --- a/src/cswinrt.sln +++ b/src/cswinrt.sln @@ -128,13 +128,13 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Debug|ARM.ActiveCfg = Debug|Win32 - {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Debug|ARM64.ActiveCfg = Debug|Win32 + {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Debug|x64.ActiveCfg = Debug|x64 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Debug|x64.Build.0 = Debug|x64 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Debug|x86.ActiveCfg = Debug|Win32 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Debug|x86.Build.0 = Debug|Win32 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Release|ARM.ActiveCfg = Release|Win32 - {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Release|ARM64.ActiveCfg = Release|Win32 + {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Release|ARM64.ActiveCfg = Release|ARM64 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Release|x64.ActiveCfg = Release|x64 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Release|x64.Build.0 = Release|x64 {7E3A9AB3-8CBB-4B9C-BA76-0FE7108DCAEB}.Release|x86.ActiveCfg = Release|Win32 @@ -153,12 +153,14 @@ Global {9A9F52CA-F624-43A4-B5EF-C50861F584C2}.Release|x86.Build.0 = Release|x86 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Debug|ARM.ActiveCfg = Debug|Win32 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Debug|ARM64.ActiveCfg = Debug|Win32 + {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Debug|ARM64.Build.0 = Debug|Win32 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Debug|x64.ActiveCfg = Debug|x64 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Debug|x64.Build.0 = Debug|x64 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Debug|x86.ActiveCfg = Debug|Win32 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Debug|x86.Build.0 = Debug|Win32 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Release|ARM.ActiveCfg = Release|Win32 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Release|ARM64.ActiveCfg = Release|Win32 + {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Release|ARM64.Build.0 = Release|Win32 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Release|x64.ActiveCfg = Release|x64 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Release|x64.Build.0 = Release|x64 {6ACFD2B2-E8AA-4CD4-AAD8-213CE8BB2637}.Release|x86.ActiveCfg = Release|Win32 @@ -219,12 +221,14 @@ Global {C6D580C5-7037-4733-B933-916FF400AFE2}.Release|x86.Build.0 = Release|x86 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Debug|ARM.ActiveCfg = Debug|x86 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Debug|ARM64.ActiveCfg = Debug|x86 + {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Debug|ARM64.Build.0 = Debug|x86 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Debug|x64.ActiveCfg = Debug|x64 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Debug|x64.Build.0 = Debug|x64 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Debug|x86.ActiveCfg = Debug|x86 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Debug|x86.Build.0 = Debug|x86 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Release|ARM.ActiveCfg = Release|x86 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Release|ARM64.ActiveCfg = Release|x86 + {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Release|ARM64.Build.0 = Release|x86 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Release|x64.ActiveCfg = Release|x64 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Release|x64.Build.0 = Release|x64 {FFA9A78B-F53F-43EE-AF87-24A80F4C330A}.Release|x86.ActiveCfg = Release|x86 @@ -278,25 +282,27 @@ Global {03EEF460-2F10-4FBE-AFFA-53477D3FC8D5}.Release|x86.ActiveCfg = Release|x86 {03EEF460-2F10-4FBE-AFFA-53477D3FC8D5}.Release|x86.Build.0 = Release|x86 {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|ARM.ActiveCfg = Debug|Win32 - {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|ARM64.ActiveCfg = Debug|Win32 + {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|ARM64.Build.0 = Debug|ARM64 {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|x64.ActiveCfg = Debug|x64 {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|x64.Build.0 = Debug|x64 {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|x86.ActiveCfg = Debug|Win32 {7E33BCB7-19C5-4061-981D-BA695322708A}.Debug|x86.Build.0 = Debug|Win32 {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|ARM.ActiveCfg = Release|Win32 - {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|ARM64.ActiveCfg = Release|Win32 + {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|ARM64.ActiveCfg = Release|ARM64 + {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|ARM64.Build.0 = Release|ARM64 {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|x64.ActiveCfg = Release|x64 {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|x64.Build.0 = Release|x64 {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|x86.ActiveCfg = Release|Win32 {7E33BCB7-19C5-4061-981D-BA695322708A}.Release|x86.Build.0 = Release|Win32 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Debug|ARM.ActiveCfg = Debug|Win32 - {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Debug|ARM64.ActiveCfg = Debug|Win32 + {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Debug|ARM64.ActiveCfg = Debug|ARM64 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Debug|x64.ActiveCfg = Debug|x64 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Debug|x64.Build.0 = Debug|x64 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Debug|x86.ActiveCfg = Debug|Win32 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Debug|x86.Build.0 = Debug|Win32 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Release|ARM.ActiveCfg = Release|Win32 - {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Release|ARM64.ActiveCfg = Release|Win32 + {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Release|ARM64.ActiveCfg = Release|ARM64 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Release|x64.ActiveCfg = Release|x64 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Release|x64.Build.0 = Release|x64 {B511B7C9-C8E2-47ED-A0D1-538C00747D30}.Release|x86.ActiveCfg = Release|Win32 @@ -358,12 +364,12 @@ Global {41E2A272-150F-42F5-AD40-047AAD9088A0}.Release|x86.ActiveCfg = Release|x86 {41E2A272-150F-42F5-AD40-047AAD9088A0}.Release|x86.Build.0 = Release|x86 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Debug|ARM.ActiveCfg = Debug|Win32 - {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Debug|ARM64.ActiveCfg = Debug|Win32 + {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Debug|ARM64.ActiveCfg = Debug|ARM64 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Debug|x64.ActiveCfg = Debug|x64 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Debug|x86.ActiveCfg = Debug|Win32 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Debug|x86.Build.0 = Debug|Win32 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Release|ARM.ActiveCfg = Release|Win32 - {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Release|ARM64.ActiveCfg = Release|Win32 + {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Release|ARM64.ActiveCfg = Release|ARM64 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Release|x64.ActiveCfg = Release|x64 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Release|x64.Build.0 = Release|x64 {0212A7C5-8D3F-443C-9EBC-1F28091FDF88}.Release|x86.ActiveCfg = Release|Win32 @@ -399,7 +405,6 @@ Global {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Debug|ARM.ActiveCfg = Debug|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Debug|ARM.Build.0 = Debug|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Debug|ARM64.Build.0 = Debug|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Debug|x64.ActiveCfg = Debug|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Debug|x64.Build.0 = Debug|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -407,15 +412,12 @@ Global {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|ARM.ActiveCfg = Release|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|ARM.Build.0 = Release|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|ARM64.ActiveCfg = Release|Any CPU - {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|ARM64.Build.0 = Release|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|x64.ActiveCfg = Release|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|x64.Build.0 = Release|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|x86.ActiveCfg = Release|Any CPU {FC05C557-C974-4CB3-9DA7-BB5476710E91}.Release|x86.Build.0 = Release|Any CPU {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|ARM.ActiveCfg = Debug|x86 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|ARM64.ActiveCfg = Debug|arm64 - {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|ARM64.Build.0 = Debug|arm64 - {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|ARM64.Deploy.0 = Debug|arm64 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|x64.ActiveCfg = Debug|x64 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|x64.Deploy.0 = Debug|x64 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|x86.ActiveCfg = Debug|x86 @@ -423,8 +425,6 @@ Global {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Debug|x86.Deploy.0 = Debug|x86 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|ARM.ActiveCfg = Release|x86 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|ARM64.ActiveCfg = Release|arm64 - {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|ARM64.Build.0 = Release|arm64 - {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|ARM64.Deploy.0 = Release|arm64 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|x64.ActiveCfg = Release|x64 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|x64.Build.0 = Release|x64 {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|x64.Deploy.0 = Release|x64 @@ -433,27 +433,23 @@ Global {75B1621F-EC51-4D77-BD7E-BEE576B3ADC9}.Release|x86.Deploy.0 = Release|x86 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Debug|ARM.ActiveCfg = Debug|Win32 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Debug|ARM64.ActiveCfg = Debug|arm64 - {493C7729-2F21-4198-AB09-BDF56BF501D3}.Debug|ARM64.Build.0 = Debug|arm64 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Debug|x64.ActiveCfg = Debug|x64 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Debug|x86.ActiveCfg = Debug|Win32 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Debug|x86.Build.0 = Debug|Win32 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Release|ARM.ActiveCfg = Release|Win32 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Release|ARM64.ActiveCfg = Release|arm64 - {493C7729-2F21-4198-AB09-BDF56BF501D3}.Release|ARM64.Build.0 = Release|arm64 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Release|x64.ActiveCfg = Release|x64 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Release|x64.Build.0 = Release|x64 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Release|x86.ActiveCfg = Release|Win32 {493C7729-2F21-4198-AB09-BDF56BF501D3}.Release|x86.Build.0 = Release|Win32 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Debug|ARM.ActiveCfg = Debug|x86 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Debug|ARM64.ActiveCfg = Debug|arm64 - {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Debug|ARM64.Build.0 = Debug|arm64 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Debug|x64.ActiveCfg = Debug|x64 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Debug|x64.Build.0 = Debug|x64 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Debug|x86.ActiveCfg = Debug|x86 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Debug|x86.Build.0 = Debug|x86 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Release|ARM.ActiveCfg = Release|x86 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Release|ARM64.ActiveCfg = Release|arm64 - {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Release|ARM64.Build.0 = Release|arm64 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Release|x64.ActiveCfg = Release|x64 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Release|x64.Build.0 = Release|x64 {BA7390DC-6CD3-44BB-B8B0-32BF2D068450}.Release|x86.ActiveCfg = Release|x86 @@ -461,7 +457,6 @@ Global {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Debug|ARM.ActiveCfg = Debug|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Debug|ARM.Build.0 = Debug|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Debug|ARM64.Build.0 = Debug|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Debug|x64.ActiveCfg = Debug|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Debug|x64.Build.0 = Debug|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -469,7 +464,6 @@ Global {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Release|ARM.ActiveCfg = Release|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Release|ARM.Build.0 = Release|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Release|ARM64.ActiveCfg = Release|Any CPU - {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Release|ARM64.Build.0 = Release|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Release|x64.ActiveCfg = Release|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Release|x64.Build.0 = Release|Any CPU {AE3B0611-2FBB-42AB-A245-B4E79868A5F9}.Release|x86.ActiveCfg = Release|Any CPU