diff --git a/.ado/config/PoliCheckExclusions.xml b/.ado/config/PoliCheckExclusions.xml index 2f64d1a9c6e..73748b95261 100644 --- a/.ado/config/PoliCheckExclusions.xml +++ b/.ado/config/PoliCheckExclusions.xml @@ -8,7 +8,7 @@ NOTE: Use ALL CAPS for excluded terms below else it will silently ignore them. A - .GIT|ARM|ARM64|BUILD|DIST|GENERATED FILES|NODE_MODULES|OUTPUT|TARGET|X64|X86|PATCHES|LIB-COMMONJS + .GIT|ARM|ARM64|ARM64EC|BUILD|DIST|GENERATED FILES|NODE_MODULES|OUTPUT|TARGET|X64|X86|PATCHES|LIB-COMMONJS diff --git a/.ado/jobs/desktop.yml b/.ado/jobs/desktop.yml index 71231762012..ff28d54aa49 100644 --- a/.ado/jobs/desktop.yml +++ b/.ado/jobs/desktop.yml @@ -23,12 +23,12 @@ parameters: - Name: X86Debug BuildConfiguration: Debug BuildPlatform: x86 - - Name: Arm64Debug + - Name: ARM64ECDebug BuildConfiguration: Debug - BuildPlatform: ARM64 - - Name: Arm64Release + BuildPlatform: ARM64EC + - Name: ARM64ECRelease BuildConfiguration: Release - BuildPlatform: ARM64 + BuildPlatform: ARM64EC - Name: X86Release BuildConfiguration: Release BuildPlatform: x86 @@ -47,19 +47,19 @@ parameters: - Name: X86Debug BuildConfiguration: Debug BuildPlatform: x86 - - Name: Arm64Debug + - Name: ARM64ECDebug BuildConfiguration: Debug - BuildPlatform: ARM64 - - Name: Arm64Release + BuildPlatform: ARM64EC + - Name: ARM64ECRelease BuildConfiguration: Release - BuildPlatform: ARM64 + BuildPlatform: ARM64EC - Name: X86Release BuildConfiguration: Release BuildPlatform: x86 - - X86ReleaseFabric: + - Name: X86ReleaseFabric # Specifically built so binskim / tests get run on fabric BuildConfiguration: Release BuildPlatform: x86 - UseFabric: true + UseFabric: true jobs: - ${{ each config in parameters.buildMatrix }}: @@ -137,7 +137,7 @@ jobs: - template: ../templates/discover-google-test-adapter.yml - - ${{ if ne(matrix.BuildPlatform, 'ARM64') }}: + - ${{ if ne(matrix.BuildPlatform, 'ARM64EC') }}: - task: VSTest@2 displayName: Run Desktop Unit Tests timeoutInMinutes: 5 # Set smaller timeout , due to hangs @@ -159,7 +159,7 @@ jobs: failOnMinTestsNotRun: true # Suspected debug assert in TestRunner hanging tests randomly. Run only on Release for now. - - ${{ if and(eq(matrix.BuildConfiguration, 'Release'), ne(variables['Desktop.IntegrationTests.SkipRNTester'], true), ne(matrix.BuildPlatform, 'ARM64')) }}: + - ${{ if and(eq(matrix.BuildConfiguration, 'Release'), ne(variables['Desktop.IntegrationTests.SkipRNTester'], true), ne(matrix.BuildPlatform, 'ARM64EC')) }}: - task: PowerShell@2 displayName: Set up test servers inputs: diff --git a/.ado/jobs/nuget-desktop.yml b/.ado/jobs/nuget-desktop.yml index 11da767a469..f517393064a 100644 --- a/.ado/jobs/nuget-desktop.yml +++ b/.ado/jobs/nuget-desktop.yml @@ -9,6 +9,7 @@ jobs: dependsOn: - DesktopX64Release - DesktopX86Debug + - DesktopARM64ECRelease pool: ${{ parameters.AgentPool.Small }} timeoutInMinutes: 30 # how long to run the job before automatically cancelling @@ -31,3 +32,5 @@ jobs: configuration: Release - platform: x86 configuration: Debug + - platform: ARM64EC + configuration: Release diff --git a/.ado/publish.yml b/.ado/publish.yml index 7af5e24e237..6f266c88f7d 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -42,13 +42,13 @@ parameters: BuildConfiguration: Release BuildPlatform: x86 UseFabric: false - - Name: ARM64Debug + - Name: ARM64ECDebug BuildConfiguration: Debug - BuildPlatform: ARM64 + BuildPlatform: ARM64EC UseFabric: false - - Name: ARM64Release + - Name: ARM64ECRelease BuildConfiguration: Release - BuildPlatform: ARM64 + BuildPlatform: ARM64EC UseFabric: false - Name: X64DebugFabric BuildConfiguration: Debug @@ -110,7 +110,7 @@ jobs: persistCredentials: false # We're going to use rnbot's git creds to publish - powershell: gci env:/BUILD_* - displayName: Show build information + displayName: Show build information - template: templates/prepare-js-env.yml @@ -159,13 +159,13 @@ jobs: displayName: 📒 Generate Manifest Npm inputs: BuildDropPath: $(System.DefaultWorkingDirectory) - + - task: PublishPipelineArtifact@1 displayName: 📒 Publish Manifest Npm inputs: artifactName: SBom-$(System.JobAttempt) targetPath: $(System.DefaultWorkingDirectory)/_manifest - + - template: templates/publish-version-vars.yml - ${{ each matrix in parameters.desktopBuildMatrix }}: @@ -232,7 +232,7 @@ jobs: BuildPlatform: x86 Arm64Debug: BuildConfiguration: Debug - BuildPlatform: ARM64 + BuildPlatform: ARM64 pool: ${{ parameters.AgentPool.Large }} steps: @@ -318,7 +318,7 @@ jobs: - platform: x86 configuration: Release - platform: ARM64 - configuration: Release + configuration: Release - platform: x64 configuration: Debug - platform: x86 diff --git a/.ado/templates/prepare-build-env.yml b/.ado/templates/prepare-build-env.yml index b7df09ff82b..7cbe04fb229 100644 --- a/.ado/templates/prepare-build-env.yml +++ b/.ado/templates/prepare-build-env.yml @@ -8,6 +8,7 @@ parameters: # - x86 # - x64 # - ARM64 + # - ARM64EC - name: configuration type: string # Publish still using runtime matrix diff --git a/change/react-native-windows-0f37d22b-b875-4d1e-a374-8dd312f6aaba.json b/change/react-native-windows-0f37d22b-b875-4d1e-a374-8dd312f6aaba.json new file mode 100644 index 00000000000..5b801b55b53 --- /dev/null +++ b/change/react-native-windows-0f37d22b-b875-4d1e-a374-8dd312f6aaba.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "Port Desktop DLL to ARM64EC (#13320)", + "packageName": "react-native-windows", + "email": "julio.rocha@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/vnext/Common/Common.vcxproj b/vnext/Common/Common.vcxproj index ce608f87a42..34af040e48a 100644 --- a/vnext/Common/Common.vcxproj +++ b/vnext/Common/Common.vcxproj @@ -11,10 +11,18 @@ + + Debug + ARM64EC + Debug x64 + + Release + ARM64EC + Release x64 diff --git a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj index 548c2ba6840..fba21e17b4a 100644 --- a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj +++ b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj @@ -1,10 +1,18 @@ + + Debug + ARM64EC + Debug x64 + + Release + ARM64EC + Release x64 diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index e7338281016..abd99e58705 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -5,6 +5,10 @@ Debug ARM64 + + Debug + ARM64EC + Debug x64 @@ -13,6 +17,10 @@ Release ARM64 + + Release + ARM64EC + Release x64 @@ -99,6 +107,12 @@ WindowsApp_downlevel.lib; %(AdditionalDependencies) + + %(AdditionalDependencies); + Bcrypt.lib; + Chakrart.lib; + Pathcch.lib + Chakra.dll;%(DelayLoadDLLs) @@ -116,6 +130,11 @@ react-native-win32.x64.def + + + react-native-win32.x64.def + + react-native-win32.x86.def @@ -155,7 +174,6 @@ - @@ -171,4 +189,4 @@ - + \ No newline at end of file diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index a893bd9caf8..9856ed0df0c 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -1,10 +1,18 @@ + + Debug + ARM64EC + Debug x64 + + Release + ARM64EC + Release x64 diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj index a952b828942..9ee0e7f13ff 100644 --- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj +++ b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj @@ -1,10 +1,18 @@ + + Debug + ARM64EC + Debug x64 + + Release + ARM64EC + Release x64 diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index ab9ead17070..95aca424103 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -7,10 +7,18 @@ false + + Debug + ARM64EC + Debug x64 + + Release + ARM64EC + Release x64 diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index 2273429e126..123b3409d9c 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -5,6 +5,10 @@ Debug ARM64 + + Debug + ARM64EC + Debug x64 @@ -13,6 +17,10 @@ Release ARM64 + + Release + ARM64EC + Release x64 @@ -275,7 +283,6 @@ - diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets index 1a8aab37f12..8ba27448df3 100644 --- a/vnext/Directory.Build.targets +++ b/vnext/Directory.Build.targets @@ -21,4 +21,9 @@ + + win10-x64 + <_WindowsAppSDKFoundationPlatform>x64 + <_MrtCoreRuntimeIdentifier>x64 + \ No newline at end of file diff --git a/vnext/Folly/Folly.vcxproj b/vnext/Folly/Folly.vcxproj index d3bbbfc37cd..1a22164ae4e 100644 --- a/vnext/Folly/Folly.vcxproj +++ b/vnext/Folly/Folly.vcxproj @@ -17,6 +17,10 @@ Debug ARM64 + + Debug + ARM64EC + Release ARM64 @@ -25,6 +29,10 @@ Debug x64 + + Release + ARM64EC + Release x64 @@ -279,7 +287,7 @@ SourceUrl="https://github.com/facebook/folly/archive/v$(FollyVersion).zip" DestinationFileName="$(FollyZipFile)" DestinationFolder="$(FollyZipDir)" - Retries="10"/> + Retries="10" /> diff --git a/vnext/FollyWin32/FollyWin32.vcxproj b/vnext/FollyWin32/FollyWin32.vcxproj index 15d26aecaa1..2124fcf541e 100644 --- a/vnext/FollyWin32/FollyWin32.vcxproj +++ b/vnext/FollyWin32/FollyWin32.vcxproj @@ -12,6 +12,10 @@ Debug ARM64 + + Debug + ARM64EC + Debug x64 @@ -20,6 +24,10 @@ Release ARM64 + + Release + ARM64EC + Release x64 diff --git a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj index 650ec8c193e..c3349374622 100644 --- a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj +++ b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj @@ -1,6 +1,5 @@  - + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5} StaticLibrary @@ -12,6 +11,10 @@ Debug ARM64 + + Debug + ARM64EC + Debug x64 @@ -20,6 +23,10 @@ Release ARM64 + + Release + ARM64EC + Release x64 diff --git a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj index 65e4c389605..cab2ad955bd 100644 --- a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj +++ b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj @@ -13,10 +13,18 @@ + + Debug + ARM64EC + Debug Win32 + + Release + ARM64EC + Release Win32 @@ -85,6 +93,11 @@ WIN32;%(PreprocessorDefinitions) + + + WIN32;%(PreprocessorDefinitions) + + MaxSpeed diff --git a/vnext/PropertySheets/ARM64EC.props b/vnext/PropertySheets/ARM64EC.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/ARM64EC.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/Application/ARM64EC.props b/vnext/PropertySheets/Application/ARM64EC.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/Application/ARM64EC.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/DynamicLibrary/ARM64EC.props b/vnext/PropertySheets/DynamicLibrary/ARM64EC.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/DynamicLibrary/ARM64EC.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/PropertySheets/JSEngine.props b/vnext/PropertySheets/JSEngine.props index f33a7dd79c7..85151103924 100644 --- a/vnext/PropertySheets/JSEngine.props +++ b/vnext/PropertySheets/JSEngine.props @@ -22,12 +22,14 @@ true false + x64 false 0.71.8 ReactNative.V8Jsi.Windows $(V8PackageName).UWP $(NuGetPackageRoot)\$(V8PackageName).$(V8Version) + x64 diff --git a/vnext/PropertySheets/StaticLibrary/ARM64EC.props b/vnext/PropertySheets/StaticLibrary/ARM64EC.props new file mode 100644 index 00000000000..08f0406be02 --- /dev/null +++ b/vnext/PropertySheets/StaticLibrary/ARM64EC.props @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj b/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj index 4806db5051c..4adec1b00df 100644 --- a/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj +++ b/vnext/ReactCommon.UnitTests/ReactCommon.UnitTests.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM64EC + Debug x64 + + Release + ARM64EC + Release x64 @@ -52,7 +60,7 @@ true - true + true diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index 0262c3a0163..06571858a60 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -16,6 +16,10 @@ Debug ARM64 + + Debug + ARM64EC + Release ARM64 @@ -24,6 +28,10 @@ Debug x64 + + Release + ARM64EC + Release x64 diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index ceb106bbf76..364ead6d248 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -120,25 +120,33 @@ Global Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Debug|ARM64 = Debug|ARM64 + Debug|ARM64EC = Debug|ARM64EC Release|x64 = Release|x64 Release|x86 = Release|x86 Release|ARM64 = Release|ARM64 + Release|ARM64EC = Release|ARM64EC EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64EC.Build.0 = Release|ARM64EC {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.ActiveCfg = Debug|ARM64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64.Build.0 = Debug|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.ActiveCfg = Debug|x64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x64.Build.0 = Debug|x64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.ActiveCfg = Debug|Win32 @@ -146,6 +154,8 @@ Global {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Debug|x86.Deploy.0 = Debug|Win32 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.ActiveCfg = Release|ARM64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64.Build.0 = Release|ARM64 + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|ARM64EC.Build.0 = Release|ARM64EC {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.ActiveCfg = Release|x64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x64.Build.0 = Release|x64 {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.ActiveCfg = Release|Win32 @@ -153,148 +163,200 @@ Global {14B93DC8-FD93-4A6D-81CB-8BC96644501C}.Release|x86.Deploy.0 = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64EC.Build.0 = Release|ARM64EC {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM64.Build.0 = Debug|ARM64 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.ActiveCfg = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.Build.0 = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.ActiveCfg = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.Build.0 = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM64.ActiveCfg = Release|ARM64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM64.Build.0 = Release|ARM64 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM64EC.Build.0 = Release|ARM64EC {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.ActiveCfg = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.Build.0 = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.ActiveCfg = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.Build.0 = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM64.ActiveCfg = Debug|Win32 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.ActiveCfg = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.Build.0 = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.Build.0 = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM64.ActiveCfg = Release|Win32 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.ActiveCfg = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.Build.0 = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.Build.0 = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM64.ActiveCfg = Debug|ARM64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM64.Build.0 = Debug|ARM64 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.ActiveCfg = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.Build.0 = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.ActiveCfg = Debug|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.Build.0 = Debug|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM64.ActiveCfg = Release|ARM64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM64.Build.0 = Release|ARM64 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM64EC.Build.0 = Release|ARM64EC {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.ActiveCfg = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.Build.0 = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.ActiveCfg = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.Build.0 = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM64.ActiveCfg = Debug|ARM64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM64.Build.0 = Debug|ARM64 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.ActiveCfg = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.Build.0 = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.ActiveCfg = Debug|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.Build.0 = Debug|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM64.ActiveCfg = Release|ARM64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM64.Build.0 = Release|ARM64 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM64EC.Build.0 = Release|ARM64EC {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.ActiveCfg = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.Build.0 = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.ActiveCfg = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.Build.0 = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM64.ActiveCfg = Debug|Win32 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.ActiveCfg = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.Build.0 = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.Build.0 = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM64.ActiveCfg = Release|Win32 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.ActiveCfg = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.Build.0 = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.ActiveCfg = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.Build.0 = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64.ActiveCfg = Debug|ARM64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64.Build.0 = Debug|ARM64 + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.ActiveCfg = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.Build.0 = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.Build.0 = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64.ActiveCfg = Release|ARM64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64.Build.0 = Release|ARM64 + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.ActiveCfg = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.Build.0 = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.ActiveCfg = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.Build.0 = Release|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|ARM64.ActiveCfg = Debug|Win32 + {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x64.ActiveCfg = Debug|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x64.Build.0 = Debug|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x86.ActiveCfg = Debug|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x86.Build.0 = Debug|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|ARM64.ActiveCfg = Release|Win32 + {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x64.ActiveCfg = Release|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x64.Build.0 = Release|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.ActiveCfg = Release|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.Build.0 = Release|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM64.ActiveCfg = Debug|ARM64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM64.Build.0 = Debug|ARM64 + {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.ActiveCfg = Debug|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.Build.0 = Debug|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.ActiveCfg = Debug|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.Build.0 = Debug|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM64.ActiveCfg = Release|ARM64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM64.Build.0 = Release|ARM64 + {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.ActiveCfg = Release|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.Build.0 = Release|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.ActiveCfg = Release|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.Build.0 = Release|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64.ActiveCfg = Debug|ARM64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64.Build.0 = Debug|ARM64 + {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.ActiveCfg = Debug|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.Build.0 = Debug|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.ActiveCfg = Debug|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.Build.0 = Debug|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64.ActiveCfg = Release|ARM64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64.Build.0 = Release|ARM64 + {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.ActiveCfg = Release|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.Build.0 = Release|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.ActiveCfg = Release|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.Build.0 = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64EC.Build.0 = Debug|ARM64EC {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64EC.ActiveCfg = Release|ARM64EC + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64EC.Build.0 = Release|ARM64EC {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.Build.0 = Debug|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.ActiveCfg = Debug|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.Build.0 = Debug|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM64.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.ActiveCfg = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Debug|ARM64.ActiveCfg = Debug|x64 + {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Debug|x64.ActiveCfg = Debug|x64 {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Debug|x64.Build.0 = Debug|x64 {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Debug|x86.ActiveCfg = Debug|x64 {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Release|ARM64.ActiveCfg = Release|x64 + {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Release|ARM64EC.ActiveCfg = Release|ARM64EC {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Release|x64.ActiveCfg = Release|x64 {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Release|x64.Build.0 = Release|x64 {B0941079-7441-4A69-868C-FE5EC62C2E9E}.Release|x86.ActiveCfg = Release|x64 + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|ARM64.Build.0 = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|ARM64EC.ActiveCfg = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|ARM64EC.Build.0 = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|x64.ActiveCfg = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|x64.Build.0 = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|x86.ActiveCfg = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Debug|x86.Build.0 = Debug|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|ARM64.ActiveCfg = Release|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|ARM64.Build.0 = Release|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|ARM64EC.ActiveCfg = Release|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|ARM64EC.Build.0 = Release|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|x64.ActiveCfg = Release|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|x64.Build.0 = Release|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|x86.ActiveCfg = Release|Any CPU + {C5B2EB41-849E-41F7-BC70-DEFF26F09E5E}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vnext/Scripts/OfficeReact.Win32.nuspec b/vnext/Scripts/OfficeReact.Win32.nuspec index f0387c51d7f..e8b7b71646e 100644 --- a/vnext/Scripts/OfficeReact.Win32.nuspec +++ b/vnext/Scripts/OfficeReact.Win32.nuspec @@ -15,25 +15,23 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + diff --git a/vnext/Scripts/StripAdditionalPlatformsFromNuspec.ps1 b/vnext/Scripts/StripAdditionalPlatformsFromNuspec.ps1 index eae50eac239..35e17286edd 100644 --- a/vnext/Scripts/StripAdditionalPlatformsFromNuspec.ps1 +++ b/vnext/Scripts/StripAdditionalPlatformsFromNuspec.ps1 @@ -16,7 +16,7 @@ If ($PSBoundParameters['Debug']) { Write-Output "Creating filtered version of : $nuspec" $xml = [xml](gc $nuspec) -$allSlices = @("x64.Release", "x64.Debug", "x86.Release", "x86.Debug", "ARM64.Release", "ARM64.Debug") +$allSlices = @("x64.Release", "x64.Debug", "x86.Release", "x86.Debug", "ARM64.Release", "ARM64.Debug", "ARM64EC.Debug", "ARM64EC.Release") $nodesToRemove = @(); diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj index 4265eecb2a3..8a37193a375 100644 --- a/vnext/Test/React.Windows.Test.vcxproj +++ b/vnext/Test/React.Windows.Test.vcxproj @@ -11,6 +11,10 @@ Debug ARM64 + + Debug + ARM64EC + Debug x64 @@ -19,6 +23,10 @@ Release ARM64 + + Release + ARM64EC + Release x64 diff --git a/vnext/fmt/fmt.vcxproj b/vnext/fmt/fmt.vcxproj index ceb3dc67aa0..20f21859bc6 100644 --- a/vnext/fmt/fmt.vcxproj +++ b/vnext/fmt/fmt.vcxproj @@ -17,6 +17,10 @@ Debug ARM64 + + Debug + ARM64EC + Release ARM64 @@ -25,6 +29,10 @@ Debug x64 + + Release + ARM64EC + Release x64 @@ -110,7 +118,7 @@ Retries="10" /> - +