Skip to content

Commit 64871a0

Browse files
SuthiYuvarajSuthiYuvaraj
authored
Merge branch 'main' into fix-12008
2 parents 0842820 + 794a9fa commit 64871a0

6,989 files changed

Lines changed: 179045 additions & 99992 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.

‎.azuredevops/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
4+
enable-campaigned-updates: false
5+
enable-security-updates: false

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"rollForward": false
2525
},
2626
"microsoft.dotnet.xharness.cli": {
27-
"version": "10.0.0-prerelease.25506.2",
27+
"version": "11.0.0-prerelease.26107.1",
2828
"commands": [
2929
"xharness"
3030
],

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@
1818

1919
# avoid overriding GitInfo.txt on merge
2020
GitInfo.txt merge=ours
21+
22+
.github/workflows/*.lock.yml linguist-generated=true merge=ours

‎.github/CONTRIBUTING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ First and foremost: if you are thinking about contributing a bigger change or fe
66

77
## Code of Conduct
88

9-
Please see our [Code of Conduct](CODE_OF_CONDUCT.md).
9+
Please see our [Code of Conduct](/.github/CODE_OF_CONDUCT.md).
1010

1111
## Prerequisite
1212

@@ -16,7 +16,7 @@ You will need to complete a Contribution License Agreement before any pull reque
1616

1717
Currently, we are in the beginning phases of building up MAUI. Yet, we are still very excited for you to join us during this exciting time :)
1818

19-
Have a look at our [Development Guide](DEVELOPMENT.md) to learn about setting up your development environment.
19+
Have a look at our [Development Guide](/.github/DEVELOPMENT.md) to learn about setting up your development environment.
2020

2121
### What to work on
2222

@@ -27,11 +27,11 @@ Follow the style used by the [.NET Foundation](https://github.com/dotnet/runtime
2727
- We do not use the `private` keyword, as it is the default accessibility level in C#.
2828
- We use hard tabs over spaces.
2929

30-
Read and follow our [Pull Request template](PULL_REQUEST_TEMPLATE.md).
30+
Read and follow our [Pull Request template](/.github/PULL_REQUEST_TEMPLATE.md).
3131

3232
### Pull Request Requirements
3333

34-
Please refer to our [Pull Request template](PULL_REQUEST_TEMPLATE.md).
34+
Please refer to our [Pull Request template](/.github/PULL_REQUEST_TEMPLATE.md).
3535

3636
Please check the "Allow edits from maintainers" checkbox on your pull request. This allows us to quickly make minor fixes and resolve conflicts for you.
3737

@@ -45,7 +45,7 @@ See [our profiling wiki](https://aka.ms/profile-maui) for instructions on how to
4545

4646
2. **Benchmark your change**: If you're making a performance-related change, please include benchmarks in your pull request. This will help us understand the impact of your change, and will help us avoid performance regressions in the future.
4747

48-
Provide before & after numbers using BenchmarkDotNet where possible. See our existing [BenchmarkDotNet project](../src/Core/tests/Benchmarks/) for examples.
48+
Provide before & after numbers using BenchmarkDotNet where possible. See our existing [BenchmarkDotNet project](/src/Core/tests/Benchmarks/) for examples.
4949

5050
If a BenchmarkDotNet test case is not possible, share before & after profiling information from Visual Studio, `dotnet-trace`, etc. Keep in mind that sampling profilers can be inaccurate, so someone from the .NET MAUI team may need to reproduce your results before merging your change.
5151

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ 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-preview2
46+
- 11.0.0-preview.1
47+
- 10.0.50
48+
- 10.0.40
49+
- 10.0.30
50+
- 10.0.20
51+
- 10.0.11
52+
- 10.0.10
53+
- 10.0.1
54+
- 10.0.0
4555
- 10.0.0-rc.2
4656
- 10.0.0-rc.1
4757
- 10.0.0-preview.7
@@ -147,6 +157,16 @@ body:
147157
- 10.0.0-preview.7
148158
- 10.0.0-rc.1
149159
- 10.0.0-rc.2
160+
- 10.0.0
161+
- 10.0.1
162+
- 10.0.10
163+
- 10.0.11
164+
- 10.0.20
165+
- 10.0.30
166+
- 10.0.40
167+
- 10.0.50
168+
- 11.0.0-preview.1
169+
- 11.0.0-preview.2
150170
validations:
151171
required: true
152172
- type: dropdown
@@ -186,4 +206,4 @@ body:
186206
- type: markdown
187207
attributes:
188208
value: |
189-
By opening the issue you agree to follow this project's [Code of Conduct](https://github.com/dotnet/maui/blob/main/.github/CODE_OF_CONDUCT.md)
209+
By opening the issue you agree to follow this project's [Code of Conduct](https://github.com/dotnet/maui/blob/main/.github/CODE_OF_CONDUCT.md)

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!-- Please let the below note in for people that find this PR -->
2-
> [!NOTE]
3-
> Are you waiting for the changes in this PR to be merged?
4-
> It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!
5-
61
<!--
72
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!!
83
-->

0 commit comments

Comments
 (0)