Merge pull request unoplatform#18513 from unoplatform/dev/jela/devser…

…ver-update chore: Add support for uno settings
ajpinedam · Oct 18, 2024 · 507b19f · 507b19f
2 parents 639c987 + d60f4c0
commit 507b19f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 0 deletions.
diff --git a/src/Uno.Sdk/Sdk/Sdk.props.buildschema.json b/src/Uno.Sdk/Sdk/Sdk.props.buildschema.json
@@ -230,6 +230,10 @@
 			"description": "Provides an explicit override for the version of Uno.Sdk.Extras to use.",
 			"type": "nuget-version"
 		},
+		"UnoSettingsVersion": {
+			"description": "Provides an explicit override for the version of Uno.Settings to use.",
+			"type": "nuget-version"
+		},
 		"MicrosoftLoggingVersion": {
 			"description": "Provides an explicit override for the version of Microsoft.Extensions.Logging to use.",
 			"type": "nuget-version"

diff --git a/src/Uno.Sdk/Services/PackageManifest.cs b/src/Uno.Sdk/Services/PackageManifest.cs
@@ -137,6 +137,7 @@ public class Group
 		public const string Dsp = nameof(Dsp);
 		public const string Resizetizer = nameof(Resizetizer);
 		public const string SdkExtras = nameof(SdkExtras);
+		public const string Settings = nameof(Settings);
 		public const string SkiaSharp = nameof(SkiaSharp);
 		public const string SvgSkia = nameof(SvgSkia);
 		public const string WinAppSdk = nameof(WinAppSdk);

diff --git a/src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs b/src/Uno.Sdk/Tasks/ImplicitPackagesResolver.cs
@@ -83,6 +83,8 @@ public sealed class ImplicitPackagesResolver_v0 : Task
 
 	public string? UnoSdkExtrasVersion { get; set; }
 
+	public string? UnoSettingsVersion { get; set; }
+
 	public string? MicrosoftLoggingVersion { get; set; }
 
 	public string? WinAppSdkVersion { get; set; }
@@ -243,6 +245,7 @@ private void SetupRuntimePackageManifestUpdates(PackageManifest manifest)
 			.UpdateManifest(PackageManifest.Group.Dsp, UnoDspTasksVersion)
 			.UpdateManifest(PackageManifest.Group.Resizetizer, UnoSdkExtrasVersion)
 			.UpdateManifest(PackageManifest.Group.SdkExtras, UnoResizetizerVersion)
+			.UpdateManifest(PackageManifest.Group.Settings, UnoSettingsVersion)
 			.UpdateManifest(PackageManifest.Group.SkiaSharp, SkiaSharpVersion)
 			.UpdateManifest(PackageManifest.Group.SvgSkia, SvgSkiaVersion)
 			.UpdateManifest(PackageManifest.Group.WinAppSdk, WinAppSdkVersion)

diff --git a/src/Uno.Sdk/packages.json b/src/Uno.Sdk/packages.json
@@ -78,6 +78,13 @@
 			"Uno.Sdk.Extras"
 	  ]
 	},
+	{
+		"group": "settings",
+		"version": "0.1.0-dev.144",
+		"packages": [
+			"Uno.Settings.DevServer"
+		]
+	},
 	{
 	  "group": "SkiaSharp",
 	  "version": "2.88.8",

diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.ProjectSystem.targets
@@ -8,6 +8,7 @@
 		<_UnoProjectSystemPackageReference Include="Uno.WinUI" ProjectSystem="true" />
 		<_UnoProjectSystemPackageReference Include="Uno.Resizetizer" ProjectSystem="true" PrivateAssets="all" />
 		<_UnoProjectSystemPackageReference Include="Uno.Sdk.Extras" ProjectSystem="true" PrivateAssets="all" />
+		<_UnoProjectSystemPackageReference Include="Uno.Settings.DevServer" ProjectSystem="true" PrivateAssets="all" />
 	</ItemGroup>
 
 	<ItemGroup Condition=" '$(_ImplicitRestoreOutputType)' == 'WinExe' OR '$(_ImplicitRestoreOutputType)' == 'Exe' ">

diff --git a/src/Uno.Sdk/targets/Uno.Implicit.Packages.targets b/src/Uno.Sdk/targets/Uno.Implicit.Packages.targets
@@ -62,6 +62,7 @@
 				AndroidXSwipeRefreshLayoutVersion="@(AndroidXSwipeRefreshLayoutVersion)"
 				UnoResizetizerVersion="$(UnoResizetizerVersion)"
 				UnoSdkExtrasVersion="$(UnoSdkExtrasVersion)"
+				UnoSettingsVersion="$(UnoSettingsVersion)"
 				MicrosoftLoggingVersion="$(MicrosoftLoggingVersion)"
 				WinAppSdkVersion="$(WinAppSdkVersion)"
 				WinAppSdkBuildToolsVersion="$(WinAppSdkBuildToolsVersion)"

diff --git a/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj b/src/Uno.UI.RemoteControl.Host/Uno.UI.RemoteControl.Host.csproj
@@ -20,6 +20,7 @@
 		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
 		<PackageReference Include="StreamJsonRpc" Version="2.14.24" />
+		<PackageReference Include="MessagePack" Version="2.5.187" />
 
 		<!-- StreamJsonRpc 2.14.24 brings in Microsoft.VisualStudio.Threading (and in turn -->
 		<!-- Microsoft.VisualStudio.Threading.Analyzers) version 17.1.46 -->

diff --git a/src/Uno.UI.RemoteControl.VS/Uno.UI.RemoteControl.VS.csproj b/src/Uno.UI.RemoteControl.VS/Uno.UI.RemoteControl.VS.csproj
@@ -32,6 +32,7 @@
 		<PackageReference Include="NuGet.VisualStudio" version="4.5.0" />
 		<PackageReference Include="Microsoft.VisualStudio.ProjectSystem" Version="17.0.1313-pre" />
 		<PackageReference Include="StreamJsonRpc" Version="2.14.24" />
+		<PackageReference Include="MessagePack" Version="2.5.187" />
 		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
 		<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30" />
 		<PackageReference Include="PolySharp" Version="1.14.1">