Dev/ios guid splash

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.22514.1",
+      "version": "1.0.0-prerelease.22569.1",
       "commands": [
         "xharness"
       ]

.github/CODE_OF_CONDUCT.md

@@ -3,4 +3,4 @@
 This project has adopted the code of conduct defined by the Contributor Covenant
 to clarify expected behavior in our community.
 
-For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/about/policies/code-of-conduct).

.github/DEVELOPMENT.md

@@ -4,184 +4,40 @@ This page contains steps to build and run the .NET MAUI repository from source.
 
 ## Requirements
 
-### .NET 6 SDK
-
-In most cases, when you have Visual Studio installed with the .NET workloads checked, these steps are not required.
-
-1. Install the latest .NET 6:  
-   <!--- [Win (x64)](https://aka.ms/dotnet/6.0.2xx/daily/dotnet-sdk-win-x64.exe)   -->
-   - [Install the latest Public Preview of Visual Studio](https://docs.microsoft.com/en-us/dotnet/maui/get-started/installation/)
-   - [macOS](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)  
-2. If you're on a Windows development machine, install [SDK 20348](https://go.microsoft.com/fwlink/?linkid=2164145)
-3. If you're on a MacOS development machine, install [PowerShell](https://docs.microsoft.com/powershell/scripting/install/installing-powershell-on-macos)
+### Visual Studio
+Follow the instructions here to install .NET MAUI with Visual Studio Stable:
+   - [Windows](https://learn.microsoft.com/dotnet/maui/get-started/installation?tabs=vswin)
+      - Select the 20348 SDK option inside Individual Components or [install 20348 manually](https://go.microsoft.com/fwlink/?linkid=2164145)
+      - If you know you have 20348 installed but are still getting an error around this SDK missing, trying uninstalling and reinstalling the SDK.
+   - [macOS](https://learn.microsoft.com/dotnet/maui/get-started/installation?tabs=vsmac)  
 
 ### iOS / MacCatalyst
 
-iOS and MacCatalyst will require Xcode 13.3 Stable. You can get this [here](https://developer.apple.com/download/more/?name=Xcode).
+iOS and MacCatalyst will require current stable Xcode. You can get this [here](https://developer.apple.com/download/more/?name=Xcode).
 
 ### Android
 
-Android API-31 (Android 12) is now the default in .NET 6.
-
-## Running
-
-### Compile using a local `bin\dotnet`
-
-This method ensures that the workloads installed by Visual Studio won't get changed. This is usually the best method to use if you want to preserve the global state of your machine. This method will also use the versions that are specific to the branch you are on which is a good way to ensure compatibility.
-
-#### Cake
-
-You can run a `Cake` target to bootstrap .NET 6 in `bin\dotnet` and launch Visual Studio:
-
-```dotnetcli
-dotnet tool restore
-dotnet cake --target=VS
-```
-
-#### 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 net6.0-android
-```
-
-You can also run commands individually:
-```dotnetcli
-# install local tools required to build (cake, pwsh, etc..)
-dotnet tool restore
-# Provision .NET 6 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
-```
-
-### Compile with globally installed `dotnet`
+If you're missing any of the Android SDKs, Visual Studio should prompt you to install them. If it doesn't prompt you then use the [Android SDK Manager](https://learn.microsoft.com/xamarin/android/get-started/installation/android-sdk) to install the necessary SDKs.
 
-- Try this first. This will build using the workloads installed by VS. If you receive a build failure related to workloads we recommend using a [local dotnet build](https://github.com/dotnet/maui/blob/main/.github/DEVELOPMENT.md#compile-using-a-local-bindotnet). If you want to keep on this path, proceed to the next step and then try to run these commands again.
+### Opening the Repository
 
 ```dotnetcli
 dotnet tool restore
 dotnet cake --target=VS --workloads=global
 ```
 
-- If you need/want to update your global workloads to the latest workloads. 
-
-> **Warning**
-> This will replace what Visual Studio has installed for your workloads so now your entire machine will be using the workloads you have installed here.
-
-#### main branch
-
-> You'll probably need to run these commands with elevated privileges.
-
-> **Warning**
-> This is going to contain the "stable" versions of the packages, so you will have to clear the NuGet cache when this feed changes and when .NET ships. The various `darc-pub-dotnet-*` feeds are temporary and are generated on various builds. These feeds may disappear and be replaced with new ones as new builds come out. Make sure to verify that you are on the latest here and clear the nuget cache if it changes.
-> ```
-> dotnet nuget locals all --clear
-> ```
-
-Windows:
-
-```bat
-dotnet workload install maui `
-  --skip-sign-check `
-  --from-rollback-file https://aka.ms/dotnet/maui/net6.0.json `
-  --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json `
-  --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json `
-  --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json `
-  --source https://api.nuget.org/v3/index.json
-```
-
-MacOS:
-
-```bash
-dotnet workload install maui \
-  --skip-sign-check \
-  --from-rollback-file https://aka.ms/dotnet/maui/net6.0.json \
-  --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json \
-  --source https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json \
-  --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json \
-  --source https://api.nuget.org/v3/index.json
-```
-
+*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. 
 
 #### MacOS
 
 All of the above cake commands should work fine on `MacOS`.
 
 If you aren't using the cake scripts and the `Microsoft.Maui-mac.slnf` isn't working for you try `_omnisharp.sln`
 
-### Additional Cake Commands
-
-#### Clean
-`--clean`
-- This will do a recursive delete of all your obj/bin folders. This is helpful if for some reason your repository is in a bad state and you don't want to go as scorched earth as `git clean -xdf`
-
-### Blazor Desktop
-
-To build and run Blazor Desktop samples, check out the [Blazor Desktop](https://github.com/dotnet/maui/wiki/Blazor-Desktop) wiki topic.
-
-### Android
-
-To workaround a performance issue, all `Resource.designer.cs`
-generation is disabled for class libraries in this repo.
-
-If you need to add a new `@(AndroidResource)` value to be used from C#
-code in .NET MAUI:
-
-1. Comment out the `<PropertyGroup>` in `Directory.Build.targets` that
-   sets `$(AndroidGenerateResourceDesigner)` and
-   `$(AndroidUseIntermediateDesignerFile)` to `false`.
-
-2. Build .NET MAUI as you normally would. You will get compiler errors
-   about duplicate fields, but `obj\Debug\net6.0-android\Resource.designer.cs`
-   should now be generated.
-
-3. Open `obj\Debug\net6.0-android\Resource.designer.cs`, and find the
-   field you need such as:
-
-```csharp
-// aapt resource value: 0x7F010000
-public static int foo = 2130771968;
-```
-
-4. Copy this field to the `Resource.designer.cs` checked into source
-   control, such as: `src\Controls\src\Core\Platform\Android\Resource.designer.cs`
-
-5. Restore the commented code in `Directory.Build.targets`.
-
 ## What branch should I use?
+- main
 
-- net7.0
-  - I want to use the net7.0 sdk and make changes that will be released with the .NET 7 release of MAUI
-- net6.0
-  - This PR seems like it should go out with a net6.0 service release
-- main (start here if you don't know what to use)
-  - I want to use the net6.0 sdk and make changes that will be released with the .NET 7 release of MAUI
+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.
 
 ## Repository projects
 
@@ -244,6 +100,117 @@ These are tests that will not run on a device. This is useful for testing device
 │   │   ├── Essentials.UnitTests
 ```
 
+
+### Additional Cake Commands
+
+#### Clean
+`--clean`
+- This will do a recursive delete of all your obj/bin folders. This is helpful if for some reason your repository is in a bad state and you don't want to go as scorched earth as `git clean -xdf`
+
+#### 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 Desktop
+
+To build and run Blazor Desktop samples, check out the [Blazor Desktop](https://github.com/dotnet/maui/wiki/Blazor-Desktop) wiki topic.
+
+### Android
+
+To workaround a performance issue, all `Resource.designer.cs`
+generation is disabled for class libraries in this repo.
+
+If you need to add a new `@(AndroidResource)` value to be used from C#
+code in .NET MAUI:
+
+1. Comment out the `<PropertyGroup>` in `Directory.Build.targets` that
+   sets `$(AndroidGenerateResourceDesigner)` and
+   `$(AndroidUseIntermediateDesignerFile)` to `false`.
+
+2. Build .NET MAUI as you normally would. You will get compiler errors
+   about duplicate fields, but `obj\Debug\net[current_sdk_version]-android\Resource.designer.cs`
+   should now be generated.
+
+3. Open `obj\Debug\net[current_sdk_version]-android\Resource.designer.cs`, and find the
+   field you need such as:
+
+```csharp
+// aapt resource value: 0x7F010000
+public static int foo = 2130771968;
+```
+
+4. Copy this field to the `Resource.designer.cs` checked into source
+   control, such as: `src\Controls\src\Core\Platform\Android\Resource.designer.cs`
+
+5. Restore the commented code in `Directory.Build.targets`.
+
+
+# Advanced Scenarios
+
+### Compile using a local `bin\dotnet`
+
+This method ensures that the workloads installed by Visual Studio won't get changed. This is usually the best method to use if you want to preserve the global state of your machine. This method will also use the versions that are specific to the branch you are on which is a good way to ensure compatibility.
+
+#### 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
+```
+
+#### 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
+```
+
+
 ## Stats
 
 <img src="https://repobeats.axiom.co/api/embed/f917a77cbbdeee19b87fa1f2f932895d1df18b71.svg" />

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -44,16 +44,14 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
-        - 6.0 Release Candidate 2 or older
-        - 6.0 Release Candidate 3
         - 6.0.312
         - 6.0.400
         - 6.0.408
         - 6.0.419
         - 6.0.424
-        - 6.0.486 (current)
-        - 7.0 Release Candidate 1
-        - 7.0 Release Candidate 2
+        - 6.0.486
+        - 7.0 (current)
+        - 8.0 previews
         - Unknown/Other (please specify)
     validations:
       required: true
@@ -63,14 +61,13 @@ body:
       label: Last version that worked well
       description: Is there a version on which this _did_ work? If yes, which one? If no or unknown, please select `Unknown/Other`.  Run `dotnet workload list` to find your version.
       options:
-        - 6.0 Release Candidate 2 or older
-        - 6.0 Release Candidate 3
         - 6.0.312
         - 6.0.400
         - 6.0.408
         - 6.0.419
         - 6.0.424
-        - 7.0 Release Candidate 1
+        - 7.0 (current)
+        - 8.0 previews
         - Unknown/Other
     validations:
       required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -10,12 +10,5 @@
 Fixes #
 
 <!--
-Are you targeting the right branch?
-
-- net6.0
-  - This PR should be part of a .NET 6 service release.
-- main (start here if you don't know what to use)
-  - This PR should wait until .NET 7 is released.
-- net7.0
-  - This PR is very specific to .NET 7 SDK updates and wouldn't compile if they were to target main.
+Are you targeting main? All PRs should target the main branch unless otherwise noted.
 -->

.github/fabricbot.json

@@ -2005,7 +2005,7 @@
           {
             "name": "addReply",
             "parameters": {
-              "comment": "Thanks for the issue report @${issueAuthor}! This issue appears to be a problem with Visual Studio, so we ask that you use the VS feedback tool to report the issue. That way it will get to the routed to the team that owns this experience in VS.\n\nIf you encounter a problem with Visual Studio, we want to know about it so that we can diagnose and fix it. By using the Report a Problem tool, you can collect detailed information about the problem, and send it to Microsoft with just a few button clicks.\n\n1. Go to the [VS feedback tool](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022) to report the issue\n2. Close this bug, and consider adding a link to the VS Feedback issue so that others can follow its activity there.\n\nThis issue will be automatically closed in 3 days if there are no further comments."
+              "comment": "Thanks for the issue report @${issueAuthor}! This issue appears to be a problem with Visual Studio, so we ask that you use the VS feedback tool to report the issue. That way it will get to the routed to the team that owns this experience in VS.\n\nIf you encounter a problem with Visual Studio, we want to know about it so that we can diagnose and fix it. By using the Report a Problem tool, you can collect detailed information about the problem, and send it to Microsoft with just a few button clicks.\n\n1. Go to the [Visual Studio for Windows feedback tool](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022) or [Visual Studio for Mac feedback tool](https://learn.microsoft.com/en-us/visualstudio/mac/report-a-problem?view=vsmac-2022) to report the issue\n2. Close this bug, and consider adding a link to the VS Feedback issue so that others can follow its activity there.\n\nThis issue will be automatically closed in 3 days if there are no further comments."
             }
           }
         ]

.github/repro.md

@@ -3,7 +3,7 @@
 First of all, thank you for reporting this potential bug. Nobody likes bugs and to help us diagnose and resolve your potential issue as effective and quickly as possible, we would like to give you a bit more information about why we ask you for a reproducible example of the problem, and how to provide one.
 
 ## What is a reproduction?
-A reproduction, reprodicible example or just repro for short is the most basic code to demonstrate the issue that you're seeing. It's the simplest way to reproduce the issue.
+A reproduction, reproducible example or just repro for short is the most basic code to demonstrate the issue that you're seeing. It's the simplest way to reproduce the issue.
 Ideally, you should be able to reproduce the issue by just running the code in the project you have provided and see the problem. If any reproduction steps are needed, either note them in the issue or include them in the project somehow.
 
 ## Why do we ask for a reproducible example?