From fbab3fe294b8b8f1725c8a9402d262acc230a244 Mon Sep 17 00:00:00 2001
From: Jerome Laban <jerome.laban@nventive.com>
Date: Fri, 14 Apr 2023 21:11:33 -0400
Subject: [PATCH] ci: Adjust remote control target frameworks

---
 build/Uno.UI.Build.csproj                              |  8 ++++----
 build/Uno.WinUI.RemoteControl.nuspec                   |  4 +---
 build/ci/.azure-devops-package-net6-win.yml            |  2 +-
 .../Uno.UI.RemoteControl.Host.csproj                   | 10 ++--------
 .../Uno.UI.RemoteControl.Server.Processors.csproj      |  9 +--------
 .../Uno.UI.RemoteControl.Server.csproj                 |  2 +-
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
index 6979ae0de5..3c31de70d9 100644
--- a/build/Uno.UI.Build.csproj
+++ b/build/Uno.UI.Build.csproj
@@ -180,9 +180,9 @@
 
 	</Target>
 
-	<Target Name="BuildCINet6">
+	<Target Name="BuildCIMobile">
 
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET6_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-netcoremobile;PackageVersion=$(GITVERSION_SemVer)"
+		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-netcoremobile;PackageVersion=$(GITVERSION_SemVer)"
              Projects="..\src\Uno.UI-netcoremobile-only.slnf"
              Targets="Restore;Build"
              RebaseOutputs="false"
@@ -192,7 +192,7 @@
 
 	<Target Name="BuildCIWasm">
 
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-wasm;PackageVersion=$(GITVERSION_SemVer)"
+		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-wasm;PackageVersion=$(GITVERSION_SemVer)"
              Projects="filters\Uno.UI-packages-wasm.slnf"
              Targets="Restore;Build"
              RebaseOutputs="false"
@@ -202,7 +202,7 @@
 
 	<Target Name="BuildCISkia">
 
-		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
+		<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
              Projects="filters\Uno.UI-packages-skia.slnf"
              Targets="Restore;Build"
              RebaseOutputs="false"
diff --git a/build/Uno.WinUI.RemoteControl.nuspec b/build/Uno.WinUI.RemoteControl.nuspec
index ff47cb01bc..9b71fedae5 100644
--- a/build/Uno.WinUI.RemoteControl.nuspec
+++ b/build/Uno.WinUI.RemoteControl.nuspec
@@ -167,8 +167,6 @@
 		<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.netcoremobile\Release\net7.0-macos\Uno.UI.RemoteControl.pdb" target="lib\net7.0-macos" />
 
 		<!-- Processors -->
-		<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\*.dll" target="tools\rc\processors\netcoreapp3.1" />
-		<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\*.pdb" target="tools\rc\processors\netcoreapp3.1" />
 		<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net8.0\*.dll" target="tools\rc\processors\net8.0" />
 		<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net8.0\*.pdb" target="tools\rc\processors\net8.0" />
 		<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net7.0\*.dll" target="tools\rc\processors\net7.0" />
@@ -193,9 +191,9 @@
 		<file src="..\src\Uno.UI.RemoteControl\Bin\Uno.UI.RemoteControl.Skia\Release\net7.0\Uno.UI.RemoteControl.*" target="uno-runtime\net7.0\skia" />
 
 		<!-- Remote Control host and integration -->
-		<file src="..\src\Uno.UI.RemoteControl.Host\bin\Release\netcoreapp3.1\*.*" target="tools\rc\host\netcoreapp3.1" />
 		<file src="..\src\Uno.UI.RemoteControl.Host\bin\Release\net8.0\*.*" target="tools\rc\host\net8.0" />
 		<file src="..\src\Uno.UI.RemoteControl.Host\bin\Release\net7.0\*.*" target="tools\rc\host\net7.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" />
diff --git a/build/ci/.azure-devops-package-net6-win.yml b/build/ci/.azure-devops-package-net6-win.yml
index 2bde277100..3a632b3cd0 100644
--- a/build/ci/.azure-devops-package-net6-win.yml
+++ b/build/ci/.azure-devops-package-net6-win.yml
@@ -91,7 +91,7 @@ jobs:
   - task: DotNetCoreCLI@2
     inputs:
       workingDirectory: Build
-      arguments: Uno.UI.Build.csproj /r /m /t:BuildCINet6 "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-netcoremobile-$(ZipFileTargetFramework)-$(XAML_FLAVOR_BUILD).binlog
+      arguments: Uno.UI.Build.csproj /r /m /t:BuildCIMobile "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-netcoremobile-$(ZipFileTargetFramework)-$(XAML_FLAVOR_BUILD).binlog
     displayName: Building package binaries
 
   - task: MSBuild@1
diff --git a/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj b/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj
index 55fd98c19d..d0ee53f31a 100644
--- a/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj
+++ b/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj
@@ -1,19 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<RollForward>Major</RollForward>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(CI_Build)'=='true' or '$(TF_BUILD)' == 'true'">
-		<TargetFrameworks Condition="'$(IS_NET6_BUILD)'=='' and '$(IS_NET7_BUILD)'==''">netcoreapp3.1</TargetFrameworks>
-		<TargetFrameworks Condition="'$(IS_NET6_BUILD)'=='true'">net6.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(IS_NET7_BUILD)'=='true'">net6.0;net7.0</TargetFrameworks>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Mono.Options" Version="6.6.0.161" />
 		<PackageReference Include="Newtonsoft.Json" />
diff --git a/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj b/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj
index 027ec2402f..4986025b26 100644
--- a/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj
+++ b/src/Uno.UI.RemoteControl.Server.Processors/Uno.UI.RemoteControl.Server.Processors.csproj
@@ -1,18 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
-
-	<PropertyGroup Condition="'$(CI_Build)'=='true' or '$(TF_BUILD)' == 'true'">
-		<TargetFrameworks Condition="'$(IS_NET6_BUILD)'=='' and '$(IS_NET7_BUILD)'==''">netcoreapp3.1</TargetFrameworks>
-		<TargetFrameworks Condition="'$(IS_NET6_BUILD)'=='true'">net6.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(IS_NET7_BUILD)'=='true'">net6.0;net7.0</TargetFrameworks>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<Compile Include="..\Uno.UI.RemoteControl\HotReload\Messages\**\*.cs" Link="HotReload/Messages/%(Filename)" />
 	</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
index 11a0702d32..a96abba782 100644
--- a/src/Uno.UI.RemoteControl.Server/Uno.UI.RemoteControl.Server.csproj
+++ b/src/Uno.UI.RemoteControl.Server/Uno.UI.RemoteControl.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>