Skip to content
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.

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

Only build OfficeReact.Win32 with UseFabric enabled #14319

Merged
merged 4 commits into from
Jan 30, 2025

Conversation

jonthysell
Copy link
Contributor

@jonthysell jonthysell commented Jan 29, 2025

Description

This PR changes our build system to only build the version of OfficeReact.Win32 with Fabric enabled.

Type of Change

  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Why

We are building both versions of Desktop in our CI, but the -Fabric version is in fact a strict superset of functionality and the only one that Office uses now.

What

Changed the default so that Desktop always builds with RnwNewArch (and therefore UseFabric) enabled. Removed the matrix configurations for DesktopFabric from all CI. Fixed the affected nuspec file. Also fixed Desktop publish to include ARM64EC for Fabric and the an issue caused by #14311.

Screenshots

N/A.

Testing

Verified the build works.

Changelog

Should this change be included in the release notes: no

Microsoft Reviewers: Open in CodeFlow

@jonthysell jonthysell marked this pull request as ready for review January 29, 2025 20:26
@jonthysell jonthysell requested review from a team as code owners January 29, 2025 20:26
@@ -155,9 +139,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

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

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

@jonthysell jonthysell requested a review from a team as a code owner January 29, 2025 21:09
@jonthysell jonthysell enabled auto-merge (squash) January 29, 2025 22:11
@jonthysell jonthysell merged commit 36c3714 into microsoft:main Jan 30, 2025
62 checks passed
@jonthysell jonthysell deleted the fixofficepublish branch January 30, 2025 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants