Skip to content

Commit

Permalink
Rename packages to MauiLinux.*
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
webwarrior-ws committed Dec 3, 2024
1 parent 891ecf9 commit 733e516
Show file tree
Hide file tree
Showing 27 changed files with 52 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFrameworks>$(_MauiDotNetTfm)-gtk</TargetFrameworks>
<SupportedOSPlatformVersion>3.24</SupportedOSPlatformVersion>
<Description>Build Gtk applications with Blazor and WebKit</Description>
<PackageId>MauiLinux.AspNetCore.Components.WebView.Gtk</PackageId>
<DefineConstants>$(DefineConstants);WEBKIT_GTK</DefineConstants>
<Nullable>enable</Nullable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.AspNetCore.Components.WebView.Maui</PackageId>
<PackageId>MauiLinux.AspNetCore.Components.WebView</PackageId>
<PackageTags>$(DefaultPackageTags);blazor;webview;aspnet</PackageTags>
<PackageIconFile>$(MauiRootDirectory)Assets\aspnet-icon.png</PackageIconFile>
<Description>Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control.</Description>
<Description>(MauiLinux is a fork of MAUI) Build .NET Multi-platform App UI (.NET MAUI) apps with Blazor web UI in the BlazorWebView control.</Description>
</PropertyGroup>

<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/Core/src/Compatibility.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>True</IsPackable>
<PackageId>Microsoft.Maui.Controls.Compatibility</PackageId>
<PackageId>MauiLinux.Controls.Compatibility</PackageId>
<PackageTags>$(DefaultPackageTags);compatibility;xamarin.forms;migration</PackageTags>
<Description>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.</Description>
<Description>(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.</Description>
</PropertyGroup>

<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\..\BlazorWebView\src\Maui\build\Microsoft.AspNetCore.Components.WebView.Maui.props" />
<Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\..\BlazorWebView\src\Maui\build\MauiLinux.AspNetCore.Components.WebView.props" />

<PropertyGroup>
<TargetFrameworks>$(MauiPlatforms);$(_MauiDotNetTfm)</TargetFrameworks>
Expand Down Expand Up @@ -93,7 +93,7 @@
<Content Remove="Properties\launchSettings.json" />
</ItemGroup>

<Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\..\BlazorWebView\src\Maui\build\Microsoft.AspNetCore.Components.WebView.Maui.targets" />
<Import Condition=" '$(UseMaui)' != 'true' " Project="..\..\..\BlazorWebView\src\Maui\build\MauiLinux.AspNetCore.Components.WebView.targets" />

<Import Project="$(MauiSrcDirectory)Maui.InTree.props" Condition=" '$(UseMaui)' != 'true' " />

Expand Down
6 changes: 3 additions & 3 deletions src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Microsoft.Maui.Controls.Build.Tasks</PackageId>
<PackageId>MauiLinux.Controls.Build.Tasks</PackageId>
<AssemblyName>Microsoft.Maui.Controls.Build.Tasks</AssemblyName>
<RootNamespace>Microsoft.Maui.Controls.Build.Tasks</RootNamespace>
<TargetFramework>netstandard2.0</TargetFramework>
Expand All @@ -18,8 +18,8 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Controls.Build.Tasks</PackageId>
<Description>.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.</Description>
<PackageId>MauiLinux.Controls.Build.Tasks</PackageId>
<Description>(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.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/src/Core/Controls.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Controls.Core</PackageId>
<Description>.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.</Description>
<PackageId>MauiLinux.Controls.Core</PackageId>
<Description>(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.</Description>
</PropertyGroup>

<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/src/Xaml/Controls.Xaml.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Controls.Xaml</PackageId>
<Description>.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.</Description>
<PackageId>MauiLinux.Controls.Xaml</PackageId>
<Description>(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.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down
24 changes: 12 additions & 12 deletions src/Core/src/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Core</PackageId>
<Description>.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.</Description>
<PackageId>MauiLinux.Core</PackageId>
<Description>(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.</Description>
</PropertyGroup>

<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
Expand Down Expand Up @@ -64,7 +64,7 @@
<Target Name="_CopyToBuildTasksDir" AfterTargets="Build">
<ItemGroup>
<_CopyItems Include="nuget\buildTransitive\**" Exclude="nuget\**\*.in.*" />
<_CopyItems Include="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets" />
<_CopyItems Include="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets" />
</ItemGroup>
<Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(_MauiBuildTasksLocation)%(RecursiveDir)" ContinueOnError="true" Retries="0" />
</Target>
Expand All @@ -78,30 +78,30 @@
<Target Name="_GenerateBundledVersions"
BeforeTargets="Build;AssignTargetPaths"
DependsOnTargets="SetVersions"
Inputs="$(MSBuildProjectFile);$(MauiRootDirectory)eng\Versions.props;nuget\buildTransitive\Microsoft.Maui.Core.BundledVersions.in.targets"
Outputs="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets">
Inputs="$(MSBuildProjectFile);$(MauiRootDirectory)eng\Versions.props;nuget\buildTransitive\MauiLinux.Core.BundledVersions.in.targets"
Outputs="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets">
<ItemGroup>
<_ValuesToReplace Include="VERSION" PropertyName="PackageReferenceVersion" />
</ItemGroup>
<Copy
SourceFiles="nuget\buildTransitive\Microsoft.Maui.Core.BundledVersions.in.targets"
DestinationFiles="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets"
SourceFiles="nuget\buildTransitive\MauiLinux.Core.BundledVersions.in.targets"
DestinationFiles="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets"
/>
<ReplaceText
Input="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets"
Output="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets"
Input="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets"
Output="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets"
OldValue="@%(_ValuesToReplace.Identity)@"
NewValue="$(%(_ValuesToReplace.PropertyName))"
/>
<ItemGroup>
<None
Include="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets"
Link="nuget\buildTransitive\Microsoft.Maui.Core.BundledVersions.targets"
Include="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets"
Link="nuget\buildTransitive\MauiLinux.Core.BundledVersions.targets"
Pack="true"
PackagePath="buildTransitive"
Visible="false"
/>
<FileWrites Include="$(IntermediateOutputPath)Microsoft.Maui.Core.BundledVersions.targets" />
<FileWrites Include="$(IntermediateOutputPath)MauiLinux.Core.BundledVersions.targets" />
</ItemGroup>
</Target>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<MSBuildWarningsAsMessages Condition=" '$(TargetPlatformIdentifier)' == 'Android' ">$(MSBuildWarningsAsMessages);XA4218</MSBuildWarningsAsMessages>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Microsoft.Maui.Core.BundledVersions.targets" />
<Import Project="$(MSBuildThisFileDirectory)MauiLinux.Core.BundledVersions.targets" />

<!--
This double check seems excessive, but importing the WinUI.targets when building for windows is not
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- .NET MAUI version for telemetry: this is the installed nuget in use, not the workload version -->
<ItemGroup>
<ProjectCapability Include="Microsoft.Maui.Core.Version.@VERSION@" />
<ProjectCapability Include="MauiLinux.Core.Version.@VERSION@" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<UsingMicrosoftMauiCoreSdk>true</UsingMicrosoftMauiCoreSdk>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)Microsoft.Maui.Core.Before.targets" />
<Import Project="$(MSBuildThisFileDirectory)MauiLinux.Core.Before.targets" />

<PropertyGroup>
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.Maui.Core.After.targets</AfterMicrosoftNETSdkTargets>
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)MauiLinux.Core.After.targets</AfterMicrosoftNETSdkTargets>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<WinUISDKReferences Condition=" '$(WinUISDKReferences)' == '' and '$(EnableMsixTooling)' == 'true' ">false</WinUISDKReferences>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)..\Microsoft.Maui.Core.props" />
<Import Project="$(MSBuildThisFileDirectory)..\MauiLinux.Core.props" />

</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>

<Import Project="$(MSBuildThisFileDirectory)..\MauiLinux.Core.targets" />

</Project>

This file was deleted.

4 changes: 2 additions & 2 deletions src/Essentials/src/Essentials.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Essentials</PackageId>
<PackageId>MauiLinux.Essentials</PackageId>
<PackageTags>$(DefaultPackageTags);essentials;sensors</PackageTags>
<Description>.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.</Description>
<Description>(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.</Description>
</PropertyGroup>
<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Graphics/src/Graphics.Gtk/Graphics.Gtk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0;$(_MauiDotNetTfm)-gtk</TargetFrameworks>
<RootNamespace>Microsoft.Maui.Graphics.Gtk</RootNamespace>
<PackageId>MauiLinux.Graphics.Gtk</PackageId>
</PropertyGroup>
<PropertyGroup>
<Nullable>enable</Nullable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Microsoft.Maui.Graphics.Skia</RootNamespace>
<AssemblyName>Microsoft.Maui.Graphics.Skia.GtkSharp</AssemblyName>
<PackageId>MauiLinux.Graphics.Skia.GtkSharp</PackageId>
<IsPackable>false</IsPackable>
<IsTrimmable>false</IsTrimmable>
<NoWarn>$(NoWarn);RS0041</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Graphics.Skia</PackageId>
<PackageId>MauiLinux.Graphics.Skia</PackageId>
<PackageTags>$(DefaultPackageTags);graphics;drawing;skia;skiasharp</PackageTags>
<Description>.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.</Description>
<Description>(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.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Graphics/src/Graphics/Graphics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Graphics</PackageId>
<PackageId>MauiLinux.Graphics</PackageId>
<PackageTags>$(DefaultPackageTags);graphics;drawing</PackageTags>
<Description>.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.</Description>
<Description>(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.</Description>
</PropertyGroup>

<Import Project="$(MauiSrcDirectory)MultiTargeting.targets" />
Expand Down
4 changes: 2 additions & 2 deletions src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Graphics.Text.Markdig</PackageId>
<PackageId>MauiLinux.Graphics.Text.Markdig</PackageId>
<PackageTags>$(DefaultPackageTags);graphics;drawing;markdown;markdig</PackageTags>
<Description>.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.</Description>
<Description>(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.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Maui.InTree.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<ImportGroup Condition="Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')">

<!-- Microsoft.Maui.Core.props -->
<Import Project="$(_MauiBuildTasksLocation)net6.0-windows10.0.17763.0\Microsoft.Maui.Core.props" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
<Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.props" Condition="'$(_MauiTargetPlatformIsWindows)' != 'true'" />
<Import Project="$(_MauiBuildTasksLocation)net6.0-windows10.0.17763.0\MauiLinux.Core.props" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
<Import Project="$(_MauiBuildTasksLocation)MauiLinux.Core.props" Condition="'$(_MauiTargetPlatformIsWindows)' != 'true'" />

<!-- Microsoft.Maui.Controls.Build.Tasks.props -->
<Import Project="$(_MauiBuildTasksLocation)net6.0-ios10.0\Microsoft.Maui.Controls.Build.Tasks.props" Condition="'$(_MauiTargetPlatformIsiOS)' == 'true'" />
Expand Down
4 changes: 2 additions & 2 deletions src/Maui.InTree.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<ImportGroup Condition="Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Controls.Build.Tasks.dll') and Exists('$(_MauiBuildTasksLocation)Microsoft.Maui.Resizetizer.dll')">

<!-- Microsoft.Maui.Core.targets -->
<Import Project="$(_MauiBuildTasksLocation)net6.0-windows10.0.17763.0\Microsoft.Maui.Core.targets" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
<Import Project="$(_MauiBuildTasksLocation)Microsoft.Maui.Core.targets" Condition="'$(_MauiTargetPlatformIsWindows)' != 'true'" />
<Import Project="$(_MauiBuildTasksLocation)net6.0-windows10.0.17763.0\MauiLinux.Core.targets" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
<Import Project="$(_MauiBuildTasksLocation)MauiLinux.Core.targets" Condition="'$(_MauiTargetPlatformIsWindows)' != 'true'" />

<!-- Microsoft.Maui.Controls.Build.Tasks.targets -->
<Import Project="$(_MauiBuildTasksLocation)net6.0-ios10.0\Microsoft.Maui.Controls.Build.Tasks.targets" Condition="'$(_MauiTargetPlatformIsiOS)' == 'true'" />
Expand Down
4 changes: 2 additions & 2 deletions src/SingleProject/Resizetizer/src/Resizetizer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Resizetizer</PackageId>
<Description>.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.</Description>
<PackageId>MauiLinux.Resizetizer</PackageId>
<Description>(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.</Description>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 733e516

Please sign in to comment.