Merge pull request unoplatform#13654 from unoplatform/dev/jela/dev-se…

…rver Misc fixes for DevServer and HR tests
morning4coffe-dev · Sep 15, 2023 · 80ef443 · 80ef443
2 parents 81c6787 + d1b2ee7
commit 80ef443
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 24 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -61,7 +61,7 @@ body:
         - Uno.UI / Uno.UI.WebAssembly / Uno.UI.Skia
         - Uno.WinUI / Uno.WinUI.WebAssembly / Uno.WinUI.Skia
         - Uno.SourceGenerationTasks
-        - Uno.UI.RemoteControl / Uno.WinUI.RemoteControl
+        - Uno.UI.DevServer / Uno.WinUI.DevServer
         - Other
 
   - type: textarea

diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -132,6 +132,9 @@
 		<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
 							 Query="//PackageReference[@Include='Uno.WinUI']/@Version"
 							 Value="$(GitVersion_SemVer)" />
+		<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
+							 Query="//PackageReference[@Include='Uno.WinUI.RemoteControl']/@Version"
+							 Value="$(GitVersion_SemVer)" />
 		<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
 							 Query="//PackageReference[@Include='Uno.WinUI.DevServer']/@Version"
 							 Value="$(GitVersion_SemVer)" />

diff --git a/doc/articles/features/working-with-codespaces.md b/doc/articles/features/working-with-codespaces.md
@@ -19,7 +19,7 @@ To create a new Codespace, visit this [GitHub section](https://github.com/codesp
 1. Using a terminal, navigate to the `MyApp.Wasm` folder
 1. Type `dotnet run`
 1. Once the compilation is done, a server will open on port 5000
-1. In the **Ports** tab (next to the Terminal tab), right click to make both the port 5000 and the other dotnet opened port (with `uno.winui.remotecontrol` or `uno.ui.remotecontrol` in the running process column) to "public".
+1. In the **Ports** tab (next to the Terminal tab), right click to make both the port 5000 and the other dotnet opened port (with `uno.winui.devserver` or `uno.ui.remotecontrol` in the running process column) to "public".
    > Failure to make both ports public will prevent the app from starting properly.
 1. Codespaces will suggest to open a new browser window or as a preview window
 

diff --git a/doc/articles/get-started-wizard.md b/doc/articles/get-started-wizard.md
@@ -102,7 +102,7 @@ The XAML Hot reload provides a Visual Studio for Windows output window name "Uno
 
 Some common troubleshooting steps:
 - Make sure to rebuild your application if the XAML changes are not applied
-- Ensure that the Uno.UI.RemoteControl package has the same version as the Uno.UI package (Similar step is valid for Uno.WinUI packages)
+- Ensure that the Uno.WinUI.DevServer package has the same version as the Uno.UI package (Similar step is valid for Uno.WinUI packages)
 
 More troubleshooting information is available [in this section](features/working-with-xaml-hot-reload.md).
 

diff --git a/doc/articles/guides/silverlight-migration/01-create-uno-solution.md b/doc/articles/guides/silverlight-migration/01-create-uno-solution.md
@@ -49,7 +49,7 @@ When working with Uno, it is important to ensure that the latest and greatest ve
 
     * **Uno.Core**
     * **Uno.WinUI** (or **Uno.UI**)
-    * **Uno.WinUI.RemoteControl** (or **Uno.UI.RemoteControl**)
+    * **Uno.WinUI.DevServer** (or **Uno.UI.DevServer**)
     * **Uno.WinUI.WebAssembly** (or **Uno.UI.WebAssembly**)
     * **Uno.Wasm.Bootstrap**
     * **Uno.Wasm.Bootstrap.DevServer**

diff --git a/doc/articles/guides/uno-islands.md b/doc/articles/guides/uno-islands.md
@@ -25,7 +25,7 @@ To light-up the Uno Islands feature, we need to reference several Uno Platform N
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.5.0" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI.DevServer" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.WinUI.XamlHost" Version="4.5.0-dev.453" />
     <PackageReference Include="Uno.WinUI.XamlHost.Skia.Wpf" Version="4.5.0-dev.453" />

diff --git a/doc/articles/howto-consume-webservices.md b/doc/articles/howto-consume-webservices.md
@@ -60,7 +60,7 @@ In this task, you will create a simple Single Page App with the Uno Platform. Th
 
     * **Uno.Core**
     * **Uno.WinUI** (or **Uno.UI**)
-    * **Uno.WinUI.RemoteControl** (or **Uno.UI.RemoteControl**)
+    * **Uno.WinUI.DevServer** (or **Uno.UI.DevServer**)
     * **Uno.WinUI.WebAssembly** (or **Uno.UI.WebAssembly**)
     * **Uno.Wasm.Bootstrap**
     * **Uno.Wasm.Bootstrap.DevServer**

diff --git a/doc/articles/updating-to-winui3.md b/doc/articles/updating-to-winui3.md
@@ -12,7 +12,7 @@ Uno Platform supports authoring apps using [WinUI 3's API](uwp-vs-winui3.md). Th
 
 - **NuGet updates:**
     - `Uno.UI` becomes `Uno.WinUI`
-    - `Uno.UI.RemoteControl` becomes `Uno.WinUI.RemoteControl`
+    - `Uno.UI.DevServer` becomes `Uno.WinUI.DevServer`
     - `Uno.UI.Lottie` becomes `Uno.WinUI.Lottie`
     - `Uno.UI.Foldable` becomes `Uno.WinUI.Foldable`
 - **String replacements:**

diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/UnoQuickStart.Mobile.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/UnoQuickStart.Mobile.csproj
@@ -44,6 +44,7 @@
 
   	<ItemGroup>
     	<PackageReference Include="Uno.WinUI" Version="4.7.0-dev.417" />
+		<!-- Keep RemoteControl (instead of devserver) as-is for backward compatibility testing -->
 		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.0-dev.417" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.0-dev.417" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />

diff --git a/...SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/UnoQuickStart.Skia.Gtk.csproj b/...SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.Gtk/UnoQuickStart.Skia.Gtk.csproj
@@ -14,6 +14,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.7.0-dev.417" />
+		<!-- Keep RemoteControl (instead of devserver) as-is for backward compatibility testing -->
 		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.0-dev.417" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="3.0.5" />
 		<PackageReference Include="Uno.WinUI.Lottie" Version="4.7.0-dev.417" />

diff --git a/...Template.WinUI.netcore/Skia.Linux.FrameBuffer/UnoQuickStart.Skia.Linux.FrameBuffer.csproj b/...Template.WinUI.netcore/Skia.Linux.FrameBuffer/UnoQuickStart.Skia.Linux.FrameBuffer.csproj
@@ -13,6 +13,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.7.0-dev.417" />
+		<!-- Keep RemoteControl (instead of devserver) as-is for backward compatibility testing -->
 		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.0-dev.417" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.0-dev.417" />
 		<PackageReference Include="Uno.WinUI.Lottie" Version="4.7.0-dev.417" />

diff --git a/...SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/UnoQuickStart.Skia.WPF.csproj b/...SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/UnoQuickStart.Skia.WPF.csproj
@@ -22,6 +22,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.7.0-dev.417" />
+		<!-- Keep RemoteControl (instead of devserver) as-is for backward compatibility testing -->
 		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.0-dev.417" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="3.0.5" />
 		<PackageReference Include="Uno.WinUI.Lottie" Version="4.7.0-dev.417" />

diff --git a/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/UnoQuickStart.Wasm.csproj b/src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Wasm/UnoQuickStart.Wasm.csproj
@@ -65,6 +65,7 @@
 		<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
 		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
 		<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.7.0-dev.417" />
+		<!-- Keep RemoteControl (instead of devserver) as-is for backward compatibility testing -->
 		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.7.0-dev.417" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.7.0-dev.417" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.11" />

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/RemoteControl/RemoteControlGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/RemoteControl/RemoteControlGenerator.cs
@@ -94,7 +94,7 @@ private static void BuildGeneratedFileHeader(IndentedStringBuilder sb)
 		{
 			sb.AppendLineIndented("// <auto-generated>");
 			sb.AppendLineIndented("// ***************************************************************************************");
-			sb.AppendLineIndented("// This file has been generated by the package Uno.UI.RemoteControl - for Xaml Hot Reload.");
+			sb.AppendLineIndented("// This file has been generated by the package Uno.UI.DevServer - for Xaml Hot Reload.");
 			sb.AppendLineIndented("// Documentation: https://platform.uno/docs/articles/features/working-with-xaml-hot-reload.html");
 			sb.AppendLineIndented("// ***************************************************************************************");
 			sb.AppendLineIndented("// </auto-generated>");

diff --git a/src/Uno.UI.RemoteControl.Messaging/Uno.UI.RemoteControl.Messaging.csproj b/src/Uno.UI.RemoteControl.Messaging/Uno.UI.RemoteControl.Messaging.csproj
@@ -3,8 +3,8 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 
-		<PackageId>Uno.UI.RemoteControl.Messaging</PackageId>
-		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.RemoteControl.Messaging</PackageId>
+		<PackageId>Uno.UI.DevServer.Messaging</PackageId>
+		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer.Messaging</PackageId>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.UI.RemoteControl.Server/Uno.UI.RemoteControl.Server.csproj b/src/Uno.UI.RemoteControl.Server/Uno.UI.RemoteControl.Server.csproj
@@ -25,8 +25,8 @@
 
 	<Target Name="_UnoToolkitOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
 		<PropertyGroup>
-			<_OverridePackageId>Uno.UI.RemoteControl</_OverridePackageId>
-			<_OverridePackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.RemoteControl</_OverridePackageId>
+			<_OverridePackageId>Uno.UI.DevServer</_OverridePackageId>
+			<_OverridePackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</_OverridePackageId>
 
 			<_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE)</_baseNugetPath>
 			<_baseNugetPath Condition="'$(HOME)'!=''">$(HOME)</_baseNugetPath>

diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Reference.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Reference.csproj
@@ -17,8 +17,8 @@
 
 		<Nullable>enable</Nullable>
 
-		<PackageId>Uno.UI.RemoteControl</PackageId>
-		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.RemoteControl</PackageId>
+		<PackageId>Uno.UI.DevServer</PackageId>
+		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>
 
 		<UnoRuntimeIdentifier>Reference</UnoRuntimeIdentifier>
 	</PropertyGroup>
@@ -28,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="buildTransitive\Uno.UI.RemoteControl.targets">
+	  <Content Include="buildTransitive\Uno.UI.DevServer.targets">
 	    <PackagePath>build</PackagePath>
 	    <Pack>true</Pack>
 	  </Content>

diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj
@@ -20,7 +20,7 @@
 		<UnoRuntimeIdentifier>Skia</UnoRuntimeIdentifier>
 		<PlatformItemsBasePath>..\Uno.UI.RemoteControl\</PlatformItemsBasePath>
 
-		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.RemoteControl</PackageId>
+		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj
@@ -20,7 +20,7 @@
 		<UnoRuntimeIdentifier>WebAssembly</UnoRuntimeIdentifier>
 		<PlatformItemsBasePath>..\Uno.UI.RemoteControl\</PlatformItemsBasePath>
 
-		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.RemoteControl</PackageId>
+		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.netcoremobile.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.netcoremobile.csproj
@@ -17,8 +17,8 @@
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
 		<Deterministic>true</Deterministic>
 
-		<PackageId>Uno.UI.RemoteControl</PackageId>
-		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.RemoteControl</PackageId>
+		<PackageId>Uno.UI.DevServer</PackageId>
+		<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -32,7 +32,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Content Include="buildTransitive\Uno.UI.RemoteControl.targets">
+	  <Content Include="buildTransitive\Uno.UI.DevServer.targets">
 	    <PackagePath>build</PackagePath>
 	    <Pack>true</Pack>
 	  </Content>

diff --git a/src/Uno.UI.RemoteControl/buildTransitive/Uno.UI.DevServer.targets b/src/Uno.UI.RemoteControl/buildTransitive/Uno.UI.DevServer.targets
@@ -2,8 +2,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 	<ItemGroup>
-		<UnoRuntimeEnabledPackage Include="Uno.UI.RemoteControl" PackageBasePath="$(MSBuildThisFileDirectory)" Condition="'$(MSBuildThisFile)'=='uno.ui.remotecontrol.targets'" />
-		<UnoRuntimeEnabledPackage Include="Uno.WinUI.RemoteControl"  PackageBasePath="$(MSBuildThisFileDirectory)" Condition="'$(MSBuildThisFile)'=='uno.winui.remotecontrol.targets'"  />
+		<UnoRuntimeEnabledPackage Include="Uno.UI.DevServer" PackageBasePath="$(MSBuildThisFileDirectory)" Condition="'$(MSBuildThisFile)'=='uno.ui.devserver.targets'" />
+		<UnoRuntimeEnabledPackage Include="Uno.WinUI.DevServer"  PackageBasePath="$(MSBuildThisFileDirectory)" Condition="'$(MSBuildThisFile)'=='uno.winui.devserver.targets'"  />
 	</ItemGroup>
 
 	<PropertyGroup>

diff --git a/src/Uno.UI.RuntimeTests/Directory.Build.props b/src/Uno.UI.RuntimeTests/Directory.Build.props
@@ -20,7 +20,7 @@
 		<None Include="Tests\HotReload\Frame\HRApp\**\*.xaml" Exclude="Tests\HotReload\Frame\HRApp\bin\**;Tests\HotReload\Frame\HRApp\obj\**" />
 	</ItemGroup>
 
-	<Target Name="RemoveSample" BeforeTargets="BeforeBuild">
+	<Target Name="RemoveSample" BeforeTargets="BeforeBuild;GetCopyToOutputDirectoryItems">
 
 		<ItemGroup>
 			<Compile Remove="Tests\HotReload\Frame\HRApp\**\*.cs" />

diff --git a/...Uno.UI.RuntimeTests/Tests/HotReload/Frame/HRApp/Uno.UI.RuntimeTests.HRApp.Skia.Gtk.csproj b/...Uno.UI.RuntimeTests/Tests/HotReload/Frame/HRApp/Uno.UI.RuntimeTests.HRApp.Skia.Gtk.csproj
@@ -44,7 +44,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
 		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
 		<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.8.33" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.WinUI.DevServer" Version="4.8.33" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.8.33" />
 		-->
 	</ItemGroup>