Merge pull request #21955 from unoplatform/dev/dr/hrInfo2

Restore add of HR info to avoid roslyn bug

Author: dr1rrb

src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets

@@ -20,13 +20,15 @@
 	<UsingTask Condition="'$(_IsUnoUISolution)'==''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.Assets.RetargetAssets_v0" />
 	<UsingTask Condition="'$(_IsUnoUISolution)'==''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.RuntimeAssetsSelector.RuntimeAssetsSelectorTask_v0" />
 	<UsingTask Condition="'$(_IsUnoUISolution)'==''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.RuntimeAssetsValidator.RuntimeAssetsValidatorTask_v0" />
+	<UsingTask Condition="'$(_IsUnoUISolution)'==''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.HotReloadInfo.HotReloadInfoTask_v0" />
 
 	<UsingTask Condition="'$(_IsUnoUISolution)'!=''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.ResourcesGenerator.ResourcesGenerationTask_v0" TaskFactory="TaskHostFactory"/>
 	<UsingTask Condition="'$(_IsUnoUISolution)'!=''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.ResourcesGenerator.UpriFeaturesGeneratorTask_v0" TaskFactory="TaskHostFactory"/>
 	<UsingTask Condition="'$(_IsUnoUISolution)'!=''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.ResourcesGenerator.UpriSubstitutionsGeneratorTask_v0" TaskFactory="TaskHostFactory" />
 	<UsingTask Condition="'$(_IsUnoUISolution)'!=''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.Assets.RetargetAssets_v0" TaskFactory="TaskHostFactory" />
 	<UsingTask Condition="'$(_IsUnoUISolution)'!=''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.RuntimeAssetsSelector.RuntimeAssetsSelectorTask_v0" TaskFactory="TaskHostFactory" />
 	<UsingTask Condition="'$(_IsUnoUISolution)'!=''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.RuntimeAssetsValidator.RuntimeAssetsValidatorTask_v0" TaskFactory="TaskHostFactory" />
+	<UsingTask Condition="'$(_IsUnoUISolution)'!=''" AssemblyFile="$(UnoUIMSBuildTasksPath)\Uno.UI.Tasks.v0.dll" TaskName="Uno.UI.Tasks.HotReloadInfo.HotReloadInfoTask_v0" TaskFactory="TaskHostFactory" />
 
 	<Target Name="_UnoLangSetup">
 		<!-- String resources -->
@@ -405,14 +407,11 @@
 			   Condition="'$(_UnoWasmBootstrapVersionString)'!='' and '$(_UnoWasmBootstrapVersionString.Split(`-`)[0])'&lt;'3.0'"/>
 	</Target>
 
-	<!--
-    Warn when the task is executed in devenv.exe: https://github.com/dotnet/project-system/issues/4494
-    -->
-
+	<!-- Warn when the task is executed in devenv.exe: https://github.com/dotnet/project-system/issues/4494 -->
 	<UsingTask
-  TaskName="CheckForDevenv"
-  TaskFactory="CodeTaskFactory"
-  AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
+		TaskName="CheckForDevenv"
+		TaskFactory="CodeTaskFactory"
+		AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
 		<ParameterGroup />
 		<Task>
 			<Reference Include="System.Xml"/>
@@ -429,4 +428,21 @@
 		</Task>
 	</UsingTask>
 
+	<Target
+		Name="_GenerateHotReloadInfo"
+		BeforeTargets="BeforeCompile"
+		Condition="'$(UnoGenerateHotReloadInfo)' == 'True'">
+
+		<HotReloadInfoTask_v0
+			IntermediateOutputPath="$(IntermediateOutputPath)">
+			<Output
+				TaskParameter="GeneratedFiles"
+				ItemName="_HotReloadInfoTaskGeneratedFiles" />
+		</HotReloadInfoTask_v0>
+
+		<ItemGroup>
+			<Compile Include="@(_HotReloadInfoTaskGeneratedFiles)" />
+		</ItemGroup>
+	</Target>
+
 </Project>

src/SourceGenerators/Uno.UI.Tasks/HotReloadInfo/HotReloadInfoTask.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Text;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Uno.UI.Tasks.HotReloadInfo;
+
+public class HotReloadInfoTask_v0 : Microsoft.Build.Utilities.Task
+{
+	[Required]
+	public string IntermediateOutputPath { get; set; }
+
+	[Output]
+	public ITaskItem[] GeneratedFiles { get; set; }
+
+	/// <inheritdoc />
+	public override bool Execute()
+	{
+		var attributePath = Path.Combine(IntermediateOutputPath, "uno.hot-reload.info", "HotReloadInfo.Attribute.g.cs");
+		var infoPath = Path.Combine(IntermediateOutputPath, "uno.hot-reload.info", "HotReloadInfo.g.cs");
+
+		Log.LogMessage($"Generating hot-reload info to : {infoPath}");
+
+		try
+		{
+			Directory.CreateDirectory(Path.Combine(IntermediateOutputPath, "uno.hot-reload.info"));
+
+			Write(attributePath, HotReloadInfoHelper.GenerateAttribute(infoPath));
+			Write(infoPath, HotReloadInfoHelper.GenerateInfo());
+
+			GeneratedFiles =
+			[
+				new TaskItem(attributePath, new Dictionary<string, string>
+				{
+					{ "Generator", "Uno.UI.Tasks.HotReloadInfo" },
+					{ "GeneratorVersion", typeof(HotReloadInfoTask_v0).Assembly.GetName().Version.ToString() }
+				}),
+				new TaskItem(infoPath, new Dictionary<string, string>
+				{
+					{ "Generator", "Uno.UI.Tasks.HotReloadInfo" },
+					{ "GeneratorVersion", typeof(HotReloadInfoTask_v0).Assembly.GetName().Version.ToString() }
+				})
+			];
+
+			return true;
+		}
+		catch (Exception ex)
+		{
+			Log.LogError($"Failed to generate hot-reload info. Details: {ex.Message}");
+		}
+
+		return false;
+	}
+
+	private void Write(string path, string content)
+	{
+		using var stream = File.Open(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.Read);
+
+		// First we validate if the content is the same, if so, we don't even touch the file (to avoid unnecessary rebuilds)
+		using (var reader = new StreamReader(stream, Encoding.UTF8, true, 4096, leaveOpen: true))
+		{
+			if (content.Equals(reader.ReadToEnd()))
+			{
+				return;
+			}
+		}
+
+		// Rewrite the content ... from the beginning!
+		stream.SetLength(0);
+		stream.Position = 0;
+
+		using var writer = new StreamWriter(stream, Encoding.UTF8, 4096, leaveOpen: true);
+		writer.Write(content);
+		writer.Flush();
+	}
+}

src/SourceGenerators/Uno.UI.Tasks/Uno.UI.Tasks.csproj

@@ -33,6 +33,7 @@
 			<Link>Resources\AndroidResourceNameEncoder.cs</Link>
 		</Compile>
 		<Compile Include="..\Uno.UI.SourceGenerators\BindableTypeProviders\LinkerHintsHelpers.cs" Link="Helpers\LinkerHintsHelpers.cs" />
+		<Compile Include="..\..\Uno.UI.RemoteControl\HotReload\HotReloadInfoHelper.cs" Link="HotReloadInfo/%(Filename)%(Extension)" />
 	</ItemGroup>
 
 	<Target Name="_copyUnoTasksBuildTime" AfterTargets="Build">

src/Uno.UI.RemoteControl.Host/IDEChannel/IdeChannelServer.cs

@@ -51,8 +51,11 @@ public IdeChannelServer(ILogger<IdeChannelServer> logger, IOptionsMonitor<IdeCha
 	/// <inheritdoc />
 	public event EventHandler<IdeMessage>? MessageFromIde;
 
-	/// <inheritdoc />
 	async Task IIdeChannel.SendToIdeAsync(IdeMessage message, CancellationToken ct)
+		=> await ((IIdeChannel)this).TrySendToIdeAsync(message, ct);
+
+	/// <inheritdoc />
+	async Task<bool> IIdeChannel.TrySendToIdeAsync(IdeMessage message, CancellationToken ct)
 	{
 		await WaitForReady(ct);
 
@@ -61,16 +64,17 @@ async Task IIdeChannel.SendToIdeAsync(IdeMessage message, CancellationToken ct)
 			this.Log().LogInformation(
 				"Received a message {MessageType} to send to the IDE, but there is no connection available for that.",
 				message.Scope);
+
+			return false;
 		}
 		else
 		{
 			_proxy.SendToIde(message);
 			ScheduleKeepAlive();
-		}
 
-		await Task.Yield();
+			return true;
+		}
 	}
-
 	#endregion
 
 	/// <inheritdoc />

src/Uno.UI.RemoteControl.Host/RemoteControlServer.cs

@@ -647,8 +647,11 @@ await WebSocketHelper.SendFrame(
 		}
 	}
 
-	public Task SendMessageToIDEAsync(IdeMessage message)
-		=> _ideChannel.SendToIdeAsync(message, default);
+	async Task IRemoteControlServer.SendMessageToIDEAsync(IdeMessage message)
+		=> await TrySendMessageToIDEAsync(message, CancellationToken.None);
+
+	public Task<bool> TrySendMessageToIDEAsync(IdeMessage message, CancellationToken ct)
+		=> _ideChannel.TrySendToIdeAsync(message, ct);
 
 	public void Dispose()
 	{

src/Uno.UI.RemoteControl.Messaging/IRemoteControlServer.cs

@@ -1,4 +1,6 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading;
+using System.Threading.Tasks;
 using Uno.UI.RemoteControl.Messaging.IdeChannel;
 
 namespace Uno.UI.RemoteControl.Host
@@ -9,6 +11,19 @@ public interface IRemoteControlServer
 
 		Task SendFrame(IMessage message);
 
+		/// <summary>
+		/// DO NOT USE, prefer the TrySendMessageToIDEAsync
+		/// </summary>
 		Task SendMessageToIDEAsync(IdeMessage message);
+
+		/// <summary>
+		/// Attempt to send a message to the IDE, if any connection is established.
+		/// </summary>
+		/// <param name="message">The message to send to the IDE.</param>
+		/// <returns>
+		/// An asynchronous boolean indicating if the message has been sent to the IDE or not.
+		/// WARNING: This does NOT indicate that the IDE has processed the message, only that an IDE is listening for messages.
+		/// </returns>
+		Task<bool> TrySendMessageToIDEAsync(IdeMessage message, CancellationToken ct);
 	}
 }

src/Uno.UI.RemoteControl.Messaging/IdeChannel/IIdeChannelServer.cs

@@ -49,11 +49,20 @@ public interface IIdeChannel
 		event EventHandler<IdeMessage>? MessageFromIde;
 
 		/// <summary>
+		/// DO NOT USE - Prefer the TrySendToIdeAsync instead
 		/// Sends a message to the IDE.
 		/// </summary>
 		/// <param name="message">The message to send to the IDE.</param>
 		/// <param name="ct">CancellationToken to cancel the async operation.</param>
 		/// <returns>An async operation representing the fact that the message has been sent to the IDE (does not include any form of processing by IDE).</returns>
 		Task SendToIdeAsync(IdeMessage message, CancellationToken ct);
+
+		/// <summary>
+		/// Sends a message to the IDE.
+		/// </summary>
+		/// <param name="message">The message to send to the IDE.</param>
+		/// <param name="ct">CancellationToken to cancel the async operation.</param>
+		/// <returns>An async bool representing the fact that the message has been sent to the IDE or not (does not include any form of processing by IDE).</returns>
+		Task<bool> TrySendToIdeAsync(IdeMessage message, CancellationToken ct);
 	}
 }