Skip to content

Commit

Permalink
GithubCI: rename packages to Mali.*
Browse files Browse the repository at this point in the history
Rename Microsoft.Maui.* packages to Mali.* so they can be
published on nuget.org.
  • Loading branch information
webwarrior-ws committed Nov 27, 2024
1 parent 44d7d2f commit 797d2af
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.AspNetCore.Components.WebView.Maui</PackageId>
<PackageId>Mali.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>
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/Compatibility.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>True</IsPackable>
<PackageId>Microsoft.Maui.Controls.Compatibility</PackageId>
<PackageId>Mali.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>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Controls/Foldable/src/Controls.Foldable.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<TargetFrameworks>$(_MauiDotNetTfm);$(MauiPlatforms)</TargetFrameworks>
<AssemblyName>Microsoft.Maui.Controls.Foldable</AssemblyName>
<RootNamespace>Microsoft.Maui.Controls.Foldable</RootNamespace>
<PackageId>Mali.Controls.Foldable</PackageId>
<WarningsNotAsErrors>BI1234</WarningsNotAsErrors>
<IsTrimmable>false</IsTrimmable>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
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\Mali.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\Mali.AspNetCore.Components.WebView.targets" />

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

Expand Down
2 changes: 1 addition & 1 deletion src/Controls/src/Core/Controls.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Controls.Core</PackageId>
<PackageId>Mali.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>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Controls/src/Xaml/Controls.Xaml.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Controls.Xaml</PackageId>
<PackageId>Mali.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>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Core</PackageId>
<PackageId>Mali.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>
</PropertyGroup>

Expand Down
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)Mali.Core.Before.targets" />

<PropertyGroup>
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Microsoft.Maui.Core.After.targets</AfterMicrosoftNETSdkTargets>
<AfterMicrosoftNETSdkTargets>$(AfterMicrosoftNETSdkTargets);$(MSBuildThisFileDirectory)Mali.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)..\Mali.Core.props" />

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

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

</Project>

This file was deleted.

2 changes: 1 addition & 1 deletion src/Essentials/src/Essentials.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Essentials</PackageId>
<PackageId>Mali.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>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Graphics/src/Graphics/Graphics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PropertyGroup>
<!-- NuGet package information -->
<IsPackable>true</IsPackable>
<PackageId>Microsoft.Maui.Graphics</PackageId>
<PackageId>Mali.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>
</PropertyGroup>
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\Mali.Core.props" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
<Import Project="$(_MauiBuildTasksLocation)Mali.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\Mali.Core.targets" Condition="'$(_MauiTargetPlatformIsWindows)' == 'true'" />
<Import Project="$(_MauiBuildTasksLocation)Mali.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

0 comments on commit 797d2af

Please sign in to comment.