Merge pull request #342 from Insire/central_package_management

[Housekeeping] for project files and package generation
kikipoulet · Dec 2, 2024 · 529642f · 529642f
2 parents a76289f + 2a9af19
commit 529642f
Show file tree

Hide file tree

Showing 8 changed files with 236 additions and 185 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,10 +1,16 @@
 root = true
 
+[*]
 tab_width = 4
 indent_size = 4
 end_of_line = crlf
 indent_style = space
 
+[*.{csproj,props}]
+indent_style = space
+tab_width = 2
+indent_size = 2
+
 [*.{cs,vb}]
 #### Naming styles ####
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>13.0</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors></Authors>
+    <Copyright></Copyright>
+    <Owners></Owners>
+    <Description>https://github.com/kikipoulet/SukiUI</Description>
+    <RepositoryUrl>https://github.com/kikipoulet/SukiUI</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,28 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
+    <PackageVersion Include="Avalonia.Controls.ColorPicker" Version="11.2.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.2.1" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.2.1" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.1" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.2.1" />
+    <PackageVersion Include="AvaloniaEdit.TextMate" Version="11.1.0" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageVersion Include="Dock.Model" Version="11.2.0" />
+    <PackageVersion Include="Material.Icons.Avalonia" Version="2.1.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+    <PackageVersion Include="ShowMeTheXaml.Avalonia" Version="1.5.1" />
+    <PackageVersion Include="ShowMeTheXaml.Avalonia.Generator" Version="1.5.1" />
+    <PackageVersion Include="Avalonia" Version="11.2.1" />
+    <PackageVersion Include="Avalonia.Skia" Version="11.2.1" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.8" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.1" />
+    <PackageVersion Include="Avalonia.Themes.Simple" Version="11.2.1" />
+    <PackageVersion Include="Dock.Avalonia" Version="11.2.0" />
+    <PackageVersion Include="Dock.Model.Avalonia" Version="11.2.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+  </ItemGroup>
+</Project>
diff --git a/Suki.sln b/Suki.sln
@@ -10,6 +10,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{28455569-AF0F-473B-912D-AE515F68FE15}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		LICENSE = LICENSE
 		nuget.config = nuget.config
 		Settings.XamlStyler = Settings.XamlStyler

diff --git a/SukiUI.Demo/Features/ControlsLibrary/Toasts/ToastsViewModel.cs b/SukiUI.Demo/Features/ControlsLibrary/Toasts/ToastsViewModel.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Reactive.Concurrency;
-using System.Timers;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
 using Avalonia.Threading;
@@ -40,7 +37,7 @@ private void ShowUpdatingToast()
             .WithTitle("Updating...")
             .WithContent(progress)
             .Queue();
-        var timer = new Timer(20);
+        var timer = new System.Timers.Timer(20);
         timer.Elapsed += (_, _) =>
         {
             Dispatcher.UIThread.Invoke(() =>
@@ -75,6 +72,7 @@ private void ShowLoadingToast()
             .Dismiss().ByClicking()
             .Queue();
     }
+
     private void ShowTypeDemoToast(NotificationType toastType)
     {
         toastManager.CreateToast()

diff --git a/SukiUI.Demo/SukiUI.Demo.csproj b/SukiUI.Demo/SukiUI.Demo.csproj
@@ -1,60 +1,60 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
-		<PublishAot>true</PublishAot>
-		<InvariantGlobalization>true</InvariantGlobalization>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.2.1" />
-		<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
-		<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.2.1" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.1" />
-		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.1" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
-		<PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-		<PackageReference Include="Dock.Avalonia" Version="11.2.0" />
-		<PackageReference Include="Dock.Model" Version="11.2.0" />
-		<PackageReference Include="Dock.Model.Avalonia" Version="11.2.0" />
-		<PackageReference Include="Material.Icons.Avalonia" Version="2.1.10" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-		<PackageReference Include="ShowMeTheXaml.Avalonia" Version="1.5.1" />
-		<PackageReference Include="ShowMeTheXaml.Avalonia.Generator" Version="1.5.1" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\SukiUI.Dock\SukiUI.Dock.csproj" />
-		<ProjectReference Include="..\SukiUI\SukiUI.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <None Remove="Assets\OIG.N5o-removebg-preview.png" />
-	  <AvaloniaResource Include="Assets\OIG.N5o-removebg-preview.png" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <EmbeddedResource Include="Assets\space.sksl" />
-	  <EmbeddedResource Include="Assets\clouds.sksl" />
-	  <EmbeddedResource Include="Assets\weird.sksl" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <UpToDateCheckInput Remove="Features\ControlsLibrary\Effects\EffectsView.axaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <EmbeddedResource Include="Features\Effects\shaderart.sksl" />
-	</ItemGroup>
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' != 'Debug'">
+    <PublishAot>true</PublishAot>
+    <InvariantGlobalization>true</InvariantGlobalization>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.AvaloniaEdit" />
+    <PackageReference Include="Avalonia.Controls.ColorPicker" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="AvaloniaEdit.TextMate" />
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="Dock.Avalonia" />
+    <PackageReference Include="Dock.Model" />
+    <PackageReference Include="Dock.Model.Avalonia" />
+    <PackageReference Include="Material.Icons.Avalonia" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="ShowMeTheXaml.Avalonia" />
+    <PackageReference Include="ShowMeTheXaml.Avalonia.Generator" />
+    <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SukiUI.Dock\SukiUI.Dock.csproj" />
+    <ProjectReference Include="..\SukiUI\SukiUI.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Assets\OIG.N5o-removebg-preview.png" />
+    <AvaloniaResource Include="Assets\OIG.N5o-removebg-preview.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Assets\space.sksl" />
+    <EmbeddedResource Include="Assets\clouds.sksl" />
+    <EmbeddedResource Include="Assets\weird.sksl" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <UpToDateCheckInput Remove="Features\ControlsLibrary\Effects\EffectsView.axaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Features\Effects\shaderart.sksl" />
+  </ItemGroup>
 
 </Project>
diff --git a/SukiUI.Dock/SukiUI.Dock.csproj b/SukiUI.Dock/SukiUI.Dock.csproj
@@ -1,28 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>6.0.0-beta7</Version>
-        <PackageIcon>OIG.N5o-removebg-preview.png</PackageIcon>
-    </PropertyGroup>
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>6.0.0-beta7</Version>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\SukiUI\SukiUI.csproj" />
-    </ItemGroup>
+  <PropertyGroup>
+    <IsPackable>true</IsPackable>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageVersion>6.0.0-beta7</PackageVersion>
+    <PackageDescription></PackageDescription>
+    <PackageTags>avalonia;avaloniaui;ui;theme;dock;docking;sukiui</PackageTags>
+    <PackageProjectUrl>https://github.com/kikipoulet/SukiUI</PackageProjectUrl>
+    <PackageIcon>OIG.N5o-removebg-preview.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SukiUI\SukiUI.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <PackageReference Include="Dock.Avalonia" Version="11.2.0" />
-      <PackageReference Include="Dock.Model.Avalonia" Version="11.2.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Dock.Avalonia" />
+    <PackageReference Include="Dock.Model.Avalonia" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <None Update="OIG.N5o-removebg-preview.png">
-        <Pack>True</Pack>
-        <PackagePath></PackagePath>
-      </None>
-    </ItemGroup>
+  <ItemGroup>
+    <None Update="OIG.N5o-removebg-preview.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
 
 </Project>