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
10 changes: 5 additions & 5 deletions .ado/azure-pipelines.publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ jobs:
displayName: NPM Publish
pool: Azure-Pipelines-EO-Ubuntu20.04-Office
steps:
- task: NodeTool@0
inputs:
versionSpec: '14.x'
displayName: 'Install Node.js'
- template: templates/setup-repo.yml

- script: |
git config user.name "UI-Fabric-RN-Bot"
git config user.email "uifrnbot@microsoft.com"
git remote set-url origin https://$(githubUser):$(githubPAT)@github.com/microsoft/ui-fabric-react-native.git
displayName: Git Authentication
- template: templates/yarn-install.yml

- script: |
yarn
displayName: 'yarn install'

- script: |
yarn buildci
Expand Down
10 changes: 1 addition & 9 deletions .ado/templates/e2e-dependency-nuget-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,7 @@ steps:
- checkout: self
persistCredentials: true

- task: NodeTool@0
inputs:
versionSpec: "14.x"
displayName: "Install Node.js"

- task: NuGetToolInstaller@0
inputs:
versionSpec: "5.6.0"
displayName: "Install Nuget"
- template: setup-repo.yml

- script: |
yarn
Expand Down
12 changes: 12 additions & 0 deletions .ado/templates/e2e-testing-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ steps:
condition: succeeded()
displayName: 'Create success build variable'

- script: |
yarn appium driver install uiautomator2
workingDirectory: apps/E2E
displayName: 'Install appium driver'
condition: succeeded()

- script: |
yarn e2etest:android
workingDirectory: apps/E2E
Expand All @@ -39,3 +45,9 @@ steps:
platform: 'android'
buildArtifacts: variables['task.Build.status']
directory: $(Build.SourcesDirectory)/apps/E2E

- script: |
yarn appium driver uninstall uiautomator2
workingDirectory: apps/E2E
displayName: 'Uninstall appium driver'
condition: succeeded()
12 changes: 12 additions & 0 deletions .ado/templates/e2e-testing-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ steps:
condition: succeeded()
displayName: 'Create success build variable'

- script: |
yarn appium driver install xcuitest
workingDirectory: apps/E2E
displayName: 'Install appium driver'
condition: succeeded()

- script: |
yarn e2etest:ios
workingDirectory: apps/E2E
Expand All @@ -23,3 +29,9 @@ steps:
platform: 'ios'
buildArtifacts: variables['task.Build.status']
directory: $(Build.SourcesDirectory)/apps/E2E

- script: |
yarn appium driver uninstall xcuitest
workingDirectory: apps/E2E
displayName: 'Uninstall appium driver'
condition: succeeded()
14 changes: 13 additions & 1 deletion .ado/templates/e2e-testing-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ steps:
condition: succeeded()
displayName: 'Create success build variable'

- script: |
yarn appium driver install mac2
workingDirectory: apps/E2E
displayName: 'Install appium driver'
condition: succeeded()

- script: |
yarn e2etest:macos
workingDirectory: apps/E2E
Expand All @@ -22,4 +28,10 @@ steps:
applicationType: macos
platform: 'macos'
buildArtifacts: variables['task.Build.status']
directory: $(Build.SourcesDirectory)/apps/E2E
directory: $(Build.SourcesDirectory)/apps/E2E

- script: |
yarn appium driver uninstall mac2
workingDirectory: apps/E2E
displayName: 'Uninstall appium driver'
condition: succeeded()
6 changes: 6 additions & 0 deletions .ado/templates/e2e-testing-uwp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ steps:
condition: succeeded()
displayName: 'Create success build variable'

- script: |
yarn appium driver install --source=npm appium-windows-driver
workingDirectory: apps/E2E
displayName: 'Install appium driver'
condition: succeeded()

- script: |
yarn e2etest:windows
workingDirectory: apps\E2E
Expand Down
12 changes: 12 additions & 0 deletions .ado/templates/e2e-testing-win32.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ steps:
condition: succeeded()
displayName: 'Create success build variable'

- script: |
yarn appium driver install --source=npm appium-windows-driver
workingDirectory: apps/win32
displayName: 'Install appium driver'
condition: succeeded()

- script: |
yarn e2etest
workingDirectory: apps/win32
Expand All @@ -37,3 +43,9 @@ steps:
platform: 'win32'
buildArtifacts: variables['task.Build.status']
directory: $(Build.SourcesDirectory)/apps/win32

- script: |
yarn appium driver uninstall windows
workingDirectory: apps/win32
displayName: 'Uninstall appium driver'
condition: succeeded()
12 changes: 7 additions & 5 deletions .ado/templates/setup-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
steps:
- task: NodeTool@0
inputs:
versionSpec: "14.x"
displayName: "Install Node.js"
versionSource: 'fromFile'
versionFilePath: '.node-version'

- task: NuGetToolInstaller@0
inputs:
versionSpec: "5.6.0"
displayName: "Install Nuget"
versionSpec: '5.6.0'
displayName: 'Install Nuget'

- template: yarn-install.yml
- script: |
yarn install --frozen-lockfile
displayName: 'yarn install'
6 changes: 0 additions & 6 deletions .ado/templates/yarn-install.yml

This file was deleted.

1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16
Empty file added .npmignore
Empty file.
24 changes: 12 additions & 12 deletions apps/E2E/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,24 @@
"@fluentui-react-native/focus-zone": "^0.11.40",
"@fluentui-react-native/scripts": "^0.1.1",
"@rnx-kit/metro-config": "^1.3.1",
"@types/jasmine": "3.5.10",
"@types/jasmine": "3.10.3",
"@types/react": "^17.0.2",
"@types/react-native": "^0.68.0",
"@wdio/appium-service": "7.23.0",
"@wdio/cli": "7.23.0",
"@wdio/jasmine-framework": "7.23.0",
"@wdio/local-runner": "7.23.0",
"@wdio/spec-reporter": "7.23.0",
"appium": "2.0.0-beta.41",
"appium-mac2-driver": "1.4.0",
"appium-uiautomator2-driver": "^2.10.2",
"appium-windows-driver": "2.0.7",
"appium-xcuitest-driver": "4.11.1",
"@wdio/appium-service": "7.30.0",
"@wdio/cli": "7.30.1",
"@wdio/jasmine-framework": "7.26.0",
"@wdio/local-runner": "7.30.1",
"@wdio/spec-reporter": "7.29.1",
"appium": "2.0.0-beta.55",
"appium-mac2-driver": "1.5.1",
"appium-uiautomator2-driver": "^2.12.3",
"appium-windows-driver": "2.3.5",
"appium-xcuitest-driver": "4.16.12",
"metro-config": "^0.67.0",
"metro-react-native-babel-preset": "^0.67.0",
"ts-node": "^8.10.1",
"typescript": "4.9.4",
"webdriverio": "7.23.0"
"webdriverio": "7.30.1"
},
"rnx-kit": {
"kitType": "app",
Expand Down
20 changes: 10 additions & 10 deletions apps/win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,25 @@
"@office-iss/rex-win32": "0.68.26-devmain.16227.10000",
"@rnx-kit/cli": "^0.16.2",
"@rnx-kit/metro-config": "^1.3.1",
"@types/jasmine": "3.5.10",
"@types/jasmine": "3.10.3",
"@types/react": "^17.0.2",
"@types/react-native": "^0.68.0",
"@wdio/allure-reporter": "7.23.0",
"@wdio/appium-service": "7.23.0",
"@wdio/cli": "7.23.0",
"@wdio/jasmine-framework": "7.23.0",
"@wdio/local-runner": "7.23.0",
"@wdio/spec-reporter": "7.23.0",
"@wdio/allure-reporter": "7.30.1",
"@wdio/appium-service": "7.30.0",
"@wdio/cli": "7.30.1",
"@wdio/jasmine-framework": "7.26.0",
"@wdio/local-runner": "7.30.1",
"@wdio/spec-reporter": "7.29.1",
"allure-commandline": "2.13.0",
"appium": "2.0.0-beta.41",
"appium-windows-driver": "2.0.7",
"appium": "2.0.0-beta.55",
"appium-windows-driver": "2.3.5",
"metro-config": "^0.67.0",
"metro-react-native-babel-preset": "^0.67.0",
"react-native-svg-transformer": "^1.0.0",
"react-test-renderer": "17.0.2",
"ts-node": "^8.10.1",
"typescript": "4.9.4",
"webdriverio": "7.23.0"
"webdriverio": "7.30.1"
},
"jest": {
"preset": "react-native"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update appium beta version to version that doesn't use jsdoc",
"packageName": "@fluentui-react-native/e2e-testing",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Update appium beta version to version that doesn't use jsdoc",
"packageName": "@fluentui-react-native/tester-win32",
"email": "ruaraki@microsoft.com",
"dependentChangeType": "patch"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@
]
},
"resolutions": {
"@appium/support": "^2.57.0",
"@appium/support": "3.1.5",
"es5-ext": "0.10.53",
"jpeg-js": "^0.4.4",
"moment": "^2.29.4",
"shell-quote": "^1.7.3",
"@types/react": "^17.0.2",
"@appium/types": "0.5.0",
"@appium/types": "0.9.1",
"micromatch": "^4.0.0"
},
"rnx-kit": {
Expand Down
Loading