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.

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

Multiple target frameworks #7

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 51 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion SubModules/NP.Concepts.Behaviors
2 changes: 1 addition & 1 deletion SubModules/NP.NLogAdapter
23 changes: 17 additions & 6 deletions src/NP.Avalonia.Visuals.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<RootNamespace>NP.Avalonia.Visuals</RootNamespace>
<Nullable>enable</Nullable>
</PropertyGroup>

<!--nuspec-->
<PropertyGroup>
<Title>NP.Avalonia.Visuals</Title>
<Description>Visual Controls, Utilities and Behaviors for AvaloniaUI</Description>
<PackageId>NP.Avalonia.Visuals</PackageId>
<Authors>Nick Polyak, Ph. D.</Authors>
<Company>AWebPros</Company>
<Copyright>Nick Polyak 2021</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Nullable>enable</Nullable>
<PackageVersion>1.0.31</PackageVersion>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageProjectUrl>https://github.com/npolyak/NP.Avalonia.Visuals</PackageProjectUrl>
<PackageReleaseNotes>Contains Avalonia basic behaviors, converters and Custom Window.</PackageReleaseNotes>
<PackageTags>Avalonia Converters, Behaviors, CustomWindow</PackageTags>
</PropertyGroup>

<ItemGroup>
Expand All @@ -22,7 +34,6 @@
<None Remove="Assets\avalonia-32.png" />
<None Remove="LICENSE" />
<None Remove="*.nupkg" />
<None Remove="NP.Avalonia.Visuals.nuspec" />
<None Remove="README.md" />
</ItemGroup>

Expand All @@ -42,8 +53,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(SolutionDir)..\..\SubModules\NP.Utilities\src\NP.Utilities.csproj" />
<ProjectReference Include="$(SolutionDir)..\..\SubModules\NP.Concepts.Behaviors\src\NP.Concepts.Behaviors.csproj" />
<ProjectReference Include="$(SolutionDir)..\..\SubModules\NP.ViewModelInterfaces\src\NP.ViewModelInterfaces.csproj" />
<ProjectReference Include="..\SubModules\NP.Utilities\src\NP.Utilities.csproj" />
<ProjectReference Include="..\SubModules\NP.Concepts.Behaviors\src\NP.Concepts.Behaviors.csproj" />
<ProjectReference Include="..\SubModules\NP.ViewModelInterfaces\src\NP.ViewModelInterfaces.csproj" />
</ItemGroup>
</Project>
24 changes: 0 additions & 24 deletions src/NP.Avalonia.Visuals.nuspec

This file was deleted.

2 changes: 0 additions & 2 deletions src/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand Down