diff --git a/.ado/jobs/cli-init-windows.yml b/.ado/jobs/cli-init-windows.yml
index e4b95cfbf5b..b5f72b496cc 100644
--- a/.ado/jobs/cli-init-windows.yml
+++ b/.ado/jobs/cli-init-windows.yml
@@ -307,6 +307,7 @@ jobs:
${{ if eq(matrix.useNuGet, true) }}:
dependsOn:
+ - UniversalBuild${{ matrix.platform }}Release
- UniversalBuild${{ matrix.platform }}ReleaseFabric
variables: [template: ../variables/windows.yml]
diff --git a/.ado/jobs/universal.yml b/.ado/jobs/universal.yml
index b60e5bf3e5c..f40c212bde3 100644
--- a/.ado/jobs/universal.yml
+++ b/.ado/jobs/universal.yml
@@ -26,6 +26,14 @@
BuildPlatform: x86
UseFabric: false
CreateApiDocs: true
+ - Name: X86Release
+ BuildConfiguration: Release
+ BuildPlatform: x86
+ UseFabric: false
+ - Name: Arm64Release
+ BuildConfiguration: Release
+ BuildPlatform: ARM64
+ UseFabric: false
- Name: X64DebugFabric
BuildConfiguration: Debug
BuildPlatform: x64
@@ -44,6 +52,10 @@
UseFabric: true
- BuildEnvironment: SecurePullRequest
Matrix:
+ - Name: X64Release
+ BuildConfiguration: Release
+ BuildPlatform: x64
+ UseFabric: false
- Name: X64ReleaseFabric
BuildConfiguration: Release
BuildPlatform: x64
diff --git a/.ado/publish.yml b/.ado/publish.yml
index 01d5fd26a03..7a3a64db940 100644
--- a/.ado/publish.yml
+++ b/.ado/publish.yml
@@ -440,9 +440,9 @@ extends:
- template: .ado/templates/prep-and-pack-nuget.yml@self
parameters:
artifactName: ReactWindows
+ artifactName2: ReactWindowsFabric
publishCommitId: $(publishCommitId)
npmVersion: $(npmVersion)
- nugetroot: $(System.DefaultWorkingDirectory)\ReactWindows
packMicrosoftReactNative: true
packMicrosoftReactNativeCxx: true
packMicrosoftReactNativeManaged: true
@@ -463,38 +463,12 @@ extends:
- platform: ARM64
configuration: Debug
- - template: .ado/templates/prep-and-pack-nuget.yml@self
- parameters:
- artifactName: ReactWindowsFabric
- publishCommitId: $(publishCommitId)
- npmVersion: $(npmVersion)-Fabric
- nugetroot: $(System.DefaultWorkingDirectory)\ReactWindows
- packMicrosoftReactNative: true
- packMicrosoftReactNativeCxx: true
- # packMicrosoftReactNativeManaged: true
- # packMicrosoftReactNativeManagedCodeGen: 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: ARM64
- configuration: Release
- - platform: x64
- configuration: Debug
- - platform: x86
- configuration: Debug
- - platform: ARM64
- configuration: Debug
- template: .ado/templates/prep-and-pack-nuget.yml@self
parameters:
artifactName: Desktop
publishCommitId: $(publishCommitId)
npmVersion: $(npmVersion)
- nugetroot: $(System.DefaultWorkingDirectory)\Desktop
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
@@ -517,7 +491,6 @@ extends:
artifactName: DesktopFabric
publishCommitId: $(publishCommitId)
npmVersion: $(npmVersion)-Fabric
- nugetroot: $(System.DefaultWorkingDirectory)\Desktop
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
diff --git a/.ado/templates/prep-and-pack-nuget.yml b/.ado/templates/prep-and-pack-nuget.yml
index 2ec496b0913..ddf38181084 100644
--- a/.ado/templates/prep-and-pack-nuget.yml
+++ b/.ado/templates/prep-and-pack-nuget.yml
@@ -1,6 +1,9 @@
parameters:
- name: artifactName
type: string
+ - name: artifactName2
+ type: string
+ default: ''
- name: slices
type: object
@@ -14,7 +17,7 @@ parameters:
# Note: NuGet pack expects platform-specific file separators ('\' on Windows).
- name: nugetroot
type: string
- default: $(System.DefaultWorkingDirectory)\ReactWindows
+ default: $(System.DefaultWorkingDirectory)\NugetRoot
- name: packDesktop
type: boolean
@@ -62,7 +65,13 @@ steps:
displayName: 'Download ${{ parameters.artifactName }}.${{ slice.platform }}.${{ slice.configuration }}'
inputs:
artifact: ${{ parameters.artifactName }}.${{ slice.platform }}.${{ slice.configuration }}
- path: ${{parameters.nugetroot}}/${{ slice.platform }}/${{ slice.configuration }}
+ path: ${{parameters.nugetroot}}/${{ parameters.artifactName }}/${{ slice.platform }}/${{ slice.configuration }}
+ - ${{ if ne(parameters.artifactName2, '') }}:
+ - task: DownloadPipelineArtifact@2
+ displayName: 'Download ${{ parameters.artifactName2 }}.${{ slice.platform }}.${{ slice.configuration }}'
+ inputs:
+ artifact: ${{ parameters.artifactName2 }}.${{ slice.platform }}.${{ slice.configuration }}
+ path: ${{parameters.nugetroot}}/${{ parameters.artifactName2 }}/${{ slice.platform }}/${{ slice.configuration }}
- task: PowerShell@2
displayName: Copy MSRN Resources to NuGet layout
diff --git a/.ado/templates/prep-and-pack-single.yml b/.ado/templates/prep-and-pack-single.yml
index 0864050557d..8415b5757e8 100644
--- a/.ado/templates/prep-and-pack-single.yml
+++ b/.ado/templates/prep-and-pack-single.yml
@@ -41,6 +41,9 @@ parameters:
steps:
+ - powershell: gci $(System.DefaultWorkingDirectory)/NugetRoot
+ displayName: List files in NugetRoot
+
- ${{ if ne(parameters.slices, '') }}:
- powershell: >
.\StripAdditionalPlatformsFromNuspec.ps1
@@ -49,7 +52,7 @@ steps:
-slices (ConvertFrom-Json '${{ parameters.slices }}')
-debug
displayName: '${{ parameters.outputPackage }} - Strip slices from nuspec'
- workingDirectory: $(System.DefaultWorkingDirectory)/ReactWindows
+ workingDirectory: $(System.DefaultWorkingDirectory)/NugetRoot
- ${{ if eq(parameters.codesignBinaries, true) }}:
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
@@ -61,7 +64,7 @@ steps:
AuthAKVName: 'rnw-keyvault'
AuthCertName: 'React-Native-ESRP-App-Authentication'
AuthSignCertName: 'React-Native-PRSS-Authentication'
- FolderPath: $(System.DefaultWorkingDirectory)/ReactWindows
+ FolderPath: $(System.DefaultWorkingDirectory)/NugetRoot
# Recursively finds files matching these patterns:
${{ if ne(parameters.binariesToSign, '') }}:
Pattern: ${{ parameters.binariesToSign }}
@@ -102,7 +105,7 @@ steps:
inputs:
command: pack
verbosityPack: 'Detailed'
- packagesToPack: $(System.DefaultWorkingDirectory)/ReactWindows/${{ parameters.outputPackage }}.nuspec
+ packagesToPack: $(System.DefaultWorkingDirectory)/NugetRoot/${{ parameters.outputPackage }}.nuspec
packDestination: $(System.DefaultWorkingDirectory)/NugetRootFinal
buildProperties: version=${{ parameters.packageVersion }};id=${{ parameters.outputPackage }};${{ parameters.buildProperties }}
diff --git a/.ado/templates/react-native-init-windows.yml b/.ado/templates/react-native-init-windows.yml
index 969c6996567..2650223fc25 100644
--- a/.ado/templates/react-native-init-windows.yml
+++ b/.ado/templates/react-native-init-windows.yml
@@ -47,8 +47,9 @@ steps:
- ${{ if eq(parameters.useNuGet, true) }}:
- template: prep-and-pack-nuget.yml
parameters:
- artifactName: ReactWindowsFabric
- npmVersion: $(npmVersion)-Fabric
+ artifactName: ReactWindows
+ artifactName2: ReactWindowsFabric
+ npmVersion: $(npmVersion)
packMicrosoftReactNative: true
packMicrosoftReactNativeCxx: true
slices:
diff --git a/change/react-native-windows-e2a858e1-d434-4940-89a0-2468df697134.json b/change/react-native-windows-e2a858e1-d434-4940-89a0-2468df697134.json
new file mode 100644
index 00000000000..160b995d758
--- /dev/null
+++ b/change/react-native-windows-e2a858e1-d434-4940-89a0-2468df697134.json
@@ -0,0 +1,7 @@
+{
+ "type": "prerelease",
+ "comment": "Merge New and Old Arch Microsoft.ReactNative Nuget packages",
+ "packageName": "react-native-windows",
+ "email": "jthysell@microsoft.com",
+ "dependentChangeType": "patch"
+}
diff --git a/vnext/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props b/vnext/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props
index 69a19fdaa31..9fe558f7272 100644
--- a/vnext/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props
+++ b/vnext/PropertySheets/External/Microsoft.ReactNative.Cpp.PackageReferences.props
@@ -5,18 +5,8 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/vnext/Scripts/Microsoft.ReactNative.Managed.CodeGen.nuspec b/vnext/Scripts/Microsoft.ReactNative.Managed.CodeGen.nuspec
index ac8a54e5059..1099c02a21a 100644
--- a/vnext/Scripts/Microsoft.ReactNative.Managed.CodeGen.nuspec
+++ b/vnext/Scripts/Microsoft.ReactNative.Managed.CodeGen.nuspec
@@ -18,6 +18,6 @@
-
+
diff --git a/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec b/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec
index 578b9add72d..9d808dcd7ed 100644
--- a/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec
+++ b/vnext/Scripts/Microsoft.ReactNative.Managed.nuspec
@@ -26,39 +26,39 @@
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/vnext/Scripts/Microsoft.ReactNative.VersionCheck.targets b/vnext/Scripts/Microsoft.ReactNative.VersionCheck.targets
index 5dc11da4d17..59a8429a6b5 100644
--- a/vnext/Scripts/Microsoft.ReactNative.VersionCheck.targets
+++ b/vnext/Scripts/Microsoft.ReactNative.VersionCheck.targets
@@ -66,8 +66,6 @@
<_ReactNativeWindowsVersionCheckNugetVersion>$$nuGetPackageVersion$$
-
- <_ReactNativeWindowsVersionCheckNugetVersion>$(_ReactNativeWindowsVersionCheckNugetVersion.Replace('-Fabric', ''))
diff --git a/vnext/Scripts/Microsoft.ReactNative.nuspec b/vnext/Scripts/Microsoft.ReactNative.nuspec
index 476d988c630..17eb66e5904 100644
--- a/vnext/Scripts/Microsoft.ReactNative.nuspec
+++ b/vnext/Scripts/Microsoft.ReactNative.nuspec
@@ -19,48 +19,50 @@
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
diff --git a/vnext/Scripts/Microsoft.ReactNative.targets b/vnext/Scripts/Microsoft.ReactNative.targets
index b44ec89e11a..30dc17190b4 100644
--- a/vnext/Scripts/Microsoft.ReactNative.targets
+++ b/vnext/Scripts/Microsoft.ReactNative.targets
@@ -5,17 +5,21 @@
x86
$(Platform)
- <_rnwFolder>$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native\
+ false
+
+ <_rnwFolder>$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native
+ <_rnwArch Condition="'$(RnwNewArch)'=='true'">newarch
+ <_rnwArch Condition="'$(_rnwArch)'==''">oldarch
-
+
Microsoft.ReactNative.dll
-
-
-
+
+
+
diff --git a/vnext/Scripts/OfficeReact.Win32.nuspec b/vnext/Scripts/OfficeReact.Win32.nuspec
index dea0abc8b16..71ca5b02171 100644
--- a/vnext/Scripts/OfficeReact.Win32.nuspec
+++ b/vnext/Scripts/OfficeReact.Win32.nuspec
@@ -15,23 +15,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+