Skip to content

Commit 381bae6

Browse files
Dirkster99Dirkster99
authored
Merge pull request #6 from Dirkster99/NetCore3
Multitargeting NetCore 3/.Net4
2 parents 194d2ab + 9912359 commit 381bae6

19 files changed

Lines changed: 153 additions & 233 deletions

‎Readme.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
[![Build status](https://img.shields.io/appveyor/ci/Dirkster99/NumericUpDownLib.svg)](https://ci.appveyor.com/project/Dirkster99/NumericUpDownLib)
22
[![Release](https://img.shields.io/github/release/Dirkster99/NumericUpDownLib.svg)](https://github.com/Dirkster99/NumericUpDownLib/releases/latest)
33
[![NuGet](https://img.shields.io/nuget/dt/Dirkster.NumericUpDownLib.svg)](http://nuget.org/packages/Dirkster.NumericUpDownLib)
4+
5+
![Net4](https://badgen.net/badge/Framework/.Net 4/blue) ![NetCore3](https://badgen.net/badge/Framework/NetCore 3/blue)
6+
47
# Overview
58

69
This library implements numeric up down WPF controls to edit a value:

‎appveyor.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: 2.4.{build}
2+
3+
configuration: Release
4+
5+
platform: Any CPU
6+
7+
image: Visual Studio 2019 Preview
8+
9+
install:
10+
- cmd: choco install dotnetcore-sdk --pre
11+
12+
before_build:
13+
- cmd: nuget restore source/NumericUpDown.sln
14+
15+
build:
16+
17+
verbosity: minimal
18+
19+
artifacts:
20+
21+
- path: source\TestGenerics\bin\Release
22+
name: TestGenerics
23+
24+
- path: source\TestThemes\bin\Release
25+
name: TestThemes
26+
27+
- path: source\NumericUpDownLib\bin\Release
28+
name: NumericUpDownLib

‎source/Demo/MLibTest/Components/Settings/Settings/Settings.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
7676
<HintPath>..\..\..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
7777
</Reference>
78-
<Reference Include="MLib, Version=1.0.9.0, Culture=neutral, processorArchitecture=MSIL">
79-
<HintPath>..\..\..\..\..\packages\Dirkster.MLib.1.0.9.1\lib\net4\MLib.dll</HintPath>
78+
<Reference Include="MLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>..\..\..\..\..\packages\Dirkster.MLib.1.2.0\lib\net4\MLib.dll</HintPath>
8080
</Reference>
8181
<Reference Include="PresentationFramework" />
8282
<Reference Include="System" />

‎source/Demo/MLibTest/Components/Settings/Settings/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Dirkster.MLib" version="1.0.9.1" targetFramework="net452" />
3+
<package id="Dirkster.MLib" version="1.2.0" targetFramework="net452" />
44
<package id="log4net" version="2.0.8" targetFramework="net452" />
55
</packages>

‎source/Demo/UpDownDemoLib/UpDownDemoLib.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
</ItemGroup>
151151
<ItemGroup>
152152
<ProjectReference Include="..\..\NumericUpDownLib\NumericUpDownLib.csproj">
153-
<Project>{98e332ac-86e6-4db3-a757-4d84432b4a2b}</Project>
153+
<Project>{e542beed-60f4-48b0-8ac6-24dbfc03b0c4}</Project>
154154
<Name>NumericUpDownLib</Name>
155155
</ProjectReference>
156156
</ItemGroup>

source/numericupdownoneproject.sln renamed to source/NumericUpDown.sln

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26430.16
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.29209.152
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestThemes", "TestThemes\TestThemes.csproj", "{58BD0E02-6BFF-43F0-9B93-D3371E97794B}"
66
EndProject
77
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestGenerics", "TestGenerics\TestGenerics.csproj", "{BDBB3D84-0268-43E2-BBC6-F5CA2068262E}"
88
EndProject
9-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NumericUpDownLib", "NumericUpDownLib\NumericUpDownLib.csproj", "{98E332AC-86E6-4DB3-A757-4D84432B4A2B}"
10-
EndProject
119
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MLibTest", "MLibTest", "{8305C6D6-C5E9-48B1-BE93-6BAB0C772C6B}"
1210
EndProject
1311
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{C69AB586-96F2-48A7-B2AA-8294DE1E1C4A}"
@@ -22,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpDownDemoLib", "Demo\UpDow
2220
EndProject
2321
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{5FC97D08-2690-4233-B3D2-582FBD6CB6EB}"
2422
EndProject
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NumericUpDownLib", "NumericUpDownLib\NumericUpDownLib.csproj", "{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}"
24+
EndProject
2525
Global
2626
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2727
Debug|Any CPU = Debug|Any CPU
@@ -56,18 +56,6 @@ Global
5656
{BDBB3D84-0268-43E2-BBC6-F5CA2068262E}.Release|x64.Build.0 = Release|Any CPU
5757
{BDBB3D84-0268-43E2-BBC6-F5CA2068262E}.Release|x86.ActiveCfg = Release|Any CPU
5858
{BDBB3D84-0268-43E2-BBC6-F5CA2068262E}.Release|x86.Build.0 = Release|Any CPU
59-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
61-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Debug|x64.ActiveCfg = Debug|Any CPU
62-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Debug|x64.Build.0 = Debug|Any CPU
63-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Debug|x86.ActiveCfg = Debug|Any CPU
64-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Debug|x86.Build.0 = Debug|Any CPU
65-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
66-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Release|Any CPU.Build.0 = Release|Any CPU
67-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Release|x64.ActiveCfg = Release|Any CPU
68-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Release|x64.Build.0 = Release|Any CPU
69-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Release|x86.ActiveCfg = Release|Any CPU
70-
{98E332AC-86E6-4DB3-A757-4D84432B4A2B}.Release|x86.Build.0 = Release|Any CPU
7159
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7260
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
7361
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|x64.ActiveCfg = Debug|x64
@@ -116,6 +104,18 @@ Global
116104
{ED3A742D-4055-4DA2-BBCE-74E817B211BF}.Release|x64.Build.0 = Release|Any CPU
117105
{ED3A742D-4055-4DA2-BBCE-74E817B211BF}.Release|x86.ActiveCfg = Release|Any CPU
118106
{ED3A742D-4055-4DA2-BBCE-74E817B211BF}.Release|x86.Build.0 = Release|Any CPU
107+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
108+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
109+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Debug|x64.ActiveCfg = Debug|Any CPU
110+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Debug|x64.Build.0 = Debug|Any CPU
111+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Debug|x86.ActiveCfg = Debug|Any CPU
112+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Debug|x86.Build.0 = Debug|Any CPU
113+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
114+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Release|Any CPU.Build.0 = Release|Any CPU
115+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Release|x64.ActiveCfg = Release|Any CPU
116+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Release|x64.Build.0 = Release|Any CPU
117+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Release|x86.ActiveCfg = Release|Any CPU
118+
{E542BEED-60F4-48B0-8AC6-24DBFC03B0C4}.Release|x86.Build.0 = Release|Any CPU
119119
EndGlobalSection
120120
GlobalSection(SolutionProperties) = preSolution
121121
HideSolutionNode = FALSE

‎source/NumericUpDownLib/AssemblyInfo.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System.Windows;
2+
3+
[assembly: ThemeInfo(
4+
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
5+
//(used if a resource is not found in the page,
6+
// or application resource dictionaries)
7+
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
8+
//(used if a resource is not found in the page,
9+
// app, or any theme specific resource dictionaries)
10+
)]

‎source/NumericUpDownLib/NumericUpDownLib.csproj‎

Lines changed: 40 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,56 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{98E332AC-86E6-4DB3-A757-4D84432B4A2B}</ProjectGuid>
8-
<OutputType>library</OutputType>
9-
<RootNamespace>NumericUpDownLib</RootNamespace>
10-
<AssemblyName>NumericUpDownLib</AssemblyName>
11-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<WarningLevel>4</WarningLevel>
15-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
4+
<TargetFrameworks>net4;netcoreapp3.0</TargetFrameworks>
5+
<UseWPF>true</UseWPF>
6+
7+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8+
<Version>2.4.0.0</Version>
9+
<AssemblyVersion>2.4.0.0</AssemblyVersion>
10+
<FileVersion>2.4.0.0</FileVersion>
11+
<Company>Open Source</Company>
12+
<Product>NumericUpDownLib</Product>
13+
<Copyright>2013-2019</Copyright>
14+
<Description>Provides a numeric up down WPF control that can be used to edit (integer, byte, decimal, double, float, short and many more) values with a textbox and/or up/down arrow (repeat) buttons. Editing can be based on input via mouse wheel, mouse drag, cursor keys, or text editing.</Description>
15+
<PackageProjectUrl>https://github.com/Dirkster99/NumericUpDownLib</PackageProjectUrl>
16+
<RepositoryUrl>https://github.com/Dirkster99/NumericUpDownLib</RepositoryUrl>
17+
<PackageId>Dirkster.NumericUpDownLib</PackageId>
18+
<Authors>https://github.com/Dirkster99/NumericUpDownLib</Authors>
19+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20+
<PackageTags>numericupdown numeric up down integer float double percentage increment decrement custom wpf control mvvm c# .net metro black light themed control library</PackageTags>
21+
<PackageReleaseNotes>This control is now supported in NetCore 3 (with Preview 8) and .Net 4.</PackageReleaseNotes>
22+
<NeutralLanguage>en</NeutralLanguage>
23+
<PackageIconUrl>https://raw.githubusercontent.com/Dirkster99/NumericUpDownLib/master/SyncArrow_64x.png</PackageIconUrl>
24+
1625
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
<DocumentationFile>bin\Debug\NumericUpDownLib.xml</DocumentationFile>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<DocumentationFile>bin\Release\NumericUpDownLib.xml</DocumentationFile>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<Reference Include="System" />
38-
<Reference Include="System.Data" />
39-
<Reference Include="Microsoft.CSharp" />
40-
<Reference Include="System.Core" />
41-
<Reference Include="System.Data.DataSetExtensions" />
42-
<Reference Include="System.Xaml">
43-
<RequiredTargetFramework>4.0</RequiredTargetFramework>
44-
</Reference>
45-
<Reference Include="WindowsBase" />
46-
<Reference Include="PresentationCore" />
47-
<Reference Include="PresentationFramework" />
48-
</ItemGroup>
26+
4927
<ItemGroup>
50-
<Compile Include="Converters\BoolToVisibilityPropConverter.cs" />
51-
<Compile Include="Converters\FactorToDoubleConverter.cs" />
52-
<Compile Include="FloatUpDown.cs" />
53-
<Compile Include="Models\MouseDirections.cs" />
54-
<Compile Include="Models\MouseIncrementor.cs" />
55-
<Compile Include="ULongUpDown.cs" />
56-
<Compile Include="UIntegerUpDown.cs" />
57-
<Compile Include="UShortUpDown.cs" />
58-
<Compile Include="ShortUpDown.cs" />
59-
<Compile Include="LongUpDown.cs" />
60-
<Compile Include="SByteUpDown.cs" />
61-
<Compile Include="DoubleUpDown.cs" />
62-
<Compile Include="DecimalUpDown.cs" />
63-
<Compile Include="ByteUpDown.cs" />
64-
<Compile Include="NumericUpDown.cs" />
65-
<Compile Include="Converters\ByteToPlaceHolderStringConverter.cs" />
66-
<Compile Include="Base\InputBaseUpDown.cs" />
67-
<Compile Include="Base\NumericRepeatButtonControl.xaml.cs">
68-
<DependentUpon>NumericRepeatButtonControl.xaml</DependentUpon>
69-
<SubType>Code</SubType>
70-
</Compile>
71-
<Compile Include="Base\AbstractBaseUpDown.xaml.cs">
28+
<Compile Update="Base\AbstractBaseUpDown.xaml.cs">
7229
<DependentUpon>AbstractBaseUpDown.xaml</DependentUpon>
7330
</Compile>
74-
<Compile Include="Themes\ResourceKeys.cs" />
75-
<Page Include="Base\NumericRepeatButtonControl.xaml">
31+
<Compile Update="Base\NumericRepeatButtonControl.xaml.cs">
32+
<SubType>Code</SubType>
33+
<DependentUpon>NumericRepeatButtonControl.xaml</DependentUpon>
34+
</Compile>
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<Page Update="Base\AbstractBaseUpDown.xaml">
7639
<SubType>Designer</SubType>
77-
<Generator>MSBuild:Compile</Generator>
7840
</Page>
79-
<Page Include="Base\AbstractBaseUpDown.xaml">
80-
<Generator>MSBuild:Compile</Generator>
41+
<Page Update="Base\NumericRepeatButtonControl.xaml">
8142
<SubType>Designer</SubType>
8243
</Page>
83-
<Page Include="Themes\DarkBrushs.xaml">
84-
<Generator>MSBuild:Compile</Generator>
44+
<Page Update="Themes\DarkBrushs.xaml">
8545
<SubType>Designer</SubType>
8646
</Page>
87-
<Page Include="Themes\Generic.xaml">
88-
<Generator>MSBuild:Compile</Generator>
47+
<Page Update="Themes\Generic.xaml">
8948
<SubType>Designer</SubType>
90-
</Page>
91-
<Page Include="Themes\LightBrushs.xaml">
9249
<Generator>MSBuild:Compile</Generator>
50+
</Page>
51+
<Page Update="Themes\LightBrushs.xaml">
9352
<SubType>Designer</SubType>
9453
</Page>
9554
</ItemGroup>
96-
<ItemGroup>
97-
<Compile Include="Properties\AssemblyInfo.cs">
98-
<SubType>Code</SubType>
99-
</Compile>
100-
<Compile Include="Properties\Settings.Designer.cs">
101-
<AutoGen>True</AutoGen>
102-
<DependentUpon>Settings.settings</DependentUpon>
103-
<DesignTimeSharedInput>True</DesignTimeSharedInput>
104-
</Compile>
105-
<None Include="Base\ClassDiagram1.cd" />
106-
<None Include="Properties\Settings.settings">
107-
<Generator>SettingsSingleFileGenerator</Generator>
108-
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
109-
</None>
110-
</ItemGroup>
111-
<ItemGroup />
112-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
113-
</Project>
55+
56+
</Project>

‎source/NumericUpDownLib/NumericUpDownLib.csproj.user‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
<ItemGroup>
5+
<Page Update="Base\AbstractBaseUpDown.xaml">
6+
<SubType>Designer</SubType>
7+
</Page>
8+
<Page Update="Base\NumericRepeatButtonControl.xaml">
9+
<SubType>Designer</SubType>
10+
</Page>
11+
<Page Update="Themes\DarkBrushs.xaml">
12+
<SubType>Designer</SubType>
13+
</Page>
14+
<Page Update="Themes\Generic.xaml">
15+
<SubType>Designer</SubType>
16+
</Page>
17+
<Page Update="Themes\LightBrushs.xaml">
18+
<SubType>Designer</SubType>
19+
</Page>
20+
</ItemGroup>
21+
</Project>

‎source/NumericUpDownLib/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)