Merge pull request #7129 from unoplatform/dev/jela/3-10-backports

Multiple 3.10 backports

build/Uno.WinUI.RemoteControl.nuspec

@@ -164,9 +164,12 @@
 
 	<!-- Remote Control host and integration -->
     <file src="..\src\Uno.UI.RemoteControl.Host\bin\Release\netcoreapp3.1\*.*" target="tools\rc\host" />
-    <file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.dll" target="tools\rc" />
-    <file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.pdb" target="tools\rc" />
-    <file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\Newtonsoft.Json.dll" target="tools\rc" />
+	<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.dll" target="tools\rc\16.0" />
+	<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\Newtonsoft.Json.dll" target="tools\rc\16.0" />
+	<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.pdb" target="tools\rc\16.0" />
+	<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net48\*.dll" target="tools\rc\17.0" />
+	<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net48\*.pdb" target="tools\rc\17.0" />
+	<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net48\Newtonsoft.Json.dll" target="tools\rc\17.0" />
 
 	<!-- Force UAP/netx-win to ignore netstandard 2.0 -->
 	<file src="_._" target="build\uap10.0.16299" />

build/ci/.azure-devops-ios-tests.yml

@@ -65,7 +65,7 @@ jobs:
     nugetPackages: $(NUGET_PACKAGES)
     JobName: 'iOS_Automated_Tests_Group_01'
     JobDisplayName: 'iOS Automated Tests Group 01'
-    JobTimeoutInMinutes: 40
+    JobTimeoutInMinutes: 60
     vmImage: ${{ parameters.vmImage }}
     UITEST_SNAPSHOTS_ONLY: false
     UITEST_AUTOMATED_GROUP: 1
@@ -77,7 +77,7 @@ jobs:
     nugetPackages: $(NUGET_PACKAGES)
     JobName: 'iOS_Automated_Tests_Group_02'
     JobDisplayName: 'iOS Automated Tests Group 02'
-    JobTimeoutInMinutes: 40
+    JobTimeoutInMinutes: 60
     vmImage: ${{ parameters.vmImage }}
     UITEST_SNAPSHOTS_ONLY: false
     UITEST_AUTOMATED_GROUP: 2
@@ -89,7 +89,7 @@ jobs:
     nugetPackages: $(NUGET_PACKAGES)
     JobName: 'iOS_Automated_Tests_Group_03'
     JobDisplayName: 'iOS Automated Tests Group 03'
-    JobTimeoutInMinutes: 40
+    JobTimeoutInMinutes: 60
     vmImage: ${{ parameters.vmImage }}
     UITEST_SNAPSHOTS_ONLY: false
     UITEST_AUTOMATED_GROUP: 3

doc/articles/get-started-vs-2022.md

@@ -3,21 +3,21 @@
 > This section is covering **preview** relases of .NET 6 and Visual Studio 2022. It is a work in progress.
 
 ## Prerequisites
-* [**Visual Studio 2022 Preview 2 or later**](https://visualstudio.microsoft.com/), with:
+* [**Visual Studio 2022 Preview 3.1 or later**](https://visualstudio.microsoft.com/), with:
     * **Universal Windows Platform** workload installed.
 
     ![visual-studio-installer-uwp](Assets/quick-start/vs-install-uwp.png)
 
 	* **Mobile development with .NET (Xamarin)** workload installed.
 
     ![visual-studio-installer-xamarin](Assets/quick-start/vs-install-xamarin.png)
-
+    * Starting from VS 2022 Preview 4, select the **.NET Maui (Preview)** optional component (Installs the .NET 6 Android/iOS workloads)
     *
         * the iOS Remote Simulator installed (for iOS development)
 	    * A working Mac with Visual Studio for Mac, XCode 13.5 Beta or later installed (for iOS development)
 	    * Google's Android x86 emulators or a physical Android device (for Android development)
 
-    * **ASP**.**NET and web** workload installed, along with .NET Core 2.2 (for WASM development)
+    * **ASP**.**NET and web** workload installed, along with .NET Core 5.0 (for WASM development)
 
     ![visual-studio-installer-web](Assets/quick-start/vs-install-web.png)
 
@@ -26,9 +26,9 @@ For more information about these prerequisites, see [Installing Xamarin](https:/
 ## Finalize your environment setup using uno-check
 * Install the uno-check tool:
    ```
-   dotnet tool install -g Uno.Check --version 0.2.0-dev.166
+   dotnet tool install -g Uno.Check --version 0.2.0-dev.327
    ```
-   If a [later version is available](https://www.nuget.org/packages/Uno.Check), you can use it instead of 0.2.0-dev.166
+   If a [later version is available](https://www.nuget.org/packages/Uno.Check), you can use it instead of 0.2.0-dev.327
 * Run the uno-check tool:
    ```
    uno-check --preview

doc/articles/get-started-vsmac.md

@@ -12,54 +12,52 @@ While it is easier to create apps using Uno Platform on Windows, you can also cr
 * [**GTK+3**](https://formulae.brew.sh/formula/gtk+3) for running the Skia/GTK projects
 
 ## Installing the dotnet new templates
-- In order to create a new Uno Project, you'll need to install the [`dotnet new` Uno Platform templates](get-started-dotnet-new.md).
-- Once done, in Visual Studio for Mac, open the preference menu:
-  - On left side, open the **Other** then **Preview Features** menu
-  - Check the **Show all .NET Core templates in the New Project dialog**
+In order to create a new Uno Project, you'll need to install the [`dotnet new` Uno Platform templates](get-started-dotnet-new.md).
 
 ## Create a new project using the IDE
-1. To create a new project:
-    - Click the **New** button on the welcome screen
-    - Select **Cross Platform App (Uno Platform)**
-    - If presented with a list of options, uncheck **Skia/WPF**
-    - Choose a name then click create
+1. To create a new project, from the command line:
+    ```
+    cd src
+    dotnet new unoapp -o MyApp01
+    ```
 
-1. Once created, you should see your folder structure set up like this:
-![folder-structure](Assets/quick-start/vs-mac-folder-structure.png)\
+1. Once created, open the `MyApp-vsmac.slnf` file
+    - This `slnf` is called a solution filter, which automatically excludes projects which are not compatible with Visual Studio for mac.
     - If you have a warning symbol on your iOS project, make sure you have the minimum version of Xcode installed.
 ![update-xcode](Assets/quick-start/xcode-version-warning.jpg)\
+
 To update, go to `Visual Studio > Preferences > Projects > SDK Locations > Apple` and select Xcode 12 or higher.
 Restart Visual Studio.
-1. If you did not get presented a list of options to create the project, as of Visual Studio for Mac 8.8, the Uno Platform template contains WPF projects that prevent NuGet restore to work properly. To fix this:
-    - Select the `MyProject.Skia.Wpf` and `MyProject.Skia.Wpf.Host`
-    - Right click to remove them from the solution.
-    - At the top of the tree, on the solution node, right click and select **Restore Nuget Packages**
-1. You can now run on iOS, Android, and macOS by setting your startup project and running.
-![startup-projects](Assets/quick-start/vs-mac-build.png)
+1. You can now run on iOS, Android, macOS and Skia.GTK projects by changing your startup project and start the debugger.
    
 Note: You will not be able to build the UWP and WPF projects on a Mac. All changes to this project must be made on Windows.
 
-## Create a new project using the command line
+## Create a other projects types using the command line
 
 You can create a new Uno Platfom solution with the following terminal command:
     ```bash
-    dotnet new unoapp -o MyProject --skia-wpf=false
+    dotnet new unoapp -o MyProject --wasm=false
     ```
-Once created, you can open it using the Visual Studio IDE.
 
+Once created, you can open it using the Visual Studio IDE.
 
 ### Build and Run for WebAssembly
 
 Building for WebAssembly takes a few more steps:
 
 1. Set `MyProject.Wasm` to startup project
-2. Build the project
-3. In the terminal, navigate to your build output. This will typically be: `MyProject.Wasm > bin > Debug > netstandard2.0 > dist > server.py` Run the `server.py` program.
-4. In your browser, open localhost:8000. 
+1. Build the project
+1. In the terminal, navigate to your build output path. This will typically be: `MyProject.Wasm > bin > Debug > net5.0 > dist`
+1. Install `dotnet serve`:
+    ```
+    dotnet tool install -g dotnet-serve
+    ```
+1. Once installed type `dotnet serve`.
+1. Navigate to the url presented by the tool to run your application
 
 ### Video Tutorial
 [![Getting Started Visual Studio Mac Video](Assets/vsmac-cover.JPG)](http://www.youtube.com/watch?v=ESGJr6kHQg0 "")
 
 ### Getting Help
 
-If you have issues with Visual Studio and Uno Platform, please visit our [Discord](https://www.platform.uno/discord) - #uno-platform channel or [StackOverflow](https://stackoverflow.com/questions/tagged/uno-platform) where our engineering team and community will be able to help you. 
+If you have issues with Visual Studio and Uno Platform, please visit our [Discord](https://www.platform.uno/discord) - #uno-platform channel or [StackOverflow](https://stackoverflow.com/questions/tagged/uno-platform) where our engineering team and community will be able to help you.