From f4d9396ff0e2c974dc9f2e67d4055b340c3b97f9 Mon Sep 17 00:00:00 2001 From: zeroone Date: Sun, 25 Aug 2024 22:08:12 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E7=BC=96=E8=AF=91/=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Packages.props | 61 +++++++++--------- build/!Nuget.Local.bat | 8 +++ build/!Nuget.bat | 7 ++ build/!Package.All.Release.bat | 9 +++ build/Common.props | 2 +- build/Nuget.props | 4 +- logo.png | Bin 0 -> 2711 bytes src/AtomUI.Base/AtomUI.Base.csproj | 2 + src/AtomUI.Controls/AtomUI.Controls.csproj | 20 +++--- .../AtomUI.Icon.AntDesign.csproj | 2 + src/AtomUI.Icon/AtomUI.Icon.csproj | 2 + src/AtomUI.Theme/AtomUI.Theme.csproj | 28 ++++---- src/AtomUI.Theme/ThemeManager.cs | 2 +- 13 files changed, 90 insertions(+), 57 deletions(-) create mode 100644 build/!Nuget.Local.bat create mode 100644 build/!Nuget.bat create mode 100644 build/!Package.All.Release.bat create mode 100644 logo.png diff --git a/Directory.Packages.props b/Directory.Packages.props index 4a49530..a000cf5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,31 +1,34 @@ - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/!Nuget.Local.bat b/build/!Nuget.Local.bat new file mode 100644 index 0000000..1b75f93 --- /dev/null +++ b/build/!Nuget.Local.bat @@ -0,0 +1,8 @@ +cd %~dp0 +@set dir="..\_output\Nuget" + +for %%f in (%dir%\*.nupkg) do ( + dotnet nuget push %%f --source "D:\nuget.local" +) + +pause \ No newline at end of file diff --git a/build/!Nuget.bat b/build/!Nuget.bat new file mode 100644 index 0000000..21bcfbf --- /dev/null +++ b/build/!Nuget.bat @@ -0,0 +1,7 @@ +@set dir="..\_output\Nuget" + +for %%f in (%dir%\*.nupkg) do ( + dotnet nuget push %%f --api-key [key] --source https://api.nuget.org/v3/index.json +) + +pause \ No newline at end of file diff --git a/build/!Package.All.Release.bat b/build/!Package.All.Release.bat new file mode 100644 index 0000000..579254e --- /dev/null +++ b/build/!Package.All.Release.bat @@ -0,0 +1,9 @@ +%~dp0 + +rd/s/q ..\_output\ + +cd ..\ + +dotnet msbuild .\AtomUI.sln /p:Configuration=Release + +pause \ No newline at end of file diff --git a/build/Common.props b/build/Common.props index 8fa0691..b81599a 100644 --- a/build/Common.props +++ b/build/Common.props @@ -2,7 +2,7 @@ Library - net8.0 + net6.0 copyused false diff --git a/build/Nuget.props b/build/Nuget.props index 949812f..1a7d76f 100644 --- a/build/Nuget.props +++ b/build/Nuget.props @@ -10,8 +10,8 @@ Chinware Technologies Ltd. $(Author) - TODO - TODO + AtomUI is an implementation of Ant Design based on .NET technology, and is committed to bringing Ant Design's excellent and efficient design language and experience to the Avalonia/.NET cross-platform desktop software development field. + avalonia;antdesign;ui;control https://atomui.net https://github.com/chinware/AtomUI diff --git a/logo.png b/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..82bd40d2cbb4194fb0c46ca72163bc3f2cbd0ce7 GIT binary patch literal 2711 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 LcII`a-U + + True diff --git a/src/AtomUI.Controls/AtomUI.Controls.csproj b/src/AtomUI.Controls/AtomUI.Controls.csproj index aafb9ec..8c5b1ae 100644 --- a/src/AtomUI.Controls/AtomUI.Controls.csproj +++ b/src/AtomUI.Controls/AtomUI.Controls.csproj @@ -1,5 +1,7 @@  + + AtomUI.Controls true @@ -7,22 +9,22 @@ - + - + - - + + - + - - - + + + - + diff --git a/src/AtomUI.Icon.AntDesign/AtomUI.Icon.AntDesign.csproj b/src/AtomUI.Icon.AntDesign/AtomUI.Icon.AntDesign.csproj index f0ad107..6c39026 100644 --- a/src/AtomUI.Icon.AntDesign/AtomUI.Icon.AntDesign.csproj +++ b/src/AtomUI.Icon.AntDesign/AtomUI.Icon.AntDesign.csproj @@ -1,5 +1,7 @@  + + diff --git a/src/AtomUI.Icon/AtomUI.Icon.csproj b/src/AtomUI.Icon/AtomUI.Icon.csproj index d8d1304..7af371f 100644 --- a/src/AtomUI.Icon/AtomUI.Icon.csproj +++ b/src/AtomUI.Icon/AtomUI.Icon.csproj @@ -1,5 +1,7 @@  + + diff --git a/src/AtomUI.Theme/AtomUI.Theme.csproj b/src/AtomUI.Theme/AtomUI.Theme.csproj index 9d48c58..6ab451a 100644 --- a/src/AtomUI.Theme/AtomUI.Theme.csproj +++ b/src/AtomUI.Theme/AtomUI.Theme.csproj @@ -1,43 +1,41 @@  + + true GeneratedFiles - - - - - - - + - + + + - + - + - + - + - - + + - + diff --git a/src/AtomUI.Theme/ThemeManager.cs b/src/AtomUI.Theme/ThemeManager.cs index 9250206..6e34f0a 100644 --- a/src/AtomUI.Theme/ThemeManager.cs +++ b/src/AtomUI.Theme/ThemeManager.cs @@ -214,7 +214,7 @@ public class ThemeManager : Styles, IThemeManager { foreach (var path in paths) { var fullPath = Path.GetFullPath(path); - if (!_customThemeDirs.Contains(fullPath) && Path.Exists(fullPath)) { + if (!_customThemeDirs.Contains(fullPath) && Directory.Exists(fullPath)) { _customThemeDirs.Add(fullPath); } }