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.

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

Update Desktop NUSPEC to use ARM64EC #13335

Merged
merged 12 commits into from
Jul 10, 2024
Merged

Update Desktop NUSPEC to use ARM64EC #13335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
32a56e9
Update Desktop NUSPEC to use ARM64EC
JunielKatarn Jun 11, 2024
70baf3a
Change files
JunielKatarn Jun 11, 2024
85ae0b7
Enable ARM64EC ReactWindows CI artifact
JunielKatarn Jun 11, 2024
21c930e
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jun 11, 2024
be32a6a
Add ARM64EC|Release to nuget-desktop.yml
JunielKatarn Jun 11, 2024
c17ba67
Revert ARM64EC for ReactWindows artifact
JunielKatarn Jun 11, 2024
c603b19
Merge branch 'main' into arm64ec-nuget
JunielKatarn Jul 1, 2024
8a648bc
Merge branch 'main' of github.com:microsoft/react-native-windows into…
JunielKatarn Jul 5, 2024
4820ca7
Exclude ARM64EC React.Windows.Desktop.Test.DLL from NUSPEC
JunielKatarn Jul 6, 2024
54038e9
Merge branch 'main' into arm64ec-nuget
JunielKatarn Jul 9, 2024
ab9d101
Merge branch 'main' into arm64ec-nuget
JunielKatarn Jul 9, 2024
c87a7da
Merge branch 'main' into arm64ec-nuget
JunielKatarn Jul 9, 2024
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
11 changes: 7 additions & 4 deletions .ado/jobs/nuget-desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@ jobs:
dependsOn:
- DesktopX64Release
- DesktopX86Debug

- DesktopARM64ECRelease

pool: ${{ parameters.AgentPool.Small }}
timeoutInMinutes: 30 # how long to run the job before automatically cancelling
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
steps:
- template: ../templates/checkout-shallow.yml

- template: ../templates/yarn-install.yml

- task: NuGetToolInstaller@1
inputs:
versionSpec: ">=5.8.0"

- template: ../templates/prep-and-pack-nuget.yml
parameters:
artifactName: Desktop
Expand All @@ -39,3 +40,5 @@ jobs:
configuration: Release
- platform: x86
configuration: Debug
- platform: ARM64EC
configuration: Release
7 changes: 7 additions & 0 deletions change/react-native-windows-29a5fd44-3ee5-4e8f-acda-3e5dd0384a97.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update Desktop NUSPEC to use ARM64EC",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
34 changes: 16 additions & 18 deletions vnext/Scripts/OfficeReact.Win32.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,23 @@
</metadata>
<files>

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

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