Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 2 additions & 44 deletions .ado/jobs/cli-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ parameters:
- name: buildNuGetOnly
type: boolean
default: false
- name: buildWinAppSDKOnly
type: boolean
default: false
- name: buildMatrix
type: object
default:
Expand Down Expand Up @@ -54,23 +51,6 @@ parameters:
platform: x86
projectType: lib
additionalRunArguments: --no-autolink --no-deploy
# #8132 Support for C++ WinAppSDK apps
# - Name: X86DebugCppWinUI3
# language: cpp
# configuration: Debug
# platform: x86
# projectType: app
# additionalInitArguments: --useWinUI3 true --nuGetTestFeed $(System.DefaultWorkingDirectory)\NuGetTestFeed
# additionalRunArguments: --no-deploy
# useWinAppSDK: true
- Name: X64DebugCsWinUI3
language: cs
configuration: Debug
platform: x64
projectType: app
additionalInitArguments: --useWinUI3 true --nuGetTestFeed $(System.DefaultWorkingDirectory)\NuGetTestFeed
additionalRunArguments: --no-deploy
useWinAppSDK: true
- Name: X86DebugCppHermes
language: cpp
configuration: Debug
Expand Down Expand Up @@ -154,23 +134,6 @@ parameters:
platform: x86
projectType: lib
additionalRunArguments: --no-autolink --no-deploy
# #8132 Support for C++ WinAppSDK apps
# - Name: X86DebugCppWinUI3
# language: cpp
# configuration: Debug
# platform: x86
# projectType: app
# additionalInitArguments: --useWinUI3 true --nuGetTestFeed $(System.DefaultWorkingDirectory)\NuGetTestFeed
# additionalRunArguments: --no-deploy
# useWinAppSDK: true
- Name: X64DebugCsWinUI3
language: cs
configuration: Debug
platform: x64
projectType: app
additionalInitArguments: --useWinUI3 true --nuGetTestFeed $(System.DefaultWorkingDirectory)\NuGetTestFeed
additionalRunArguments: --no-deploy
useWinAppSDK: true
- Name: X86DebugCppHermes
language: cpp
configuration: Debug
Expand Down Expand Up @@ -310,18 +273,14 @@ jobs:
- ${{ each config in parameters.buildMatrix }}:
- ${{ if eq(config.BuildEnvironment, parameters.buildEnvironment) }}:
- ${{ each matrix in config.Matrix }}:
- ${{ if and(eq(coalesce(matrix.useNuGet, false), parameters.buildNuGetOnly), eq(coalesce(matrix.useWinAppSDK, false), parameters.buildWinAppSDKOnly))}}:
- ${{ if eq(coalesce(matrix.useNuGet, false), parameters.buildNuGetOnly) }}:
- job: CliInit${{ matrix.Name }}
displayName: Verify Cli ${{ matrix.Name }}

${{ if eq(matrix.useNuGet, true) }}:
dependsOn:
- UniversalBuild${{ matrix.platform }}Release

${{ if eq(matrix.useWinAppSDK, true) }}:
dependsOn:
- WinAppSDKX64Release

variables: [template: ../variables/windows.yml]

${{ if eq(matrix.lowResource, true) }}:
Expand Down Expand Up @@ -360,5 +319,4 @@ jobs:
additionalRunArguments: ${{ matrix.additionalRunArguments }}
runWack: ${{ coalesce(matrix.runWack, false) }}
buildEnvironment: ${{ parameters.buildEnvironment }}
useNuGet: ${{ coalesce(matrix.useNuGet, false) }}
useWinAppSDK: ${{ coalesce(matrix.useWinAppSDK, false) }}
useNuGet: ${{ coalesce(matrix.useNuGet, false) }}
20 changes: 0 additions & 20 deletions .ado/jobs/playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ parameters:
BuildConfiguration: Debug
BuildPlatform: x64
SolutionFile: ..\CoreApp\CoreApp.sln
# Disabling until WinAppSDK is working e2e
# - Name: X86DebugWinUI3
# BuildConfiguration: Debug
# BuildPlatform: x86
# SolutionFile: Playground.sln
# BuildWinUI3: true
- BuildEnvironment: Continuous
Matrix:
- Name: X86DebugUniversal
Expand Down Expand Up @@ -83,13 +77,6 @@ parameters:
BuildConfiguration: Debug
BuildPlatform: x64
SolutionFile: ..\CoreApp\CoreApp.sln
# Disabling until WinAppSDK is working e2e
# - Name: X86DebugWinUI3
# BuildConfiguration: Debug
# BuildPlatform: x86
# SolutionFile: Playground.sln
# BuildWinUI3: true
# UploadAppx: true

jobs:
- ${{ each config in parameters.buildMatrix }}:
Expand All @@ -114,13 +101,6 @@ jobs:
configuration: ${{ matrix.BuildConfiguration }}
buildEnvironment: ${{ config.BuildEnvironment }}

- ${{ if eq(matrix.BuildWinUI3, true) }}:
- template: ../templates/set-experimental-feature.yml
parameters:
package: packages/playground
feature: UseWinUI3
value: true

- ${{if eq(config.BuildEnvironment, 'Continuous')}}:
- template: ../templates/write-certificate.yml
parameters:
Expand Down
83 changes: 0 additions & 83 deletions .ado/jobs/windowsappsdk.yml

This file was deleted.

65 changes: 1 addition & 64 deletions .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,62 +270,12 @@ jobs:
SearchPattern: vnext/target/**/*.pdb
SymbolServerType: TeamServices

- job: RnwNativeBuildWinAppSDK
displayName: Build WinAppSDK
dependsOn: RnwNpmPublish
strategy:
matrix:
X64Release:
BuildConfiguration: Release
BuildPlatform: x64
pool: ${{ parameters.AgentPool.Large }}

steps:
- template: templates/prepare-js-env.yml

- template: templates/prepare-build-env.yml
parameters:
platform: $(BuildPlatform)
configuration: $(BuildConfiguration)
buildEnvironment: Publish

- template: templates/apply-published-version-vars.yml

- template: templates/msbuild-sln.yml
parameters:
solutionDir: vnext
solutionName: Microsoft.ReactNative.WindowsAppSDK.sln
buildPlatform: $(BuildPlatform)
buildConfiguration: $(BuildConfiguration)
msbuildArguments:
/p:UseWinUI3=true
warnAsError: false # Disable warn as error until we fix #8312

- template: templates/publish-build-artifacts.yml
parameters:
artifactName: WindowsAppSDK
buildPlatform: $(BuildPlatform)
buildConfiguration: $(BuildConfiguration)
contents: |
Microsoft.ReactNative\**
Microsoft.ReactNative.WindowsAppSDK\**

- template: templates/component-governance.yml

# Make symbols available through http://symweb.
- task: PublishSymbols@2
displayName: Publish symbols
inputs:
SearchPattern: vnext/target/**/*.pdb
SymbolServerType: TeamServices

- job: RNWNuget
dependsOn:
- RnwNpmPublish
- ${{ each matrix in parameters.desktopBuildMatrix }}:
- RnwNativeBuildDesktop${{ matrix.Name }}
- RnwNativeBuildUniversal
- RnwNativeBuildWinAppSDK
displayName: Sign Binaries and Publish NuGet
pool: ${{ parameters.AgentPool.Medium }}

Expand Down Expand Up @@ -411,20 +361,7 @@ jobs:
- platform: x86
configuration: Debug
# - platform: ARM64
# configuration: Debug

- template: templates/prep-and-pack-nuget.yml
parameters:
artifactName: WindowsAppSDK
publishCommitId: $(publishCommitId)
npmVersion: $(npmVersion)
nugetroot: $(System.DefaultWorkingDirectory)\WindowsAppSDK
packMicrosoftReactNativeWindowsAppSDK: true
${{ if or(eq(variables['EnableCodesign'], 'true'), endsWith(variables['Build.SourceBranchName'], '-stable')) }}: # Sign if EnableCodeSign or on *-stable release builds
signMicrosoft: true
slices:
- platform: x64
configuration: Release
# configuration: Debug

- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
displayName: 📒 Generate Manifest Nuget
Expand Down
12 changes: 0 additions & 12 deletions .ado/stages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,12 @@ stages:
parameters:
AgentPool: ${{ parameters.AgentPool }}

- template: jobs/windowsappsdk.yml
parameters:
buildEnvironment: ${{ parameters.buildEnvironment }}
AgentPool: ${{ parameters.AgentPool }}

# NuGet using tests rely on "UniversalBuild" which is done in the build stage
- template: jobs/cli-init.yml
parameters:
buildEnvironment: ${{ parameters.buildEnvironment }}
AgentPool: ${{ parameters.AgentPool }}
buildNuGetOnly: true

- template: jobs/cli-init.yml
parameters:
buildEnvironment: ${{ parameters.buildEnvironment }}
AgentPool: ${{ parameters.AgentPool }}
buildWinAppSDKOnly: true

- stage: IntegrationTests
displayName: Tests 🧪
Expand Down Expand Up @@ -96,4 +85,3 @@ stages:
buildEnvironment: ${{ parameters.buildEnvironment }}
AgentPool: ${{ parameters.AgentPool }}
buildNuGetOnly: false
buildWinAppSDKOnly: false
21 changes: 1 addition & 20 deletions .ado/templates/prep-and-pack-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ parameters:
- name: packMicrosoftReactNativeManagedCodeGen
type: boolean
default: false
- name: packMicrosoftReactNativeWindowsAppSDK
type: boolean
default: false

- name: signMicrosoft
type: boolean
Expand Down Expand Up @@ -80,7 +77,7 @@ steps:
filePath: vnext/Scripts/Tfs/Layout-Desktop-Headers.ps1
arguments: -TargetRoot ${{parameters.nugetroot}}

- ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true), eq(parameters.packMicrosoftReactNativeWindowsAppsDK, false)) }}:
- ${{ if or(eq(parameters.packMicrosoftReactNative, true), eq(parameters.packMicrosoftReactNativeCxx, true), eq(parameters.packMicrosoftReactNativeManaged, true), eq(parameters.packMicrosoftReactNativeManagedCodeGen, true)) }}:
- powershell: |
(Get-Content -Path ${{parameters.nugetroot}}\Microsoft.ReactNative.VersionCheck.targets) -replace '\$\$nuGetPackageVersion\$\$', '${{parameters.npmVersion}}' | Set-Content -Path ${{parameters.nugetroot}}\Microsoft.ReactNative.VersionCheck.targets
displayName: Patch version check file with version ${{parameters.npmVersion}}
Expand Down Expand Up @@ -152,19 +149,3 @@ steps:
buildProperties: CommitId=${{parameters.publishCommitId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=$(baseConfiguration);baseplatform=$(basePlatform)
codesignBinaries: ${{ parameters.signMicrosoft }}
codesignNuget: ${{ parameters.signMicrosoft }}

- ${{ if eq(parameters.packMicrosoftReactNativeWindowsAppsDK, true) }}:
- ${{ if containsValue(parameters.slices.*.configuration, 'Release') }}:
- template: prep-and-pack-single.yml
parameters:
outputPackage: Microsoft.ReactNative.WindowsAppSDK
slices: $(releaseSlices)
packageVersion: ${{parameters.npmVersion}}
codesignBinaries: ${{ parameters.signMicrosoft }}
codesignNuget: ${{ parameters.signMicrosoft }}
buildProperties: CommitId=${{parameters.publishCommitId}};nugetroot=${{parameters.nugetroot}};baseconfiguration=Release;baseplatform=$(releaseBasePlatform)
binariesToSign: |
**/Microsoft.ReactNative.dll
**/Microsoft.ReactNative.winmd
**/Microsoft.ReactNative.WindowsAppSDK.dll

17 changes: 2 additions & 15 deletions .ado/templates/react-native-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ parameters:
type: string
default: PullRequest
values:
- PullRequest
- Continuous
- name: useWinAppSDK
type: boolean
default: false
- PullRequest
- Continuous

steps:
- powershell: start-process verdaccio.cmd -ArgumentList @('--config', './.ado/verdaccio/config.yaml')
Expand Down Expand Up @@ -77,16 +74,6 @@ steps:
- platform: ${{ parameters.platform }}
configuration: Release

- ${{ if eq(parameters.useWinAppSDK, true) }}:
- template: prep-and-pack-nuget.yml
parameters:
artifactName: WindowsAppSDK
npmVersion: $(npmVersion)
packMicrosoftReactNativeWindowsAppSDK: true
slices:
- platform: x64
configuration: Release

- ${{ if eq(parameters.projectType, 'app') }}:
- script: |
npx --yes react-native@$(reactNativeDevDependency) init testcli --template react-native@$(reactNativeDevDependency)
Expand Down
Loading