Skip to content

Commit

Permalink
build: Move some packages away from nuspec
Browse files Browse the repository at this point in the history
  • Loading branch information
Youssef1313 committed Jul 26, 2024
1 parent 161c3c1 commit 7d84baa
Show file tree
Hide file tree
Showing 22 changed files with 16 additions and 164 deletions.
10 changes: 0 additions & 10 deletions build/Uno.UI.Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@
<_NuspecFiles Include=".\nuget\Uno.WinUI.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.Lottie.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.MSAL.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.MediaPlayer.WebAssembly.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.MediaPlayer.Skia.Gtk.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.Svg.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.RemoteControl.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.DevServer.nuspec" />
Expand All @@ -185,7 +183,6 @@
<_NuspecFiles Include=".\nuget\Uno.WinUI.WebAssembly.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.XamlHost.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.WinUI.XamlHost.Skia.Wpf.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.Foundation.Logging.nuspec" />
<_NuspecFiles Include=".\nuget\Uno.UI.Adapter.Microsoft.Extensions.Logging.nuspec" />
</ItemGroup>

Expand Down Expand Up @@ -235,8 +232,6 @@
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix)" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.Lottie.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix).Lottie" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.MSAL.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix).MSAL" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.MediaPlayer.WebAssembly.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix).MediaPlayer.WebAssembly" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.MediaPlayer.Skia.Gtk.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix).MediaPlayer.Skia.Gtk" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.Svg.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix).Svg" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.XamlHost.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix).XamlHost" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.XamlHost.Skia.Wpf.nuspec" Query="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix).XamlHost.Skia.Wpf" Namespaces="$(NugetNamespace)" />
Expand All @@ -254,8 +249,6 @@
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix)" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.Lottie.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix).Lottie" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.MSAL.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix).MSAL" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.MediaPlayer.WebAssembly.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix).MediaPlayer.WebAssembly" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.MediaPlayer.Skia.Gtk.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix).Skia.Gtk.WebAssembly" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.Svg.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix).Svg" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.XamlHost.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix).XamlHost" Namespaces="$(NugetNamespace)" />
<XmlPoke XmlInputPath=".\nuget\Uno.WinUI.XamlHost.Skia.Wpf.nuspec" Query="/x:package/x:metadata/x:title" Value="$(PackageNamePrefix).XamlHost.Skia.Wpf" Namespaces="$(NugetNamespace)" />
Expand Down Expand Up @@ -396,8 +389,6 @@
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.Lottie.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.MSAL.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.MediaPlayer.WebAssembly.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.MediaPlayer.Skia.Gtk.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.Svg.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.RemoteControl.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.DevServer.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
Expand All @@ -410,7 +401,6 @@
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.XamlHost.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.XamlHost.Skia.Wpf.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.WinUI.WebAssembly.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.Foundation.Logging.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
<Exec Command="$(NuGetBin) pack nuget\Uno.UI.Adapter.Microsoft.Extensions.Logging.nuspec -Verbosity Detailed -Version &quot;$(GITVERSION_SemVer)&quot; -Properties &quot;$(NuSpecProperties)&quot;" />
</Target>

Expand Down
23 changes: 0 additions & 23 deletions build/nuget/Uno.Foundation.Logging.nuspec

This file was deleted.

38 changes: 0 additions & 38 deletions build/nuget/Uno.WinUI.MediaPlayer.Skia.Gtk.nuspec

This file was deleted.

25 changes: 0 additions & 25 deletions build/nuget/Uno.WinUI.MediaPlayer.WebAssembly.nuspec

This file was deleted.

5 changes: 0 additions & 5 deletions src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Reference.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@
</PropertyGroup>

<PropertyGroup>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the extensions to MSAL (Microsoft.Identity.Client) for an Uno Platform application.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId>Uno.UI.MSAL</PackageId>
<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.MSAL</PackageId>
Expand Down
5 changes: 0 additions & 5 deletions src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
<Import Project="../../targetframework-override.props" />

<PropertyGroup>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the extensions to MSAL (Microsoft.Identity.Client) for an Uno Platform application.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.MSAL</PackageId>
</PropertyGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.netcoremobile.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@
</PropertyGroup>

<PropertyGroup>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the extensions to MSAL (Microsoft.Identity.Client) for an Uno Platform application.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId>Uno.UI.MSAL</PackageId>
<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.MSAL</PackageId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
<Deterministic>true</Deterministic>
<AssemblyName>Uno.UI.MediaPlayer.Skia.Gtk</AssemblyName>
<RootNamespace>Uno.UI.MediaPlayer.Skia.Gtk</RootNamespace>
<IsPackable>false</IsPackable>

<!-- Don't install GTK at this step, let the app head do it -->
<SkipGtkInstall>true</SkipGtkInstall>

<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<Description>This package provides support for MediaPlayerElement for Uno Platform Skia+Gtk apps</Description>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<Deterministic>true</Deterministic>
<AssemblyName>Uno.UI.MediaPlayer.WebAssembly</AssemblyName>
<RootNamespace>Uno.UI.Media</RootNamespace>
<IsPackable>false</IsPackable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.MediaPlayer.WebAssembly</PackageId>
<Description>This package provides support for MediaPlayerElement for WebAssembly</Description>
</PropertyGroup>

<PropertyGroup>
Expand Down
10 changes: 9 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@
<PropertyGroup>
<DebugType>portable</DebugType>
<DebugSymbols>True</DebugSymbols>
<RepositoryUrl>$(BUILD_REPOSITORY_URI)</RepositoryUrl>

<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<RepositoryBranch>$(GITVERSION_BranchName)</RepositoryBranch>
<RepositoryCommit>$(GitVersion_Sha)</RepositoryCommit>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>
<Authors>Uno Platform</Authors>
<PackageIcon>uno.png</PackageIcon>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
Expand Down
5 changes: 3 additions & 2 deletions src/Uno.Foundation.Logging/Uno.Foundation.Logging.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@

<UseCommonOverridePackage>true</UseCommonOverridePackage>

<!-- Manual packaging during CI -->
<IsPackable>false</IsPackable>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>

<Description>This package provides internal logging utilities for Uno.UI and Uno.WinUI packages</Description>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@

<PropertyGroup>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the .NET interoperability support for WebAssembly in Uno Platform projects.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Uno.Sdk/Uno.Sdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<PackageType>MSBuildSdk</PackageType>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<Description>Provides a base SDK for Uno Platform projects.</Description>
<PackageIcon>uno.png</PackageIcon>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<UnoSdkVersionSuffix>_v0</UnoSdkVersionSuffix>
<!-- This is better but Jerome made me take it out -->
Expand Down
5 changes: 0 additions & 5 deletions src/Uno.UI.Foldable/Uno.UI.Foldable.netcoremobile.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,7 @@
</PropertyGroup>

<PropertyGroup>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the ability for Uno Platform based apps to use dual screen devices such as the Surface Duo or Neo</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/Uno.UI.Maps/Uno.UI.Maps.netcoremobile.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@
<Import Project="../targetframework-override-netprevious.props" />

<PropertyGroup>
<Authors>uno platform</Authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the ability for Uno Platform based apps to use the MapControl</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform inc. - all rights reserved</Copyright>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 0 additions & 4 deletions src/Uno.UI.Runtime.Skia.Gtk/Uno.UI.Runtime.Skia.Gtk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@

<PropertyGroup>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<authors>Uno Platform</authors>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the platform support for Skia in Uno Platform projects.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Runtime.Skia.Gtk</PackageId>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@

<PropertyGroup>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the platform support for Skia / Linux framebuffer in Uno Platform projects.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Runtime.Skia.Linux.FrameBuffer</PackageId>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@

<PropertyGroup>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<authors>Uno Platform</authors>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides macOS platform support for Skia in Uno Platform projects.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Runtime.Skia.MacOS</PackageId>

Expand Down
5 changes: 0 additions & 5 deletions src/Uno.UI.Runtime.Skia.Wpf/Uno.UI.Runtime.Skia.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@

<PropertyGroup>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the platform support for Skia in Uno Platform projects.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Runtime.Skia.Wpf</PackageId>

Expand Down
5 changes: 0 additions & 5 deletions src/Uno.UI.Runtime.Skia.X11/Uno.UI.Runtime.Skia.X11.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@

<PropertyGroup>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<authors>Uno Platform</authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the platform support for Skia / X11 in Uno Platform projects.</Description>
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) Uno Platform Inc. - all rights reserved</Copyright>

<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.Runtime.Skia.X11</PackageId>

Expand Down
Loading

0 comments on commit 7d84baa

Please sign in to comment.