-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[net9.0] Merge main into net9.0 (#23328)
* Simplify Development.md (#23142) * Simplify Development.md * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update .github/DEVELOPMENT.md Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> * Update DEVELOPMENT.md * - modify and move advanced tips to different file * Update DEVELOPMENT.md * Update .github/DEVELOPMENT.md Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * Update docs/DevelopmentTips.md Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * Update docs/DevelopmentTips.md Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * - updates based on review --------- Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> * Wire RefreshView up to our xplat layout workflow (#23169) (#23218) * Use better layout/measure path with refreshview * - fix naming * - set RefreshView content to maui compatible container * - add test * - fix null operator * Update Issue23029.xaml.cs * - fix content panel so it removes previous content * - add additional check * Remove adding to FutureAccessList as the app is running with runFullTrust capability (#23047) * Call base.OnResume if Existing NavigationFragment Early (#23187) * VSCode no longer uses MAUI to launch (#23222) * [Android] Fix flyout behaviour switching exception (#22453) * Fix flyout behaviour switching exception * Tests added * Flyout test page added * Flyoutpage test fixes * Flyout toggle test added * Remove duplicate ] characters * Flyout test pages added * Check for platforms * Fix title * - fix tests --------- Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> * Renamed the project because macOS uses .app (#23223) * Renamed the project because macOS uses .app * And the folder * merge first * ns * Move tests to new location (#23251) * Split SingleProject targets (#23269) * Split SingleProject targets * Update Microsoft.Maui.Controls.SingleProject.Before.targets * Update bug-report.yml with 8.0.61 (#23273) * Null terminate Page on TabbedRenderer (#23290) Co-authored-by: Shane Neuville <shneuvil@microsoft.com> * [Windows] Improve performance in accessibility extensions (#22698) * AccessibilityExtensions: Add missing braces * AccessibilityExtensions: Enable nullability and improve performance * Update shipped & unshipped API --------- Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> * [Android] Avoid double event subscribes in gesture manager (#23242) * [Android] Avoid double event subscribes in gesture manager * Fix typo in test text * Bump Microsoft.Web.WebView2 from 1.0.2151.40 to 1.0.2592.51 (#23209) * [tests] test a lot more things in `MemoryTests.cs` (#23324) * [tests] test a lot more things in `MemoryTests.cs` This expands the tests to cover more controls and areas. * Add test cases for more controls: * `Ellipse` * `Grid` * `Path` * `Line` * `Path` * `RadioButton` * `Rectangle` * `RoundRectangle` * Expand tests for a couple controls: * `Border` has a `StrokeShape` * Any `TemplatedView` gets a `ControlTemplate` * Re-enable `ListView` for Android This should work now after merging: * dotnet/android#8900 * #23120 * Add a complicated test case for `BindableLayout` Similar to the case at: * #23199 * Skip `ListView` on API 23 * Bump Appium version to 2.11 (#23337) * Bump Appium version to 2.11 * Update CarouselViewUITests.UpdateCurrentItem.cs * Update appium-install.ps1 * Update CarouselViewUITests.UpdateCurrentItem.cs * Simplify `NavigationRootManager.Connect` on the Windows platform. (#23345) * Simplify `NavigationRootManager.Connect` on the Windows platform. * Use ternary operator syntax * Removed extra tabs * Moved `_disconnected = false;` to `if (_disconnected)` * Bump Appium Drivers (#23349) * Fix Merge --------- Co-authored-by: Eilon Lipton <Eilon@users.noreply.github.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: MartyIX <203266+MartyIX@users.noreply.github.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com> Co-authored-by: Thomas Muller <imuller@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Javier Suárez <javiersuarezruiz@hotmail.com> Co-authored-by: Jonathan Dick <jodick@microsoft.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Takym (たかやま) <15681312+Takym@users.noreply.github.com>
- Loading branch information
11 people
authored
Jul 1, 2024
1 parent
763ddb4
commit a44823e
Showing
565 changed files
with
718 additions
and
511 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| ### Reproducing an Issue/Debugging .NET MAUI Code | ||
| Open the .NET MAUI [workspace](https://code.visualstudio.com/docs/editor/workspaces) in VS Code by simply opening the root of your locally cloned .NET MAUI repository folder. VS Code will detect the workspace automatically and suggest that you open it. | ||
|
|
||
| In VS Code, select the device that you will be testing on. Using the Command Palette (<kbd>CTRL</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or on macOS <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>) type `pick device` and you will be presented with a set of choices for your target device (Android, iOS, etc). First select the option that describes the platform you want to run the project on, and then select the device that is available for that platform in the next menu. | ||
|
|
||
|  | ||
|
|
||
| There is a sample project in `src/Controls/samples/Controls.Sample.Sandbox`. This is an empty project, which directly references the .NET MAUI code. In this project you can add your code to reproduce an issue while allowing you to set breakpoints in .NET MAUI source code and debug through it easily. | ||
|
|
||
| To let VS Code know this is the project you want run, select the Sandbox project by going to the Command Palette (<kbd>CTRL</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> or on macOS <kbd>Command</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>) and start typing `pick startup` and select ".NET MAUI: Pick Startup Project" and then select the Sandbox project. | ||
|
|
||
|  | ||
|
|
||
| Before using the Command Palette for the first time, you may have to wait a minute | ||
| for IntelliSense and other tasks to initialize. If the project hasn't 'settled' yet, you will see an error "Pick Startup Project has resulted in an error." | ||
|
|
||
| *Note:* When you are committing your PR, do not include your changes to the Sandbox project. | ||
|
|
||
|
|
||
| ### Cake Commands | ||
|
|
||
| The below parameters can be used with the `dotnet cake` command in the root of your locally cloned .NET MAUI repository folder. | ||
|
|
||
| #### Clean | ||
| `--clean` | ||
| - Occasionally, when switching branches or syncing with the main branch, incremental builds may stop working. A common fix for this is to use git clean -xdf to delete all locally cached build information. However, the issue with git clean -xdf is that it will also wipe out any uncommitted changes. Using --clean to recursively delete the local obj/bin folders should hopefully resolve the issue while preserving your changes. | ||
|
|
||
| #### Target a specific platform | ||
| `--android` | ||
| `--ios` | ||
| `--windows` | ||
| `--catalyst` | ||
|
|
||
| ```bash | ||
| dotnet cake --target=VS --workloads=global --android --ios | ||
| ``` | ||
|
|
||
| *Note* you will have to `git clean -xdf` your project if you change or add platforms. | ||
|
|
||
| ### Blazor Hybrid | ||
|
|
||
| To build and run Blazor Desktop samples, check out the [Blazor Desktop](https://github.com/dotnet/maui/wiki/Blazor-Desktop) wiki topic. | ||
|
|
||
| # Advanced Scenarios | ||
|
|
||
| ### Compile using a local `bin\dotnet` via `dotnet-local.*` | ||
|
|
||
| This method will use the .NET and workload versions that are specific to the branch you are on. There may be occasions when your global installation of .NET is not compatible with a particular branch. In such cases, this method will create a local folder containing all the .NET versions specific to that branch. | ||
|
|
||
| Use `dotnet-local.cmd` on Windows or `dotnet-local.sh` on Unix to ensure that `PATH` is set consistently. | ||
|
|
||
| #### Cake | ||
|
|
||
| You can run a `Cake` target to bootstrap .NET SDK in `bin\dotnet` and launch Visual Studio: | ||
|
|
||
| ```dotnetcli | ||
| dotnet tool restore | ||
| dotnet cake --target=VS | ||
| ``` | ||
|
|
||
| There is also a `VSCode` target for launching Visual Studio Code. | ||
|
|
||
| ```dotnetcli | ||
| dotnet tool restore | ||
| dotnet cake --target=VSCode | ||
| ``` | ||
|
|
||
| #### Testing branch against your project | ||
| `--sln=<Path to SLN>` | ||
| - This will pack .NET and then open a VS instance using the local pack. This is useful if you want to check to see if the changes in a branch will address your particular issues. Pack only runs the first time so you will need to explicitly add the `--pack` flag if you make changes and need to repack. | ||
|
|
||
| ```dotnetcli | ||
| dotnet tool restore | ||
| dotnet cake --sln="<download_directory>\MauiApp2\MauiApp2.sln" --target=VS | ||
| ``` | ||
|
|
||
| #### Pack | ||
| `--pack` | ||
| - This creates .NET MAUI packs inside the local dotnet install. This lets you use the CLI commands with the local dotnet to create/deploy with any changes that have been made on that branch (including template changes). | ||
|
|
||
| ```dotnetcli | ||
| dotnet tool restore | ||
| dotnet cake --target=VS --pack --sln="<download_directory>\MauiApp2\MauiApp2.sln" | ||
| ``` | ||
|
|
||
| Create new .NET MAUI app using your new packs | ||
| ```dotnetcli | ||
| dotnet tool restore | ||
| dotnet cake --pack | ||
| mkdir MyMauiApp | ||
| cd MyMauiApp | ||
| ..\bin\dotnet\dotnet new maui | ||
| ..\bin\dotnet\dotnet build -t:Run -f net[current_sdk_version]-android | ||
| ``` | ||
|
|
||
| You can also run commands individually: | ||
| ```dotnetcli | ||
| # install local tools required to build (cake, pwsh, etc..) | ||
| dotnet tool restore | ||
| # Provision .NET SDK in bin\dotnet | ||
| dotnet build src\DotNet\DotNet.csproj | ||
| # Builds Maui MSBuild tasks | ||
| .\bin\dotnet\dotnet build Microsoft.Maui.BuildTasks.slnf | ||
| # Builds the rest of Maui | ||
| .\bin\dotnet\dotnet build Microsoft.Maui.sln | ||
| # Launch Visual Studio | ||
| dotnet cake --target=VS | ||
| ``` | ||
|
|
||
| ## Debugging MSBuild Tasks using VS/VSCode | ||
|
|
||
| One thing that is very useful is the ability to debug your Tasks while | ||
| they are being run on a build process. This is possible thanks to the | ||
| `MSBUILDDEBUGONSTART` environment variable. When set to `2` this will | ||
| force MSBuild to wait for a debugger connection before continuing. | ||
| You will see the following prompt. | ||
|
|
||
|
|
||
| ```dotnetcli | ||
| Waiting for debugger to attach (dotnet PID 13001). Press enter to continue... | ||
| ``` | ||
|
|
||
| You can then use VS or VSCode to attach to this process and debug you tasks. | ||
| You can start your test app with the `dotnet-local` script (so it uses your maui build) | ||
|
|
||
| ### [MacOS](#tab/macos) | ||
|
|
||
| ```dotnetcli | ||
| MSBUILDDEBUGONSTART=2 ~/<some maui checkout>/dotnet-local.sh build -m:1 | ||
| ``` | ||
|
|
||
| ### [Linux](#tab/linux) | ||
|
|
||
| ```dotnetcli | ||
| MSBUILDDEBUGONSTART=2 ~/<some maui checkout>/dotnet-local.sh build -m:1 | ||
| ``` | ||
|
|
||
| ### [Windows](#tab/windows) | ||
|
|
||
| ```dotnetcli | ||
| set MSBUILDDEBUGONSTART=2 | ||
| ~/<some maui checkout>/dotnet-local.cmd build -m:1 | ||
| ``` | ||
|
|
||
| --- | ||
|
|
||
| Note: the `-m:1` is important as it restricts MSBuild to 1 node. | ||
|
|
||
| Once MSBuild starts it will print the following | ||
|
|
||
| ```dotnetcli | ||
| Waiting for debugger to attach (dotnet PID xxxx). Press enter to continue... | ||
| ``` | ||
|
|
||
| You need to copy the PID value so we can use this in the IDE. For Visual Studio you can use the `Attach to Process` menu option, while you have the Microsoft.Maui.sln solution open. For VSCode open the workspace then use the `Attach to Process` Run and Debug option. You will be prompted for the PID and it will then connect. | ||
|
|
||
| Once connected go back to your command prompt and press ENTER so that the MSBuild process can continue. | ||
|
|
||
| You will be able to set breakpoints in Tasks (but not Targets) and step through code from this point on. | ||
|
|
||
| If you want to test in-tree in VSCode the `Build Platform Sample` command will ask you if you want to debug MSBuild tasks and fill in the `MSBUILDDEBUGONSTART` for you. The PID text will appear in the `Terminal` window in VSCode. You can then use the `Attach to Process` Run and Debug option to attach to the process. | ||
|
|
||
|
|
||
| ### Integration Tests | ||
|
|
||
| The Integration test project under `src/TestUtils/src/Microsoft.Maui.IntegrationTests` contains tests which build and/or run MAUI templates or other projects. | ||
|
|
||
| These tests can be ran using the test explorer in VS, or from command line with `dotnet test`. Here's how to run an individual test with parameters from command line: | ||
|
|
||
| ```bash | ||
| dotnet test src/TestUtils/src/Microsoft.Maui.IntegrationTests --logger "console;verbosity=diagnostic" --filter "Name=Build\(%22maui%22,%22net7.0%22,%22Debug%22,False\)" | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.