From 030a72e653b939b15de14dd69dc56dd357f29eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Tue, 13 Feb 2024 12:01:37 +0100 Subject: [PATCH 1/4] Updated branch to use info --- .github/DEVELOPMENT.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md index ad114e16d37c..4fe3b1073747 100644 --- a/.github/DEVELOPMENT.md +++ b/.github/DEVELOPMENT.md @@ -59,9 +59,13 @@ Before opening the solution in Visual Studio / VS Code you **MUST** build the bu *NOTE*: IntelliSense takes a decent amount of time to fully process your solution. It will eventually work through all the necessary tasks. If you are having IntelliSense issues, usually unloading/reloading the `maui.core` and `maui.controls` projects will resolve. ## What branch should I use? -- main -Always use main no matter what you are working on or where you are hoping your change will get applied. We make sure that main always works against the current stable releases of Visual Studio and the .NET MAUI SDK. Even if you are working on features that will only be released with a future version of .NET. `main` is the only relevant branch for current development. +As a general rule: +- [main](https://github.com/dotnet/maui/tree/main) + +Always use main when you are going to correct an issue or apply changes unless it involves breaking changes with changes in public APIs. With changes to public APIs you must use the branch of the next dotnet version. + +- [net9.0](https://github.com/dotnet/maui/tree/net9.0) ## Repository projects @@ -116,8 +120,10 @@ These are tests used for exercising the UI through accessibility layers to simul ``` ├── Controls +│ ├── samples +│ │ ├── Controls.Sample.UITests │ ├── tests -│ │ ├── UITests +│ │ ├── Controls.AppiumTests ``` ### Unit Test Projects From ef1fde6d7592d4581168021ed156c4e72633c3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Tue, 13 Feb 2024 12:20:42 +0100 Subject: [PATCH 2/4] More changes --- .github/DEVELOPMENT.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md index 4fe3b1073747..fdffd8fc5e84 100644 --- a/.github/DEVELOPMENT.md +++ b/.github/DEVELOPMENT.md @@ -152,6 +152,8 @@ These tests can be ran using the test explorer in VS, or from command line with dotnet test src/TestUtils/src/Microsoft.Maui.IntegrationTests --logger "console;verbosity=diagnostic" --filter "Name=Build\(%22maui%22,%22net7.0%22,%22Debug%22,False\)" ``` +You can find detailed information about testing in the [Wiki](https://github.com/dotnet/maui/wiki/Testing). + ### Additional Cake Commands #### Clean From 941adf8f1deac3d6ac2b2c54c9332929aedd72ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Mon, 19 Feb 2024 15:40:09 +0100 Subject: [PATCH 3/4] Update .github/DEVELOPMENT.md Co-authored-by: Pedro Jesus --- .github/DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md index fdffd8fc5e84..7aefefe95cbe 100644 --- a/.github/DEVELOPMENT.md +++ b/.github/DEVELOPMENT.md @@ -63,7 +63,7 @@ Before opening the solution in Visual Studio / VS Code you **MUST** build the bu As a general rule: - [main](https://github.com/dotnet/maui/tree/main) -Always use main when you are going to correct an issue or apply changes unless it involves breaking changes with changes in public APIs. With changes to public APIs you must use the branch of the next dotnet version. +Always use main when you are going to correct an issue or apply changes unless it involves breaking changes with changes and/or additions on public APIs. With changes to public APIs you must use the branch of the next dotnet version. - [net9.0](https://github.com/dotnet/maui/tree/net9.0) From 0cad35b983c4986b13fc5b40249f98cdfd96f7ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez?= Date: Thu, 29 Feb 2024 17:57:12 +0100 Subject: [PATCH 4/4] Changes from PR feedback --- .github/DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/DEVELOPMENT.md b/.github/DEVELOPMENT.md index 7aefefe95cbe..d4f2a618f03a 100644 --- a/.github/DEVELOPMENT.md +++ b/.github/DEVELOPMENT.md @@ -63,7 +63,7 @@ Before opening the solution in Visual Studio / VS Code you **MUST** build the bu As a general rule: - [main](https://github.com/dotnet/maui/tree/main) -Always use main when you are going to correct an issue or apply changes unless it involves breaking changes with changes and/or additions on public APIs. With changes to public APIs you must use the branch of the next dotnet version. +Use ‘main’ for bug fixes that don’t require API changes. For new features and changes to public APIs, you must use the branch of the next .NET version. - [net9.0](https://github.com/dotnet/maui/tree/net9.0)