chore: Adjust hot reload workspace

jeromelaban · jeromelaban · commit 65e32f59f0a2 · 2021-11-28T15:29:33.000-05:00
diff --git a/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.MetadataUpdate.cs b/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.MetadataUpdate.cs
@@ -23,8 +23,6 @@ partial class ClientHotReloadProcessor : IRemoteControlProcessor
 
 		private string[] GetMetadataUpdateCapabilities()
 		{
-#if NET6_0_OR_GREATER || __WASM__ || __SKIA__
-
 			if (Type.GetType("System.Reflection.Metadata.MetadataUpdater") is { } type)
 			{
 				if (type.GetMethod("GetCapabilities", BindingFlags.Static | BindingFlags.NonPublic) is { } getCapabilities)
@@ -52,10 +50,6 @@ private string[] GetMetadataUpdateCapabilities()
 			{
 				throw new NotSupportedException($"Unable to find System.Reflection.Metadata.MetadataUpdater");
 			}
-
-#else
-			return new string[0];
-#endif
 		}
 
 		private void AssemblyReload(AssemblyDeltaReload assemblyDeltaReload)
diff --git a/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.cs b/src/Uno.UI.RemoteControl/HotReload/ClientHotReloadProcessor.cs
@@ -80,5 +80,9 @@ private async Task ConfigureServer()
 
 			await _rcClient.SendMessage(new HotReload.Messages.ConfigureServer(_projectPath, _xamlPaths, GetMetadataUpdateCapabilities()));
 		}
+
+#if !(NET6_0_OR_GREATER || __WASM__ || __SKIA__)
+		private string[] GetMetadataUpdateCapabilities() => Array.Empty<string>();
+#endif
 	}
 }
diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj
@@ -54,7 +54,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="Uno.MonoAnalyzers" />
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
 	</ItemGroup>
 
diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj
@@ -45,7 +45,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="Uno.MonoAnalyzers" />
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
 	</ItemGroup>
 
diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.csproj
@@ -67,7 +67,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="Uno.MonoAnalyzers" />
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
 	</ItemGroup>
 
diff --git a/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.net6.csproj b/src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.net6.csproj
@@ -54,7 +54,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-		<PackageReference Include="Uno.MonoAnalyzers" />
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.2.0" />
 	</ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ partial class ClientHotReloadProcessor : IRemoteControlProcessor`
`23`	`23`
`24`	`24`	`private string[] GetMetadataUpdateCapabilities()`
`25`	`25`	`{`
`26`		`-#if NET6_0_OR_GREATER \|\| __WASM__ \|\| __SKIA__`
`27`		`-`
`28`	`26`	`if (Type.GetType("System.Reflection.Metadata.MetadataUpdater") is { } type)`
`29`	`27`	`{`
`30`	`28`	`if (type.GetMethod("GetCapabilities", BindingFlags.Static \| BindingFlags.NonPublic) is { } getCapabilities)`
`@@ -52,10 +50,6 @@ private string[] GetMetadataUpdateCapabilities()`
`52`	`50`	`{`
`53`	`51`	`throw new NotSupportedException($"Unable to find System.Reflection.Metadata.MetadataUpdater");`
`54`	`52`	`}`
`55`		`-`
`56`		`-#else`
`57`		`- return new string[0];`
`58`		`-#endif`
`59`	`53`	`}`
`60`	`54`
`61`	`55`	`private void AssemblyReload(AssemblyDeltaReload assemblyDeltaReload)`
Original file line number	Diff line number	Diff line change
`@@ -80,5 +80,9 @@ private async Task ConfigureServer()`
`80`	`80`
`81`	`81`	`await _rcClient.SendMessage(new HotReload.Messages.ConfigureServer(_projectPath, _xamlPaths, GetMetadataUpdateCapabilities()));`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+#if !(NET6_0_OR_GREATER \|\| __WASM__ \|\| __SKIA__)`
	`85`	`+ private string[] GetMetadataUpdateCapabilities() => Array.Empty<string>();`
	`86`	`+#endif`
`83`	`87`	`}`
`84`	`88`	`}`