Skip to content

Commit 6f78016

Browse files
committed
Merge remote-tracking branch 'origin/net11.0' into mattleibow-fictional-broccoli
# Conflicts: # src/BlazorWebView/src/Maui/BlazorWebView.cs # src/BlazorWebView/src/Maui/PublicAPI/net-android/PublicAPI.Unshipped.txt # src/BlazorWebView/src/Maui/PublicAPI/net-ios/PublicAPI.Unshipped.txt # src/BlazorWebView/src/Maui/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt # src/BlazorWebView/src/Maui/PublicAPI/net-tizen/PublicAPI.Unshipped.txt # src/BlazorWebView/src/Maui/PublicAPI/net-windows/PublicAPI.Unshipped.txt # src/BlazorWebView/src/Maui/PublicAPI/net/PublicAPI.Unshipped.txt
2 parents 39b35f5 + 4438dc6 commit 6f78016

2,694 files changed

Lines changed: 190937 additions & 52203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
# avoid overriding GitInfo.txt on merge
2020
GitInfo.txt merge=ours
2121

22-
.github/workflows/*.lock.yml linguist-generated=true merge=ours
22+
.github/workflows/*.lock.yml linguist-generated=true

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ body:
4242
label: Version with bug
4343
description: In what version do you see this issue? Run `dotnet workload list` to find your version.
4444
options:
45+
- 11.0.0-preview.6
4546
- 11.0.0-preview.5
4647
- 11.0.0-preview.4
4748
- 11.0.0-preview.3
4849
- 11.0.0-preview.2
4950
- 11.0.0-preview.1
51+
- 10.0.90
5052
- 10.0.80
5153
- 10.0.71
5254
- 10.0.70
@@ -176,11 +178,13 @@ body:
176178
- 10.0.70
177179
- 10.0.71
178180
- 10.0.80
181+
- 10.0.90
179182
- 11.0.0-preview.1
180183
- 11.0.0-preview.2
181184
- 11.0.0-preview.3
182185
- 11.0.0-preview.4
183186
- 11.0.0-preview.5
187+
- 11.0.0-preview.6
184188
validations:
185189
required: true
186190
- type: dropdown

.github/agents/agentic-workflows.agent.md

Lines changed: 0 additions & 197 deletions
This file was deleted.

0 commit comments

Comments
 (0)