build: use cpm

unoplatform · Jan 30, 2024 · fa70981 · fa70981
1 parent 6014393
commit fa70981
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 114 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,63 @@
+<Project>
+	<PropertyGroup>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageVersion Include="CommunityToolkit.WinUI.Lottie" Version="7.1.2" />
+		<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
+		<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
+		<PackageVersion Include="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" />
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+		<PackageVersion Include="Microsoft.TypeScript.Compiler" Version="3.1.5" />
+		<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.6.4" />
+		<PackageVersion Include="Microsoft.Windows.Compatibility" Version="6.0.6" />
+		<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
+		<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.3.230502000" />
+		<PackageVersion Include="NUnit" Version="3.13.3" />
+		<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
+		<PackageVersion Include="NunitXml.TestLogger" Version="3.0.131" />
+		<PackageVersion Include="nventive.Nimue.Application.Packaging" Version="0.1.0-alpha.58" />
+		<PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
+		<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
+		<PackageVersion Include="Svg.Skia" Version="1.0.0.1" />
+		<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200-dev.13.gef3f523648" />
+		<PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200-dev.13.gef3f523648" />
+		<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
+		<PackageVersion Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
+		<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
+		<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.1.0" />
+		<PackageVersion Include="Uno.Diagnostics.Eventing" Version="2.1.0-dev.1" />
+		<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.6.0-dev.2" />
+		<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0-dev.2" />
+		<PackageVersion Include="Uno.Fonts.Fluent" Version="2.3.0" />
+		<PackageVersion Include="Uno.Material.WinUI" Version="4.1.0" />
+		<PackageVersion Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0015" />
+		<PackageVersion Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0015" />
+		<PackageVersion Include="Uno.Toolkit.Skia.WinUI" Version="5.1.3" />
+		<PackageVersion Include="Uno.Toolkit.WinUI" Version="5.1.3" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Cupertino" Version="5.1.3" />
+		<PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.1.3" />
+		<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.31" />
+		<PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
+		<PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.27" />
+		<PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.27" />
+		<PackageVersion Include="Uno.WinUI" Version="5.1.31" />
+		<PackageVersion Include="Uno.WinUI.Lottie" Version="5.1.31" />
+		<PackageVersion Include="Uno.WinUI.MediaPlayer.Skia.Gtk" Version="5.1.31" />
+		<PackageVersion Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.1.31" />
+		<PackageVersion Include="Uno.WinUI.RemoteControl" Version="5.1.31" />
+		<PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.1.31" />
+		<PackageVersion Include="Uno.WinUI.Svg" Version="5.1.31" />
+		<PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.1.31" />
+		<PackageVersion Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
+		<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.6.0" />
+		<PackageVersion Include="Xamarin.UITest" Version="4.1.4" />
+		<PackageVersion Include="Xamarin.TestCloud.Agent" Version="0.23.2" />
+	</ItemGroup>
+</Project>
diff --git a/Uno.Gallery.SourceGenerators/Uno.Gallery.SourceGenerators.csproj b/Uno.Gallery.SourceGenerators/Uno.Gallery.SourceGenerators.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
@@ -9,8 +9,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" />
 		<Compile Include="../Uno.Gallery/Uno.Gallery.Shared/Entities/SampleConditionals.cs" />
 	</ItemGroup>
 

diff --git a/Uno.Gallery.sln b/Uno.Gallery.sln
@@ -15,7 +15,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Gallery.Mobile", "Uno.G
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Gallery.Windows", "Uno.Gallery\Uno.Gallery.Windows\Uno.Gallery.Windows.csproj", "{7408E845-56F8-44B3-BC29-9EDF44ABB208}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.Gallery.SourceGenerators", "Uno.Gallery.SourceGenerators\Uno.Gallery.SourceGenerators.csproj", "{9C67E941-0290-4C31-A1D6-D5740F7C0CBB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Gallery.SourceGenerators", "Uno.Gallery.SourceGenerators\Uno.Gallery.SourceGenerators.csproj", "{9C67E941-0290-4C31-A1D6-D5740F7C0CBB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0A9386E5-A912-4EEF-B67B-C1CD9170CC84}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj b/Uno.Gallery/Uno.Gallery.Mobile/Uno.Gallery.Mobile.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst;net7.0-macos</TargetFrameworks>
 		<SingleProject>true</SingleProject>
@@ -19,6 +19,7 @@
 		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
 		<NoWarn>CA1416;Uno0001</NoWarn>
+		<AndroidManifest>Android\AndroidManifest.xml</AndroidManifest>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -27,29 +28,29 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
-		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200-dev.13.gef3f523648" />
-		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200-dev.13.gef3f523648" />
-		<PackageReference Include="Uno.Cupertino.WinUI" Version="4.1.0" />
-		<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.6.0-dev.2" />
-		<PackageReference Include="Uno.Fonts.Fluent" Version="2.3.0" />
-		<PackageReference Include="Uno.Material.WinUI" Version="4.1.0" />
-		<PackageReference Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0015" />
-		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0015" />
-		<PackageReference Include="Uno.WinUI" Version="5.1.31" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.1.31" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.31" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Uno.Diagnostics.Eventing" Version="2.1.0-dev.1" />
-		<PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="5.1.3" />
-		<PackageReference Include="Uno.Toolkit.WinUI" Version="5.1.3" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="5.1.3" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.1.3" />
-		<PackageReference Include="Uno.WinUI.Lottie" Version="5.1.31" />
-		<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
-		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
-		<PackageReference Include="Uno.WinUI.Svg" Version="5.1.31" />
+		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
+		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" />
+		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" />
+		<PackageReference Include="Uno.Cupertino.WinUI" />
+		<PackageReference Include="Uno.Extensions.Logging.OSLog" />
+		<PackageReference Include="Uno.Fonts.Fluent" />
+		<PackageReference Include="Uno.Material.WinUI" />
+		<PackageReference Include="Uno.ShowMeTheXAML" />
+		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" />
+		<PackageReference Include="Uno.WinUI" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
+		<PackageReference Include="Microsoft.Extensions.Logging" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
+		<PackageReference Include="Uno.Diagnostics.Eventing" />
+		<PackageReference Include="Uno.Toolkit.Skia.WinUI" />
+		<PackageReference Include="Uno.Toolkit.WinUI" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Material" />
+		<PackageReference Include="Uno.WinUI.Lottie" />
+		<PackageReference Include="Uno.Core.Extensions.Disposables" />
+		<PackageReference Include="Uno.Core.Extensions.Compatibility" />
+		<PackageReference Include="Uno.WinUI.Svg" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -68,10 +69,9 @@
 				<AndroidSigningKeyStore>..\Gallery.Droid\calc-prod.keystore</AndroidSigningKeyStore>
 				<AndroidSigningKeyAlias>gallery-prod</AndroidSigningKeyAlias>
 			</PropertyGroup>
-
 			<ItemGroup>
-				<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.0" />
-				<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
+				<PackageReference Include="Xamarin.Google.Android.Material" />
+				<PackageReference Include="Uno.UniversalImageLoader" />
 			</ItemGroup>
 
 			<!--
@@ -86,7 +86,7 @@
 		</When>
 		<When Condition="'$(TargetFramework)'=='net7.0-ios'">
 			<ItemGroup>
-				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.6.0-dev.2" />
+				<PackageReference Include="Uno.Extensions.Logging.OSLog" />
 			</ItemGroup>
 			<ItemGroup Condition="'$(Configuration)'=='Release'">
 				<TrimmableAssembly Include="CommunityToolkit.WinUI.UI" />
@@ -105,7 +105,7 @@
 			</PropertyGroup>
 
 			<ItemGroup Condition="'$(Configuration)'=='Debug' or '$(IsUiAutomationMappingEnabled)'=='True'">
-				<PackageReference Include="Xamarin.TestCloud.Agent" Version="0.23.2" />
+				<PackageReference Include="Xamarin.TestCloud.Agent" />
 			</ItemGroup>
 
 			<ItemGroup>
@@ -115,7 +115,7 @@
 		</When>
 		<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
 			<ItemGroup>
-				<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.6.0-dev.2" />
+				<PackageReference Include="Uno.Extensions.Logging.OSLog" />
 			</ItemGroup>
 			<PropertyGroup>
 				<!-- https://github.com/xamarin/xamarin-macios/issues/14686 -->

diff --git a/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj b/Uno.Gallery/Uno.Gallery.Skia.Gtk/Uno.Gallery.Skia.Gtk.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
@@ -14,31 +14,31 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Svg.Skia" Version="1.0.0.1" />
-		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200-dev.13.gef3f523648" />
-		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200-dev.13.gef3f523648" />
-		<PackageReference Include="Uno.Cupertino.WinUI" Version="4.1.0" />
-		<PackageReference Include="Uno.Fonts.Fluent" Version="2.3.0" />
+		<PackageReference Include="Svg.Skia" />
+		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" />
+		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" />
+		<PackageReference Include="Uno.Cupertino.WinUI" />
+		<PackageReference Include="Uno.Fonts.Fluent" />
 		<!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Uno.Material.WinUI" Version="4.1.0" />
-		<PackageReference Include="Uno.ShowMeTheXAML" Version="2.0.0-dev0015" />
-		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" Version="2.0.0-dev0015" />
-		<PackageReference Include="Uno.Toolkit.Skia.WinUI" Version="5.1.3" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" Version="5.1.3" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.1.3" />		
-		<PackageReference Include="Uno.WinUI.Lottie" Version="5.1.31" />
-		<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.1.31" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.1.31" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.31" />
-		<PackageReference Include="Uno.Core.Extensions.Disposables" Version="4.0.1" />
-		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
-		<PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
-		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
-		<PackageReference Include="Uno.WinUI.Svg" Version="5.1.31" />
-		<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.18" />
-		<PackageReference Include="Uno.WinUI.MediaPlayer.Skia.Gtk" Version="5.1.31" />
+		<PackageReference Include="Microsoft.Extensions.Logging" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" />
+		<PackageReference Include="Uno.Material.WinUI" />
+		<PackageReference Include="Uno.ShowMeTheXAML" />
+		<PackageReference Include="Uno.ShowMeTheXAML.MSBuild" />
+		<PackageReference Include="Uno.Toolkit.Skia.WinUI" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Cupertino" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Material" />		
+		<PackageReference Include="Uno.WinUI.Lottie" />
+		<PackageReference Include="Uno.WinUI.Skia.Gtk" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
+		<PackageReference Include="Uno.Core.Extensions.Disposables" />
+		<PackageReference Include="Uno.Core.Extensions.Compatibility" />
+		<PackageReference Include="SkiaSharp.Skottie" />
+		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
+		<PackageReference Include="Uno.WinUI.Svg" />
+		<PackageReference Include="VideoLAN.LibVLC.Windows" />
+		<PackageReference Include="Uno.WinUI.MediaPlayer.Skia.Gtk" />
 
 	</ItemGroup>
 

diff --git a/Uno.Gallery/Uno.Gallery.UITest/Uno.Gallery.UITest.csproj b/Uno.Gallery/Uno.Gallery.UITest/Uno.Gallery.UITest.csproj
@@ -6,13 +6,13 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200-dev.13.gef3f523648" />
-		<PackageReference Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
-		<PackageReference Include="Xamarin.UITest" Version="4.1.4" />
-		<PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="NUnit" />
+		<PackageReference Include="NUnit3TestAdapter" />
+		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" />
+		<PackageReference Include="Uno.UITest.Helpers" />
+		<PackageReference Include="Xamarin.UITest" />
+		<PackageReference Include="NunitXml.TestLogger" />
 	</ItemGroup>
 
 </Project>