Skip to content

Only build OfficeReact.Win32 with UseFabric enabled #14319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonthysell merged 4 commits into from
Jan 30, 2025
Merged

Only build OfficeReact.Win32 with UseFabric enabled #14319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2bd9b6
Only build OfficeReact.Win32 with UseFabric enabled
jonthysell Jan 29, 2025
46320cf
Change files
jonthysell Jan 29, 2025
e925a81
Fix Desktop ARM64EC build
jonthysell Jan 29, 2025
100c73c
disable failing desktop integration tests - #14217
TatianaKapos Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions .ado/jobs/desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,23 @@ parameters:
- Name: X64Debug
BuildConfiguration: Debug
BuildPlatform: x64
UseFabric: false
- Name: X64Release
BuildConfiguration: Release
BuildPlatform: x64
UseFabric: false
- Name: X86Debug
BuildConfiguration: Debug
BuildPlatform: x86
UseFabric: false
- Name: ARM64ECDebug
BuildConfiguration: Debug
BuildPlatform: ARM64EC
- Name: ARM64ECRelease
BuildConfiguration: Release
BuildPlatform: ARM64EC
- Name: X64DebugFabric
BuildConfiguration: Debug
BuildPlatform: x64
UseFabric: true
- BuildEnvironment: SecurePullRequest
Matrix:
- Name: X64DebugFabric
- Name: X64Debug
BuildConfiguration: Debug
BuildPlatform: x64
UseFabric: true
- BuildEnvironment: Continuous
Matrix:
- Name: X64Debug
Expand All @@ -63,14 +55,6 @@ parameters:
- Name: ARM64ECRelease
BuildConfiguration: Release
BuildPlatform: ARM64EC
- Name: X64DebugFabric
BuildConfiguration: Debug
BuildPlatform: x64
UseFabric: true
- Name: X86ReleaseFabric # Specifically built so binskim / tests get run on fabric
BuildConfiguration: Release
BuildPlatform: x86
UseFabric: true

jobs:
- ${{ each config in parameters.buildMatrix }}:
Expand All @@ -91,12 +75,24 @@ jobs:
#12714 - Disable for first deployment of test website.
# RNTesterIntegrationTests::WebSocket
# RNTesterIntegrationTests::WebSocketBlob
#14217 - Reneable RNTesterIntegrationTests
# RNTesterIntegrationTests::Dummy
# RNTesterIntegrationTests::Fetch
# RNTesterIntegrationTests::XHRSample
# RNTesterIntegrationTests::Blob
# RNTesterIntegrationTests::Logging
- name: Desktop.IntegrationTests.Filter
value: >
(FullyQualifiedName!=RNTesterIntegrationTests::IntegrationTestHarness)&
(FullyQualifiedName!=RNTesterIntegrationTests::WebSocket)&
(FullyQualifiedName!=RNTesterIntegrationTests::WebSocketBlob)&
(FullyQualifiedName!=WebSocketIntegrationTest::SendReceiveSsl)
(FullyQualifiedName!=WebSocketIntegrationTest::SendReceiveSsl)&
(FullyQualifiedName!=Microsoft::React::Test::HttpOriginPolicyIntegrationTest)&
(FullyQualifiedName!=RNTesterIntegrationTests::Dummy)&
(FullyQualifiedName!=RNTesterIntegrationTests::Fetch)&
(FullyQualifiedName!=RNTesterIntegrationTests::XHRSample)&
(FullyQualifiedName!=RNTesterIntegrationTests::Blob)&
(FullyQualifiedName!=RNTesterIntegrationTests::Logging)
#6799 -
# HostFunctionTest - Crashes under JSI/V8
# HostObjectProtoTest - Crashes under JSI/V8
Expand Down Expand Up @@ -155,9 +151,6 @@ jobs:
Write-Host "##vso[task.setvariable variable=Desktop.IntegrationTests.Filter]$newValue"
displayName: Update Desktop.IntegrationTests.Filter to exclude RNTester integration tests

- ${{ if eq(matrix.UseFabric, true) }}:
- template: ../templates/enable-fabric-experimental-feature.yml
Copy link
Contributor

@acoates-ms acoates-ms Jan 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can delete enable-fabric-experimental-feature.yml too?

Copy link
Contributor Author

@jonthysell jonthysell Jan 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we use it for Universal


- template: ../templates/msbuild-sln.yml
parameters:
solutionDir: vnext
Expand Down Expand Up @@ -323,10 +316,7 @@ jobs:

- template: ../templates/publish-build-artifacts.yml
parameters:
${{ if eq(matrix.UseFabric, true) }}:
artifactName: DesktopFabric
${{ else }}:
artifactName: Desktop
artifactName: Desktop
buildPlatform: ${{ matrix.BuildPlatform }}
buildConfiguration: ${{ matrix.BuildConfiguration }}
contents: |
Expand Down
63 changes: 4 additions & 59 deletions .ado/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,43 +33,21 @@ parameters:
- Name: X64Debug
BuildConfiguration: Debug
BuildPlatform: x64
UseFabric: false
- Name: X64Release
BuildConfiguration: Release
BuildPlatform: x64
UseFabric: false
- Name: X86Debug
BuildConfiguration: Debug
BuildPlatform: x86
UseFabric: false
- Name: X86Release
BuildConfiguration: Release
BuildPlatform: x86
UseFabric: false
- Name: ARM64ECDebug
BuildConfiguration: Debug
BuildPlatform: ARM64EC
UseFabric: false
- Name: ARM64ECRelease
BuildConfiguration: Release
BuildPlatform: ARM64EC
UseFabric: false
- Name: X64DebugFabric
BuildConfiguration: Debug
BuildPlatform: x64
UseFabric: true
- Name: X64ReleaseFabric
BuildConfiguration: Release
BuildPlatform: x64
UseFabric: true
- Name: X86DebugFabric
BuildConfiguration: Debug
BuildPlatform: x86
UseFabric: true
- Name: X86ReleaseFabric
BuildConfiguration: Release
BuildPlatform: x86
UseFabric: true

- name: universalBuildMatrix
type: object
Expand Down Expand Up @@ -277,9 +255,6 @@ extends:

- template: .ado/templates/apply-published-version-vars.yml@self

- ${{ if eq(matrix.UseFabric, true) }}:
- template: .ado/templates/enable-fabric-experimental-feature.yml@self

- template: .ado/templates/msbuild-sln.yml@self
parameters:
solutionDir: vnext
Expand All @@ -291,10 +266,7 @@ extends:
- template: .ado/templates/publish-build-artifacts.yml@self
parameters:
oneESMode: true ## Files are only copied to staging, not published
${{ if eq(matrix.UseFabric, true) }}:
artifactName: DesktopFabric
${{ else }}:
artifactName: Desktop
artifactName: Desktop
buildPlatform: ${{ matrix.BuildPlatform }}
buildConfiguration: ${{ matrix.BuildConfiguration }}
contents: |
Expand All @@ -320,14 +292,9 @@ extends:
targetPath: '$(CrashDumpRootPath)'
artifactName: Crash dumps - $(Agent.JobName)-$(System.JobAttempt)
- output: pipelineArtifact
${{ if eq(matrix.UseFabric, true) }}:
displayName: 'Publish Artifact: DesktopFabric.${{matrix.buildPlatform}}.${{matrix.buildConfiguration}}'
artifactName: DesktopFabric.${{matrix.buildPlatform}}.${{matrix.buildConfiguration}}
targetPath: $(Build.StagingDirectory)/NuGet/DesktopFabric/${{matrix.buildPlatform}}/${{matrix.buildConfiguration}}
${{ else }}:
displayName: 'Publish Artifact: Desktop.${{matrix.buildPlatform}}.${{matrix.buildConfiguration}}'
artifactName: Desktop.${{matrix.buildPlatform}}.${{matrix.buildConfiguration}}
targetPath: $(Build.StagingDirectory)/NuGet/Desktop/${{matrix.buildPlatform}}/${{matrix.buildConfiguration}}
displayName: 'Publish Artifact: Desktop.${{matrix.buildPlatform}}.${{matrix.buildConfiguration}}'
artifactName: Desktop.${{matrix.buildPlatform}}.${{matrix.buildConfiguration}}
targetPath: $(Build.StagingDirectory)/NuGet/Desktop/${{matrix.buildPlatform}}/${{matrix.buildConfiguration}}

- ${{ each matrix in parameters.universalBuildMatrix }}:
- job: RnwNativeBuildUniversal${{ matrix.Name }}
Expand Down Expand Up @@ -486,28 +453,6 @@ extends:
- platform: ARM64EC
configuration: Debug

- template: .ado/templates/prep-and-pack-nuget.yml@self
parameters:
artifactName: DesktopFabric
publishCommitId: $(publishCommitId)
npmVersion: $(npmVersion)-Fabric
packDesktop: true
${{ if or(eq(variables['EnableCodesign'], 'true'), endsWith(variables['Build.SourceBranchName'], '-stable')) }}: # Sign if EnableCodeSign or on *-stable release builds
signMicrosoft: false # Temporarily disabled for all builds, see issue #14030
slices:
- platform: x64
configuration: Release
- platform: x86
configuration: Release
# - platform: ARM64EC
# configuration: Release
- platform: x64
configuration: Debug
- platform: x86
configuration: Debug
# - platform: ARM64EC
# configuration: Debug

templateContext:
sdl:
binskim:
Expand Down
7 changes: 7 additions & 0 deletions change/react-native-windows-cee7156d-9d30-4922-a594-c591aa4d568b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Only build OfficeReact.Win32 with UseFabric enabled",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
7 changes: 6 additions & 1 deletion vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,12 @@
%(AdditionalDependencies);
Bcrypt.lib;
Chakrart.lib;
Pathcch.lib
D2D1.lib;
D3D11.lib;
DWrite.lib;
Pathcch.lib;
ShCore.lib;
Uiautomationcore.lib
</AdditionalDependencies>
<DelayLoadDLLs>Chakra.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
</Link>
Expand Down
4 changes: 3 additions & 1 deletion vnext/ExperimentalFeatures.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project>
<PropertyGroup Condition="'$(SolutionName)'=='ReactWindows-Desktop'">
<RnwNewArch>false</RnwNewArch>
<RnwNewArch>true</RnwNewArch>
<UseFabric>true</UseFabric>
<UseWinUI3>true</UseWinUI3>
<UseExperimentalWinUI3>true</UseExperimentalWinUI3>
<WindowsAppSdkAutoInitialize>false</WindowsAppSdkAutoInitialize>
</PropertyGroup>
Expand Down
32 changes: 16 additions & 16 deletions vnext/Scripts/OfficeReact.Win32.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
</metadata>
<files>

<file src="$nugetroot$\Desktop*\x86\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\x64\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\ARM64EC\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\ARM64EC" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\x86\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\x64\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\ARM64EC\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\ARM64EC" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\x86\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x86"/>
<file src="$nugetroot$\Desktop*\x64\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x64"/>
<file src="$nugetroot$\Desktop*\ARM64EC\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\ARM64EC"/>
<file src="$nugetroot$\Desktop*\x86\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x86"/>
<file src="$nugetroot$\Desktop*\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x64"/>
<file src="$nugetroot$\Desktop*\ARM64EC\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64EC"/>
<file src="$nugetroot$\Desktop\x86\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x64\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\ARM64EC\Debug\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\debug\ARM64EC" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x86\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x64\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\ARM64EC\Release\React.Windows.Desktop.DLL\react-native-win32.*" target="lib\ship\ARM64EC" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x86\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x86"/>
<file src="$nugetroot$\Desktop\x64\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\x64"/>
<file src="$nugetroot$\Desktop\ARM64EC\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\debug\ARM64EC"/>
<file src="$nugetroot$\Desktop\x86\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x86"/>
<file src="$nugetroot$\Desktop\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\x64"/>
<file src="$nugetroot$\Desktop\ARM64EC\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64EC"/>

<file src="$nugetroot$\Desktop*\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop*\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\debug\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x86" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
<file src="$nugetroot$\Desktop\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**" target="lib\ship\x64" exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />

<file src="$nugetroot$\inc\callinvoker\ReactCommon\CallInvoker.h" target="inc\ReactCommon"/>
<file src="$nugetroot$\inc\callinvoker\ReactCommon\SchedulerPriority.h" target="inc\ReactCommon"/>
Expand Down
Loading