Skip to content

Commit b5ea6a4

Browse files
millerdsmillerds
authored
Merge pull request #139 from OfficeDev/merge-shared-changes
Merge shared changes
2 parents 7419645 + d853bbb commit b5ea6a4

17 files changed

+1376
-1708
lines changed

‎.azure-devops/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ steps:
33
displayName: 'Build'
44
inputs:
55
command: custom
6-
customCommand: 'run build'
6+
customCommand: 'run build'

‎.azure-devops/cleanup.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
steps:
2-
- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
3-
displayName: "Cleanup"
2+
- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
3+
displayName: "Cleanup"

‎.azure-devops/devcerts.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
steps:
2-
- script: |
3-
echo Install Office-AddinDev-Certs at machine level
4-
call npx office-addin-dev-certs install --machine
5-
6-
displayName: 'Install add-in dev cert'
2+
- script: |
3+
echo Install Office-AddinDev-Certs at machine level
4+
call npx office-addin-dev-certs install --machine
5+
displayName: 'Install add-in dev cert'

‎.azure-devops/edgewebview.yml‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
steps:
2-
- script: |
3-
echo Enable EdgeWebView Loopback
4-
call npx office-addin-dev-settings appcontainer EdgeWebView --loopback --yes
5-
6-
echo Set Edge WebView Registry Settings
7-
8-
set PATH1="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646"
9-
10-
reg add %PATH1% /f /v DisplayName /t REG_SZ /d "@{Microsoft.Win32WebViewHost_10.0.19041.423_neutral_neutral_cw5n1h2txyewy?ms-resource://Windows.Win32WebViewHost/resources/DisplayName}"
11-
reg add %PATH1% /f /v Moniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
12-
13-
set PATH2="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646\Children\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646-3829197285-1050560373-949424154-522343454"
14-
15-
reg add %PATH2% /f /v DisplayName /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy/123"
16-
reg add %PATH2% /f /v Moniker /t REG_SZ /d "123"
17-
reg add %PATH2% /f /v ParentMoniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
18-
19-
displayName: 'Enable Edge WebView'
2+
- script: |
3+
echo Enable EdgeWebView Loopback
4+
call npx office-addin-dev-settings appcontainer EdgeWebView --loopback --yes
5+
echo Set Edge WebView Registry Settings
6+
set PATH1="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646"
7+
reg add %PATH1% /f /v DisplayName /t REG_SZ /d "@{Microsoft.Win32WebViewHost_10.0.19041.423_neutral_neutral_cw5n1h2txyewy?ms-resource://Windows.Win32WebViewHost/resources/DisplayName}"
8+
reg add %PATH1% /f /v Moniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
9+
set PATH2="HKEY_CURRENT_USER\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppContainer\Mappings\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646\Children\S-1-15-2-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646-3829197285-1050560373-949424154-522343454"
10+
reg add %PATH2% /f /v DisplayName /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy/123"
11+
reg add %PATH2% /f /v Moniker /t REG_SZ /d "123"
12+
reg add %PATH2% /f /v ParentMoniker /t REG_SZ /d "microsoft.win32webviewhost_cw5n1h2txyewy"
13+
displayName: 'Enable Edge WebView'

‎.azure-devops/full-pipeline.yml‎

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,50 @@
1-
# Build a general Node.js project with npm.
2-
# Add steps that analyze code, save build artifacts, deploy, and more:
3-
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
4-
5-
jobs:
6-
- job: Windows_10_Latest
1+
resources:
2+
repositories:
3+
- repository: CustomPipelineTemplates
4+
type: git
5+
name: 1ESPipelineTemplates/OfficePipelineTemplates
6+
ref: refs/tags/release
7+
extends:
8+
template: /v1/Office.Unofficial.PipelineTemplate.yml@CustomPipelineTemplates
9+
parameters:
710
pool:
811
name: OE-OfficeClientApps
9-
steps:
10-
- template: ./install.yml
11-
- template: ./lint.yml
12-
- template: ./build.yml
13-
- template: ./devcerts.yml
14-
- template: ./edgewebview.yml
15-
- template: ./test.yml
16-
parameters:
17-
webView: "edge-chromium"
18-
19-
- job: WebView_EdgeLegacy
20-
pool:
21-
name: OE-OfficeClientApps
22-
steps:
23-
- template: ./install.yml
24-
- template: ./lint.yml
25-
- template: ./build.yml
26-
- template: ./devcerts.yml
27-
- template: ./edgewebview.yml
28-
- template: ./test.yml
29-
parameters:
30-
webView: "edge-legacy"
31-
12+
sdl:
13+
eslint:
14+
configuration: required
15+
parser: '@typescript-eslint/parser'
16+
parserOptions: sourceType:module
17+
stages:
18+
- stage: stage
19+
jobs:
20+
- job: Windows_10_Latest
21+
steps:
22+
- template: /.azure-devops/install.yml@self
23+
- template: /.azure-devops/lint.yml@self
24+
- template: /.azure-devops/build.yml@self
25+
- template: /.azure-devops/devcerts.yml@self
26+
- template: /.azure-devops/edgewebview.yml@self
27+
- template: /.azure-devops/test.yml@self
28+
parameters:
29+
webView: "edge-chromium"
30+
- job: WebView_EdgeLegacy
31+
steps:
32+
- template: /.azure-devops/install.yml@self
33+
- template: /.azure-devops/lint.yml@self
34+
- template: /.azure-devops/build.yml@self
35+
- template: /.azure-devops/devcerts.yml@self
36+
- template: /.azure-devops/edgewebview.yml@self
37+
- template: /.azure-devops/test.yml@self
38+
parameters:
39+
webView: "edge-legacy"
3240
# Need to determin why the IE test doesn't pass in the lab
33-
# - job: WebView_IE
34-
# pool:
35-
# name: OE-OfficeClientApps
36-
# steps:
37-
# - template: ./install.yml
38-
# - template: ./lint.yml
39-
# - template: ./build.yml
40-
# - template: ./devcerts.yml
41-
# - template: ./edgewebview.yml
42-
# - template: ./test.yml
43-
# parameters:
44-
# webView: "ie"
45-
46-
- job: Mac
47-
pool:
48-
name: OPX Mac Dogfood Pool
49-
steps:
50-
- template: ./install.yml
51-
- template: ./lint.yml
52-
- template: ./build.yml
53-
# - template: ./test.yml
54-
- template: ./cleanup.yml
41+
# - job: WebView_IE
42+
# steps:
43+
# - template: /.azure-devops/install.yml@self
44+
# - template: /.azure-devops/lint.yml@self
45+
# - template: /.azure-devops/build.yml@self
46+
# - template: /.azure-devops/devcerts.yml@self
47+
# - template: /.azure-devops/edgewebview.yml@self
48+
# - template: /.azure-devops/test.yml@self
49+
# parameters:
50+
# webView: "ie"

‎.azure-devops/install.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
steps:
22
- task: Npm@1
3-
displayName: 'Install'
3+
displayName: 'Install'

‎.azure-devops/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ steps:
33
displayName: 'Lint'
44
inputs:
55
command: custom
6-
customCommand: 'run lint'
6+
customCommand: 'run lint'

‎.azure-devops/test.yml‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@ parameters:
22
- name: webView
33
type: string
44
default: "edge-chromium"
5-
65
steps:
7-
- task: CmdLine@2
8-
inputs:
9-
script: |
10-
echo Setting WebView Type: ${{ parameters.webView }}
11-
call npx office-addin-dev-settings webview manifest.xml ${{ parameters.webView }}
12-
call npx office-addin-dev-settings webview test/end-to-end/test-manifest.xml ${{ parameters.webView }}
13-
14-
echo Running Tests
15-
npm run test
16-
17-
echo Done running tests
18-
displayName: 'Run Tests'
6+
- task: CmdLine@2
7+
inputs:
8+
script: |
9+
echo Setting WebView Type: ${{ parameters.webView }}
10+
call npx office-addin-dev-settings webview manifest.xml ${{ parameters.webView }}
11+
call npx office-addin-dev-settings webview test/end-to-end/test-manifest.xml ${{ parameters.webView }}
12+
echo Running Tests
13+
npm run test
14+
echo Done running tests
15+
displayName: 'Run Tests'

‎.vscode/extensions.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"recommendations": [
77
"ms-edgedevtools.vscode-edge-devtools",
88
"dbaeumer.vscode-eslint",
9-
"esbenp.prettier-vscode"
9+
"esbenp.prettier-vscode",
10+
"msoffice.microsoft-office-add-in-debugger"
1011
],
1112
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
1213
"unwantedRecommendations": []

‎babel.config.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
{
2-
"presets": ["@babel/preset-env"]
3-
}
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"targets": {
7+
"esmodules": false
8+
}
9+
}
10+
],
11+
]
12+
}

0 commit comments

Comments
 (0)