From 98975efcc763c5687ce5e8b83b3b225809265cdb Mon Sep 17 00:00:00 2001 From: webwarrior Date: Tue, 3 Dec 2024 12:24:24 +0100 Subject: [PATCH] Rename packages to MauiLinux.* Rename Microsoft.Maui.* packages to MauiLinux.* so they can be published on nuget.org. Add notice about it being fork of MAUI in package descriptions. --- ...t.AspNetCore.Components.WebView.Gtk.csproj | 1 + ....AspNetCore.Components.WebView.Maui.csproj | 4 ++-- ...Linux.AspNetCore.Components.WebView.props} | 0 ...nux.AspNetCore.Components.WebView.targets} | 0 .../Core/src/Compatibility.csproj | 4 ++-- .../Maui.Controls.Sample.csproj | 4 ++-- .../Build.Tasks/Controls.Build.Tasks.csproj | 6 ++--- src/Controls/src/Core/Controls.Core.csproj | 4 ++-- src/Controls/src/Xaml/Controls.Xaml.csproj | 4 ++-- src/Core/src/Core.csproj | 24 +++++++++---------- ...r.targets => MauiLinux.Core.After.targets} | 2 +- ....targets => MauiLinux.Core.Before.targets} | 0 ...MauiLinux.Core.BundledVersions.in.targets} | 2 +- ...t.Maui.Core.props => MauiLinux.Core.props} | 0 ...ui.Core.targets => MauiLinux.Core.targets} | 2 +- ...t.Maui.Core.props => MauiLinux.Core.props} | 2 +- .../MauiLinux.Core.targets | 5 ++++ .../Microsoft.Maui.Core.targets | 5 ---- src/Essentials/src/Essentials.csproj | 4 ++-- .../src/Graphics.Gtk/Graphics.Gtk.csproj | 1 + .../Graphics.Skia.GtkSharp.csproj | 1 + .../src/Graphics.Skia/Graphics.Skia.csproj | 4 ++-- src/Graphics/src/Graphics/Graphics.csproj | 4 ++-- .../Text.Markdig/Graphics.Text.Markdig.csproj | 4 ++-- src/Maui.InTree.props | 2 +- src/Maui.InTree.targets | 4 ++-- .../Resizetizer/src/Resizetizer.csproj | 4 ++-- 27 files changed, 50 insertions(+), 47 deletions(-) rename src/BlazorWebView/src/Maui/build/{Microsoft.AspNetCore.Components.WebView.Maui.props => MauiLinux.AspNetCore.Components.WebView.props} (100%) rename src/BlazorWebView/src/Maui/build/{Microsoft.AspNetCore.Components.WebView.Maui.targets => MauiLinux.AspNetCore.Components.WebView.targets} (100%) rename src/Core/src/nuget/buildTransitive/{Microsoft.Maui.Core.After.targets => MauiLinux.Core.After.targets} (90%) rename src/Core/src/nuget/buildTransitive/{Microsoft.Maui.Core.Before.targets => MauiLinux.Core.Before.targets} (100%) rename src/Core/src/nuget/buildTransitive/{Microsoft.Maui.Core.BundledVersions.in.targets => MauiLinux.Core.BundledVersions.in.targets} (67%) rename src/Core/src/nuget/buildTransitive/{Microsoft.Maui.Core.props => MauiLinux.Core.props} (100%) rename src/Core/src/nuget/buildTransitive/{Microsoft.Maui.Core.targets => MauiLinux.Core.targets} (78%) rename src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/{Microsoft.Maui.Core.props => MauiLinux.Core.props} (85%) create mode 100644 src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/MauiLinux.Core.targets delete mode 100644 src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.targets diff --git a/src/BlazorWebView/src/Gtk/Microsoft.AspNetCore.Components.WebView.Gtk.csproj b/src/BlazorWebView/src/Gtk/Microsoft.AspNetCore.Components.WebView.Gtk.csproj index 4eb5a4f3417e..28b216fdf2b5 100644 --- a/src/BlazorWebView/src/Gtk/Microsoft.AspNetCore.Components.WebView.Gtk.csproj +++ b/src/BlazorWebView/src/Gtk/Microsoft.AspNetCore.Components.WebView.Gtk.csproj @@ -4,6 +4,7 @@ $(_MauiDotNetTfm)-gtk 3.24 Build Gtk applications with Blazor and WebKit + MauiLinux.AspNetCore.Components.WebView.Gtk $(DefineConstants);WEBKIT_GTK enable true 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 018faf01004f..5465a685f2bb 100644 --- a/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj +++ b/src/BlazorWebView/src/Maui/Microsoft.AspNetCore.Components.WebView.Maui.csproj @@ -10,10 +10,10 @@ true - Microsoft.AspNetCore.Components.WebView.Maui + MauiLinux.AspNetCore.Components.WebView $(DefaultPackageTags);blazor;webview;aspnet $(MauiRootDirectory)Assets\aspnet-icon.png - Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control. + (MauiLinux is a fork of MAUI) Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control. diff --git a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.props b/src/BlazorWebView/src/Maui/build/MauiLinux.AspNetCore.Components.WebView.props similarity index 100% rename from src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.props rename to src/BlazorWebView/src/Maui/build/MauiLinux.AspNetCore.Components.WebView.props diff --git a/src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets b/src/BlazorWebView/src/Maui/build/MauiLinux.AspNetCore.Components.WebView.targets similarity index 100% rename from src/BlazorWebView/src/Maui/build/Microsoft.AspNetCore.Components.WebView.Maui.targets rename to src/BlazorWebView/src/Maui/build/MauiLinux.AspNetCore.Components.WebView.targets diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj index 87b7e03894ac..6c9b3cdd3f10 100644 --- a/src/Compatibility/Core/src/Compatibility.csproj +++ b/src/Compatibility/Core/src/Compatibility.csproj @@ -24,9 +24,9 @@ True - Microsoft.Maui.Controls.Compatibility + MauiLinux.Controls.Compatibility $(DefaultPackageTags);compatibility;xamarin.forms;migration - Compatibility APIs and objects for .NET Multi-platform App UI (.NET MAUI) apps. This package contains a collection of APIs and views that allow for easier migration from Xamarin.Forms. + (MauiLinux is a fork of MAUI) Compatibility APIs and objects for .NET Multi-platform App UI (.NET MAUI) apps. This package contains a collection of APIs and views that allow for easier migration from Xamarin.Forms. diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 80a8fdcad902..28ac6c681fbf 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -1,6 +1,6 @@  - + $(MauiPlatforms);$(_MauiDotNetTfm) @@ -93,7 +93,7 @@ - + diff --git a/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj b/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj index 40208fc58df5..0496eee638d9 100644 --- a/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj +++ b/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj @@ -1,7 +1,7 @@ - Microsoft.Maui.Controls.Build.Tasks + MauiLinux.Controls.Build.Tasks Microsoft.Maui.Controls.Build.Tasks Microsoft.Maui.Controls.Build.Tasks netstandard2.0 @@ -18,8 +18,8 @@ true - Microsoft.Maui.Controls.Build.Tasks - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the MSBuild tasks and other tooling. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. + MauiLinux.Controls.Build.Tasks + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the MSBuild tasks and other tooling. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj index d097f01da636..65b2181467d9 100644 --- a/src/Controls/src/Core/Controls.Core.csproj +++ b/src/Controls/src/Core/Controls.Core.csproj @@ -17,8 +17,8 @@ true - Microsoft.Maui.Controls.Core - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the core C# and XAML objects used by .NET MAUI. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. + MauiLinux.Controls.Core + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the core C# and XAML objects used by .NET MAUI. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. diff --git a/src/Controls/src/Xaml/Controls.Xaml.csproj b/src/Controls/src/Xaml/Controls.Xaml.csproj index 58f68a6fb626..47143c8df632 100644 --- a/src/Controls/src/Xaml/Controls.Xaml.csproj +++ b/src/Controls/src/Xaml/Controls.Xaml.csproj @@ -18,8 +18,8 @@ true - Microsoft.Maui.Controls.Xaml - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the XAML tooling. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. + MauiLinux.Controls.Xaml + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the XAML tooling. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj index 14529a12ee3d..c0d91b6b94eb 100644 --- a/src/Core/src/Core.csproj +++ b/src/Core/src/Core.csproj @@ -14,8 +14,8 @@ true - Microsoft.Maui.Core - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the core objects used by .NET MAUI. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. + MauiLinux.Core + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package only contains the core objects used by .NET MAUI. Please install the Microsoft.Maui.Controls package to start using .NET MAUI. @@ -64,7 +64,7 @@ <_CopyItems Include="nuget\buildTransitive\**" Exclude="nuget\**\*.in.*" /> - <_CopyItems Include="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets" /> + <_CopyItems Include="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets" /> @@ -78,30 +78,30 @@ + Inputs="$(MSBuildProjectFile);$(MauiRootDirectory)eng\Versions.props;nuget\buildTransitive\MauiLinux.Core.BundledVersions.in.targets" + Outputs="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets"> <_ValuesToReplace Include="VERSION" PropertyName="PackageReferenceVersion" /> - + diff --git a/src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.After.targets b/src/Core/src/nuget/buildTransitive/MauiLinux.Core.After.targets similarity index 90% rename from src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.After.targets rename to src/Core/src/nuget/buildTransitive/MauiLinux.Core.After.targets index 24c6ace81aec..fb26e3ac3f84 100644 --- a/src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.After.targets +++ b/src/Core/src/nuget/buildTransitive/MauiLinux.Core.After.targets @@ -5,7 +5,7 @@ $(MSBuildWarningsAsMessages);XA4218 - + - + \ No newline at end of file diff --git a/src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.props b/src/Core/src/nuget/buildTransitive/MauiLinux.Core.props similarity index 100% rename from src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.props rename to src/Core/src/nuget/buildTransitive/MauiLinux.Core.props diff --git a/src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.targets b/src/Core/src/nuget/buildTransitive/MauiLinux.Core.targets similarity index 78% rename from src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.targets rename to src/Core/src/nuget/buildTransitive/MauiLinux.Core.targets index 337db9f84f00..9c53d1923938 100644 --- a/src/Core/src/nuget/buildTransitive/Microsoft.Maui.Core.targets +++ b/src/Core/src/nuget/buildTransitive/MauiLinux.Core.targets @@ -4,7 +4,7 @@ true - + $(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.Maui.Core.After.targets diff --git a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.props b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/MauiLinux.Core.props similarity index 85% rename from src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.props rename to src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/MauiLinux.Core.props index 28406ccb7d5e..4e04f8f3af00 100644 --- a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.props +++ b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/MauiLinux.Core.props @@ -7,6 +7,6 @@ false - + \ No newline at end of file diff --git a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/MauiLinux.Core.targets b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/MauiLinux.Core.targets new file mode 100644 index 000000000000..faa754e6ec4a --- /dev/null +++ b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/MauiLinux.Core.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.targets b/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.targets deleted file mode 100644 index 05f86306a1d3..000000000000 --- a/src/Core/src/nuget/buildTransitive/net6.0-windows10.0.17763.0/Microsoft.Maui.Core.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj index 1195c2fec16e..1c0122f1582e 100644 --- a/src/Essentials/src/Essentials.csproj +++ b/src/Essentials/src/Essentials.csproj @@ -14,9 +14,9 @@ true - Microsoft.Maui.Essentials + MauiLinux.Essentials $(DefaultPackageTags);essentials;sensors - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains a collection of cross-platform APIs for working with device sensors and other features. + (MauiLinux is a fork of MAUI).NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains a collection of cross-platform APIs for working with device sensors and other features. diff --git a/src/Graphics/src/Graphics.Gtk/Graphics.Gtk.csproj b/src/Graphics/src/Graphics.Gtk/Graphics.Gtk.csproj index df7c4f66e06f..47fea65241f3 100644 --- a/src/Graphics/src/Graphics.Gtk/Graphics.Gtk.csproj +++ b/src/Graphics/src/Graphics.Gtk/Graphics.Gtk.csproj @@ -3,6 +3,7 @@ netstandard2.1;netstandard2.0;$(_MauiDotNetTfm)-gtk Microsoft.Maui.Graphics.Gtk + MauiLinux.Graphics.Gtk enable diff --git a/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj b/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj index dfd0fe39c5c7..978624207f0e 100644 --- a/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj +++ b/src/Graphics/src/Graphics.Skia.GtkSharp/Graphics.Skia.GtkSharp.csproj @@ -4,6 +4,7 @@ netstandard2.0 Microsoft.Maui.Graphics.Skia Microsoft.Maui.Graphics.Skia.GtkSharp + MauiLinux.Graphics.Skia.GtkSharp false false $(NoWarn);RS0041 diff --git a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj index 2ed804e4de21..d4530f2c6b80 100644 --- a/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj +++ b/src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj @@ -12,9 +12,9 @@ true - Microsoft.Maui.Graphics.Skia + MauiLinux.Graphics.Skia $(DefaultPackageTags);graphics;drawing;skia;skiasharp - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains additional graphics and drawing APIs for using the SkiaSharp graphics engine with .NET MAUI Graphics. + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains additional graphics and drawing APIs for using the SkiaSharp graphics engine with .NET MAUI Graphics. diff --git a/src/Graphics/src/Graphics/Graphics.csproj b/src/Graphics/src/Graphics/Graphics.csproj index ccf351316238..0b88ee670efa 100644 --- a/src/Graphics/src/Graphics/Graphics.csproj +++ b/src/Graphics/src/Graphics/Graphics.csproj @@ -16,9 +16,9 @@ true - Microsoft.Maui.Graphics + MauiLinux.Graphics $(DefaultPackageTags);graphics;drawing - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains a collection of cross-platform graphics and drawing APIs. + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains a collection of cross-platform graphics and drawing APIs. diff --git a/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj b/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj index f59a90f97a52..ebf1062b6640 100644 --- a/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj +++ b/src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj @@ -13,9 +13,9 @@ true - Microsoft.Maui.Graphics.Text.Markdig + MauiLinux.Graphics.Text.Markdig $(DefaultPackageTags);graphics;drawing;markdown;markdig - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains additional APIs to parse and render markdown using the Markdig library. + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains additional APIs to parse and render markdown using the Markdig library. diff --git a/src/Maui.InTree.props b/src/Maui.InTree.props index 0d44d03d3844..797bf4b065a9 100644 --- a/src/Maui.InTree.props +++ b/src/Maui.InTree.props @@ -4,7 +4,7 @@ - + diff --git a/src/Maui.InTree.targets b/src/Maui.InTree.targets index 354f15fd8bc2..260ee49c2b6d 100644 --- a/src/Maui.InTree.targets +++ b/src/Maui.InTree.targets @@ -16,8 +16,8 @@ - - + + diff --git a/src/SingleProject/Resizetizer/src/Resizetizer.csproj b/src/SingleProject/Resizetizer/src/Resizetizer.csproj index 68793f22a382..6013bf442069 100644 --- a/src/SingleProject/Resizetizer/src/Resizetizer.csproj +++ b/src/SingleProject/Resizetizer/src/Resizetizer.csproj @@ -16,8 +16,8 @@ true - Microsoft.Maui.Resizetizer - .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains image, font and raw asset processing tools. + MauiLinux.Resizetizer + (MauiLinux is a fork of MAUI) .NET Multi-platform App UI (.NET MAUI) is a cross-platform framework for creating native mobile and desktop apps with C# and XAML. This package contains image, font and raw asset processing tools.