From ab078ef3804450989ff70b72e1311b825d221b0e Mon Sep 17 00:00:00 2001 From: TenEniunlsl Date: Sat, 18 Oct 2025 04:43:25 +0200 Subject: [PATCH 1/6] Changes to run it on Windows 10 with WSL (Ubuntu) --- Directory.Build.Override.props | 2 +- Directory.Build.props | 2 +- Microsoft.Maui.Gtk.slnf | 3 +++ NuGet.config | 1 + ....AspNetCore.Components.WebView.Maui.csproj | 2 +- .../Maui.Controls.Sample.csproj | 4 +-- .../Properties/launchSettings.json | 8 ++++++ src/Core/src/Core.csproj | 27 ++++--------------- src/Essentials/src/Essentials.csproj | 4 +++ .../src/Graphics.Gtk/Graphics.Gtk.csproj | 9 +++++-- 10 files changed, 33 insertions(+), 29 deletions(-) diff --git a/Directory.Build.Override.props b/Directory.Build.Override.props index 3ec3a76eb25b..8115232d291d 100644 --- a/Directory.Build.Override.props +++ b/Directory.Build.Override.props @@ -7,7 +7,7 @@ <_IncludeWindows> <_IncludeTizen> <_IncludeGtk>true - <_IncludeAndroid>true + <_IncludeAndroid>false <_IncludeIos> <_IncludeMacCatalyst> <_IncludeMacOS> diff --git a/Directory.Build.props b/Directory.Build.props index 7abf80742891..24c2612b10d4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -148,7 +148,7 @@ <_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).buildtasks\ <_MauiAOTProfileLocation>$(MauiSrcDirectory)Controls\src\Build.Tasks\nuget\buildTransitive\netstandard2.0\ $(MauiRootDirectory)eng/microsoft.maui.controls.snk - true + false portable true true diff --git a/Microsoft.Maui.Gtk.slnf b/Microsoft.Maui.Gtk.slnf index a45a8f95510c..cad95068ccad 100644 --- a/Microsoft.Maui.Gtk.slnf +++ b/Microsoft.Maui.Gtk.slnf @@ -8,11 +8,14 @@ "src\\BlazorWebView\\src\\Gtk\\Microsoft.AspNetCore.Components.WebView.Gtk.csproj", "src\\BlazorWebView\\src\\Maui\\Microsoft.AspNetCore.Components.WebView.Maui.csproj", "src\\Compatibility\\Core\\src\\Compatibility.csproj", + "src\\Controls\\Foldable\\src\\Controls.Foldable.csproj", + "src\\Controls\\Maps\\src\\Controls.Maps.csproj", "src\\Controls\\samples\\Controls.Sample.Gtk\\Controls.Sample.Gtk.csproj", "src\\Controls\\samples\\Controls.Sample\\Maui.Controls.Sample.csproj", "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj", "src\\Controls\\src\\Core\\Controls.Core.csproj", "src\\Controls\\src\\Xaml\\Controls.Xaml.csproj", + "src\\Core\\maps\\src\\Maps.csproj", "src\\Core\\src\\Core.csproj", "src\\Essentials\\src\\Essentials.csproj", "src\\Graphics\\samples\\GraphicsTester.Gtk\\GraphicsTester.Gtk.csproj", diff --git a/NuGet.config b/NuGet.config index 7c8de06d63f3..162462bb9a2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj index 533fa5eee4a4..df1a37e1179b 100644 --- a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj +++ b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj @@ -1,7 +1,7 @@  - $(_MauiDotNetTfm);$(MauiPlatforms) + $(_MauiDotNetTfm) enable $(DefineConstants);WEBVIEW2_MAUI true diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index ff72f827a19f..002574b84d4f 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -51,12 +51,12 @@ - + diff --git a/src/Controls/samples/Controls.Sample/Properties/launchSettings.json b/src/Controls/samples/Controls.Sample/Properties/launchSettings.json index af97d49d1598..30f0afacb90c 100644 --- a/src/Controls/samples/Controls.Sample/Properties/launchSettings.json +++ b/src/Controls/samples/Controls.Sample/Properties/launchSettings.json @@ -3,6 +3,14 @@ "Windows Machine": { "commandName": "MsixPackage", "nativeDebugging": true + }, + "WSL": { + "commandName": "WSL2", + "distributionName": "", + "environmentVariables": { + "DISPLAY": "127.0.0.1:0.0", + "DOTNET_ENVIRONMENT": "Development" + } } } } \ No newline at end of file diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj index 275496ee8471..df9eed1e3f28 100644 --- a/src/Core/src/Core.csproj +++ b/src/Core/src/Core.csproj @@ -26,6 +26,7 @@ + @@ -75,32 +76,14 @@ - + <_ValuesToReplace Include="VERSION" PropertyName="PackageReferenceVersion" /> - - + + - + diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj index d04dc47706b1..c53843b9118b 100644 --- a/src/Essentials/src/Essentials.csproj +++ b/src/Essentials/src/Essentials.csproj @@ -70,6 +70,10 @@ + + + + - 8.0.0 + 9.0.0 3.3.4 3.3.4 4.5.0 diff --git a/src/Controls/samples/Controls.Sample.Gtk/Properties/launchSettings.json b/src/Controls/samples/Controls.Sample.Gtk/Properties/launchSettings.json new file mode 100644 index 000000000000..322b624761c8 --- /dev/null +++ b/src/Controls/samples/Controls.Sample.Gtk/Properties/launchSettings.json @@ -0,0 +1,11 @@ +{ + "profiles": { + "Controls.Sample.Gtk": { + "commandName": "Project" + }, + "WSL": { + "commandName": "WSL2", + "distributionName": "" + } + } +} \ No newline at end of file diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 002574b84d4f..2d9c0d669d3c 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -39,16 +39,16 @@ - - + + - - - + + +