Skip to content

Commit 5e38545

Browse files
mikehoffmsmikehoffms
committed
Merge branch 'main' into user/mikehoffms/throttle-icon
2 parents b1e5948 + 1290722 commit 5e38545

25 files changed

Lines changed: 5485 additions & 695 deletions

‎.github/workflows/webplat-relnotes.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# This workflow checks if it's time to generate the next beta relnotes.
2+
# And if so, it generates the beta relnotes and opens a PR with them.
3+
4+
name: Generate beta relnotes
5+
6+
on:
7+
workflow_dispatch:
8+
schedule:
9+
# once a day
10+
- cron: '0 0 * * *'
11+
12+
permissions:
13+
contents: write
14+
15+
jobs:
16+
generate:
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Checkout repo
21+
uses: actions/checkout@v2
22+
23+
- name: Install dependencies
24+
run: |
25+
cd scripts
26+
npm install
27+
28+
- name: Generate release notes
29+
run: |
30+
cd scripts
31+
node web-platform-release-notes.js
32+
33+
- name: Commit changes
34+
run: |
35+
git checkout -b web-platform-release-notes
36+
git config --local user.email "${{ github.actor }}@users.noreply.github.com"
37+
git config --local user.name "${{ github.actor }}"
38+
git add .
39+
git commit -m "New beta web platform release notes"
40+
git push origin web-platform-release-notes

‎microsoft-edge/toc.yml‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,8 +1283,12 @@
12831283
items:
12841284
- name: Win32
12851285
items:
1286-
# - name: WebView2 in Win32 apps
1287-
# href: ./webview2/platforms/win32.md
1286+
- name: WebView2 in Win32 apps
1287+
href: ./webview2/platforms/win32.md
1288+
1289+
- name: Get started with WebView2 in Win32 apps
1290+
href: ./webview2/get-started/win32.md
1291+
displayName: Win32_GettingStarted # repo dir name
12881292

12891293
- name: Win32 sample app
12901294
href: ./webview2/samples/webview2apissample.md
@@ -1298,40 +1302,40 @@
12981302
href: ./webview2/samples/webview2browser.md
12991303
displayName: WebView2Browser # repo dir name
13001304

1301-
- name: Get started with WebView2 in Win32 apps
1302-
href: ./webview2/get-started/win32.md
1303-
displayName: Win32_GettingStarted # repo dir name
1304-
13051305
- name: WinUI 2 (UWP)
13061306
items:
1307-
# - name: WebView2 in WinUI 2 (UWP) apps
1308-
# href: ./webview2/platforms/winui2-uwp.md
1309-
1310-
- name: WinUI 2 (UWP) sample app
1311-
href: ./webview2/samples/webview2_sample_uwp.md
1312-
displayName: webview2_sample_uwp # repo dir name
1307+
- name: WebView2 in WinUI 2 (UWP) apps
1308+
href: ./webview2/platforms/winui2-uwp.md
13131309

13141310
- name: Get started with WebView2 in WinUI 2 (UWP) apps
13151311
href: ./webview2/get-started/winui2.md
13161312
displayName: WinUI2_GettingStarted # repo dir name
13171313

1314+
- name: WinUI 2 (UWP) sample app
1315+
href: ./webview2/samples/webview2_sample_uwp.md
1316+
displayName: webview2_sample_uwp # repo dir name
1317+
13181318
- name: WinUI 3 (Windows App SDK)
13191319
items:
1320-
# - name: WebView2 in WinUI 3 (Windows App SDK) apps
1321-
# href: ./webview2/platforms/winui3-windows-app-sdk.md
1322-
1323-
- name: WinUI 3 (Windows App SDK) sample app
1324-
href: ./webview2/samples/webview2-winui3-sample.md
1325-
displayName: WebView2_WinUI3_Sample # repo dir name
1320+
- name: WebView2 in WinUI 3 (Windows App SDK) apps
1321+
href: ./webview2/platforms/winui3-windows-app-sdk.md
13261322

13271323
- name: Get started with WebView2 in WinUI 3 (Windows App SDK) apps
13281324
href: ./webview2/get-started/winui.md
13291325
displayName: WinUI3_GettingStarted # repo dir name
13301326

1331-
- name: WebView2 in WPF apps
1327+
- name: WinUI 3 (Windows App SDK) sample app
1328+
href: ./webview2/samples/webview2-winui3-sample.md
1329+
displayName: WebView2_WinUI3_Sample # repo dir name
1330+
1331+
- name: WPF
13321332
items:
1333-
# - name: WebView2 apps on Win32
1334-
# href: ./webview2/platforms/wpf.md
1333+
- name: WebView2 in WPF apps
1334+
href: ./webview2/platforms/wpf.md
1335+
1336+
- name: Get started with WebView2 in WPF apps
1337+
href: ./webview2/get-started/wpf.md
1338+
displayName: WPF_GettingStarted # repo dir name
13351339

13361340
- name: WPF sample app
13371341
href: ./webview2/samples/webview2wpfbrowser.md
@@ -1341,39 +1345,35 @@
13411345
href: ./webview2/samples/wv2cdpextensionwpfsample.md
13421346
displayName: WV2CDPExtensionWPFSample # repo dir name
13431347

1344-
- name: Get started with WebView2 in WPF apps
1345-
href: ./webview2/get-started/wpf.md
1346-
displayName: WPF_GettingStarted # repo dir name
1347-
13481348
- name: WinForms
13491349
items:
1350-
# - name: WebView2 in WinForms apps
1351-
# href: ./webview2/platforms/winforms.md
1352-
1353-
- name: WinForms sample app
1354-
href: ./webview2/samples/webview2windowsformsbrowser.md
1355-
displayName: WebView2WindowsFormsBrowser # repo dir name
1350+
- name: WebView2 in WinForms apps
1351+
href: ./webview2/platforms/winforms.md
13561352

13571353
- name: Get started with WebView2 in WinForms apps
13581354
href: ./webview2/get-started/winforms.md
13591355
displayName: WinForms_GettingStarted # repo dir name
13601356

1357+
- name: WinForms sample app
1358+
href: ./webview2/samples/webview2windowsformsbrowser.md
1359+
displayName: WebView2WindowsFormsBrowser # repo dir name
1360+
13611361
- name: HoloLens 2 Unity
13621362
items:
1363-
# - name: WebView2 in HoloLens 2 Unity apps
1364-
# href: ./webview2/platforms/hololens-2-unity.md
1363+
- name: WebView2 in HoloLens 2 Unity apps
1364+
href: ./webview2/platforms/hololens-2-unity.md
13651365

13661366
- name: Get started with WebView2 in HoloLens 2 Unity apps (Preview)
13671367
href: ./webview2/get-started/hololens2.md
13681368
displayName: HoloLens2_GettingStarted # repo dir name
13691369

1370-
- name: WebView2 sample apps
1371-
href: ./webview2/code-samples-links.md # delete & redir?
1372-
13731370
- name: Getting Started tutorials
13741371
href: ./webview2/get-started/get-started.md # delete & redir?
13751372
displayName: GettingStartedGuides # repo dir name
13761373

1374+
- name: WebView2 sample apps
1375+
href: ./webview2/code-samples-links.md # delete & redir?
1376+
13771377
# -----------------------------------------------------------------------------
13781378
- name: Navigation, events, and authentication
13791379
items:
@@ -1709,6 +1709,11 @@
17091709
- name: Development tips for Microsoft Edge
17101710
href: web-platform/web-platform.md
17111711

1712+
- name: Release notes
1713+
items:
1714+
- name: Microsoft Edge 133
1715+
href: web-platform/release-notes/133.md
1716+
17121717
- name: Site compatibility-impacting changes coming to Microsoft Edge
17131718
href: web-platform/site-impacting-changes.md
17141719

0 commit comments

Comments
 (0)