From 3657a5fd07104c9ace2cddb92625bb451123aba8 Mon Sep 17 00:00:00 2001 From: Artem Date: Wed, 7 Dec 2022 13:54:01 +0600 Subject: [PATCH] Multiple target frameworks --- .gitignore | 74 +++++++++++++++++++++---------- SubModules/NP.Concepts.Behaviors | 2 +- SubModules/NP.NLogAdapter | 2 +- SubModules/NP.Utilities | 2 +- SubModules/NP.ViewModelInterfaces | 2 +- src/NP.Avalonia.Visuals.csproj | 23 +++++++--- src/NP.Avalonia.Visuals.nuspec | 24 ---------- src/Properties/AssemblyInfo.cs | 2 - 8 files changed, 72 insertions(+), 59 deletions(-) delete mode 100644 src/NP.Avalonia.Visuals.nuspec diff --git a/.gitignore b/.gitignore index 2e0cca8..d0357e1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,26 +2,54 @@ # This .gitignore file was automatically created by Microsoft(R) Visual Studio. ################################################################################ -/Demos/MultiPlatformWindowDemo/.vs/MultiPlatformWindowDemo/v16 -/Demos/MultiPlatformWindowDemo/bin/Debug/net5.0 -/Demos/MultiPlatformWindowDemo/obj -/src/bin/Debug/net5.0 -/src/obj -/Demos/MultiPlatformWindowDemo/.vs/MultiPlatformWindowDemo/DesignTimeBuild -/src/NP.Avalonia.Visuals.1.0.2.nupkg -/src/NP.Avalonia.Visuals.1.0.3.nupkg -/src/bin/Release/net5.0 -/src/NP.Avalonia.Visuals.1.0.4.nupkg -/Demos/MultiPlatformWindowDemo/.vs/MultiPlatformWindowDemo/v17 -/Demos/MultiPlatformWindowDemo/bin/Debug -/Demos/NP.Demos.CustomWindowSample/.vs -/Demos/NP.Demos.CustomWindowSample/bin/Debug/net5.0 -/Demos/NP.Demos.CustomWindowSample/obj/Debug/net5.0 -/Demos/NP.Demos.CustomWindowSample/obj -/Demos/NP.Demos.CustomWindowCustomizationSample/.vs -/Demos/NP.Demos.CustomWindowCustomizationSample/bin/Debug -/Demos/NP.Demos.CustomWindowCustomizationSample/obj -/src/*.nupkg -/Demos/NP.Demos.BehaviorPrototypes/.vs/NP.Demos.BehaviorPrototypes -/Demos/NP.Demos.BehaviorPrototypes/bin/Debug -/Demos/NP.Demos.BehaviorPrototypes/obj +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + diff --git a/SubModules/NP.Concepts.Behaviors b/SubModules/NP.Concepts.Behaviors index 11b00e0..86a0a08 160000 --- a/SubModules/NP.Concepts.Behaviors +++ b/SubModules/NP.Concepts.Behaviors @@ -1 +1 @@ -Subproject commit 11b00e0e248030e01af2c89993941fc97806a746 +Subproject commit 86a0a081ca3ea35c3dd7b5194888657bb387fa7b diff --git a/SubModules/NP.NLogAdapter b/SubModules/NP.NLogAdapter index c06af5b..d23b487 160000 --- a/SubModules/NP.NLogAdapter +++ b/SubModules/NP.NLogAdapter @@ -1 +1 @@ -Subproject commit c06af5b4767182eb2938c7e997778d87ea54ed9d +Subproject commit d23b487819ea52ac1094373f98794f37dddead78 diff --git a/SubModules/NP.Utilities b/SubModules/NP.Utilities index 941f657..e3bb5e4 160000 --- a/SubModules/NP.Utilities +++ b/SubModules/NP.Utilities @@ -1 +1 @@ -Subproject commit 941f657a5f9ee41344335355253667d6576517f6 +Subproject commit e3bb5e429bd87de968c7d7bdef944b1c5710252f diff --git a/SubModules/NP.ViewModelInterfaces b/SubModules/NP.ViewModelInterfaces index 49b42f8..c1ced4a 160000 --- a/SubModules/NP.ViewModelInterfaces +++ b/SubModules/NP.ViewModelInterfaces @@ -1 +1 @@ -Subproject commit 49b42f869eabad0ef11b3df59562c03329dd36f9 +Subproject commit c1ced4ae463b306d3767772d39f6ce05f6f311dc diff --git a/src/NP.Avalonia.Visuals.csproj b/src/NP.Avalonia.Visuals.csproj index 8cd36a0..964029f 100644 --- a/src/NP.Avalonia.Visuals.csproj +++ b/src/NP.Avalonia.Visuals.csproj @@ -1,13 +1,25 @@  - net5.0 + net6.0;net7.0 NP.Avalonia.Visuals + enable + + + + + NP.Avalonia.Visuals + Visual Controls, Utilities and Behaviors for AvaloniaUI NP.Avalonia.Visuals Nick Polyak, Ph. D. AWebPros + Nick Polyak 2021 MIT - enable + 1.0.31 + false + https://github.com/npolyak/NP.Avalonia.Visuals + Contains Avalonia basic behaviors, converters and Custom Window. + Avalonia Converters, Behaviors, CustomWindow @@ -22,7 +34,6 @@ - @@ -42,8 +53,8 @@ - - - + + + diff --git a/src/NP.Avalonia.Visuals.nuspec b/src/NP.Avalonia.Visuals.nuspec deleted file mode 100644 index 4ef7135..0000000 --- a/src/NP.Avalonia.Visuals.nuspec +++ /dev/null @@ -1,24 +0,0 @@ - - - - NP.Avalonia.Visuals - 1.0.31 - NP.Avalonia.Visuals - Nick Polyak, Ph. D. - false - MIT - https://github.com/npolyak/NP.Avalonia.Visuals - Visual Controls, Utilities and Behaviors for AvaloniaUI - Contains Avalonia basic behaviors, converters and Custom Window. - Nick Polyak 2021 - Multiplatform Avalonia UI Converters, Behaviors, Custom Controls - Avalonia Converters, Behaviors, CustomWindow - - - - - - - - - diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index 15af383..f71547c 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -23,8 +23,6 @@ // components. If you need to access a type in this assembly from COM, set the ComVisible // attribute to true on that type. -[assembly: AssemblyDescription("Visual Controls, Utilities and Behaviors for AvaloniaUI")] -[assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")]