From 8130cdb6aea62b1724d829258be3fd3b7ee318b5 Mon Sep 17 00:00:00 2001 From: punker76 Date: Tue, 5 Nov 2024 21:05:45 +0100 Subject: [PATCH] build: housekeeping --- {src => build}/IconPacks.Avalonia.snk | Bin build/SharedVersion.props | 34 +++++++++++++++ build/SignAssembly.props | 12 +++++ build/SourceLink.props | 30 +++++++++++++ src/Directory.Build.props | 40 +++-------------- src/Directory.Build.targets | 41 ------------------ src/Directory.Packages.props | 1 + .../IconPacks.Avalonia.Core.csproj | 12 +---- src/IconPacks.Avalonia.sln | 4 +- 9 files changed, 88 insertions(+), 86 deletions(-) rename {src => build}/IconPacks.Avalonia.snk (100%) create mode 100644 build/SharedVersion.props create mode 100644 build/SignAssembly.props create mode 100644 build/SourceLink.props diff --git a/src/IconPacks.Avalonia.snk b/build/IconPacks.Avalonia.snk similarity index 100% rename from src/IconPacks.Avalonia.snk rename to build/IconPacks.Avalonia.snk diff --git a/build/SharedVersion.props b/build/SharedVersion.props new file mode 100644 index 0000000..5c23aa7 --- /dev/null +++ b/build/SharedVersion.props @@ -0,0 +1,34 @@ + + + + MahApps + IconPacks.Avalonia + Copyright © $([System.DateTime]::Today.ToString(yyyy)) MahApps, Jan Karger + IconPacks for stylish awesome Avalonia applications. + IconPacks for stylish awesome Avalonia applications. + + true + 1.0.0.0 + 1.0.0.0 + 1.0.0.0 + 1.0.0.0 + + Jan Karger + MIT + https://github.com/MahApps/IconPacks.Avalonia + logo_small.png + Avalonia;AvaloniaUI;Windows;UI;Modern;ModernUI;Material;XAML;Library;.NET;C#;Icon + https://github.com/MahApps/IconPacks.Avalonia/releases + https://github.com/MahApps/IconPacks.Avalonia.git + git + + + + + + + + + + + \ No newline at end of file diff --git a/build/SignAssembly.props b/build/SignAssembly.props new file mode 100644 index 0000000..0fecd9f --- /dev/null +++ b/build/SignAssembly.props @@ -0,0 +1,12 @@ + + + + + + True + $(MSBuildThisFileDirectory)\IconPacks.Avalonia.snk + false + true + + + \ No newline at end of file diff --git a/build/SourceLink.props b/build/SourceLink.props new file mode 100644 index 0000000..709a32e --- /dev/null +++ b/build/SourceLink.props @@ -0,0 +1,30 @@ + + + + true + false + true + embedded + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml + + + + true + + + true + + + true + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index f31c58a..5d5e7a6 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,12 +2,16 @@ net8.0;net6.0;netstandard2.0 + latest latest true + disable + true + @@ -21,38 +25,8 @@ $(DefineConstants);AVALONIA - - - - true - false - - true - - $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml;.xaml - - True - - - - - true - Embedded - - - - true - - - true - - - true - - - - - - + + + \ No newline at end of file diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 69809a0..6238add 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,46 +1,5 @@ - - - MahApps - IconPacks.Avalonia - Copyright © $([System.DateTime]::Today.ToString(yyyy)) MahApps, Jan Karger - IconPacks for stylish awesome Avalonia applications. - - true - 1.0.0.0 - 1.0.0.0 - 1.0.0.0 - 1.0.0.0 - - - - - True - $(MSBuildThisFileDirectory)\IconPacks.Avalonia.snk - false - true - - - - - - True - - - - - - Jan Karger - MIT - https://github.com/MahApps/IconPacks.Avalonia - logo_small.png - Avalonia;AvaloniaUI;Windows;UI;Modern;ModernUI;Material;XAML;Library;.NET;C#;Icon - https://github.com/MahApps/IconPacks.Avalonia/releases - https://github.com/MahApps/IconPacks.Avalonia.git - git - - diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 4c99776..18b8bf2 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -16,6 +16,7 @@ + diff --git a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj index fce1f6f..9ddc771 100644 --- a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj +++ b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj @@ -1,14 +1,4 @@ - - - - net8.0;net6.0;netstandard2.0 - $(DefineConstants);AVALONIA - latest - latest - true - disable - true - + IconPacks.Avalonia.Core diff --git a/src/IconPacks.Avalonia.sln b/src/IconPacks.Avalonia.sln index 8e90bb8..165dfa6 100644 --- a/src/IconPacks.Avalonia.sln +++ b/src/IconPacks.Avalonia.sln @@ -12,8 +12,10 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EE320BBB-E441-4C3B-9F5B-C56BF8020DF8}" ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props + ..\build\SharedVersion.props = ..\build\SharedVersion.props + ..\build\SignAssembly.props = ..\build\SignAssembly.props + ..\build\SourceLink.props = ..\build\SourceLink.props EndProjectSection EndProject Global