Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Housekeeping] for project files and package generation #342

Merged
merged 3 commits into from
Dec 2, 2024
Merged

[Housekeeping] for project files and package generation #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6afbd04
added Directory.Build.props, Directory.Packages.props to centrally ma…
Insire Nov 30, 2024
ce9ea0f
fixed ambiguous reference in ToastsViewModel
Insire Nov 30, 2024
2a9af19
use netstandard2.0 for SukiUI.Dock
Insire Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ####

Expand Down
17 changes: 17 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
28 changes: 28 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 2 additions & 0 deletions Suki.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions SukiUI.Demo/Features/ControlsLibrary/Toasts/ToastsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
using System;
using System.Reactive.Concurrency;
using System.Timers;
using Avalonia.Controls;
using Avalonia.Controls.Notifications;
using Avalonia.Threading;
Expand Down Expand Up @@ -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(() =>
Expand Down Expand Up @@ -75,6 +72,7 @@ private void ShowLoadingToast()
.Dismiss().ByClicking()
.Queue();
}

private void ShowTypeDemoToast(NotificationType toastType)
{
toastManager.CreateToast()
Expand Down
114 changes: 57 additions & 57 deletions SukiUI.Demo/SukiUI.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
48 changes: 27 additions & 21 deletions SukiUI.Dock/SukiUI.Dock.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Loading