Skip to content

Commit 4bd4a38

Browse files
authored
Merge pull request #1 from Dirkster99/NetCore3
Multitargeting NetCore 3/.Net 4
2 parents 69efc07 + f10d1b3 commit 4bd4a38

26 files changed

+184
-911
lines changed

Readme.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
[![Release](https://img.shields.io/github/release/Dirkster99/UnitComboLib.svg)](https://github.com/Dirkster99/UnitComboLib/releases/latest)
33
[![NuGet](https://img.shields.io/nuget/dt/Dirkster.UnitComboLib.svg)](http://nuget.org/packages/Dirkster.UnitComboLib)
44

5+
![Net4](https://badgen.net/badge/Framework/.Net 4/blue) ![NetCore3](https://badgen.net/badge/Framework/NetCore 3/blue)
6+
57
# Overview
68

79
The WPF UnitComboBox Control implements a combobox that allows the selection of values from different lists. Each list can represent a different unit (eg.: Celsius, Farenheit) and the viewmodel takes care of always converting to one unit (e.g. Celsius). This conversion is independent of what the user selected unit or value actually was.

appveyor.yml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: 1.1.{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/UnitCombobox.sln
14+
15+
build:
16+
17+
verbosity: minimal
18+
19+
artifacts:
20+
21+
- path: source\UnitComboboxDemo\bin\Release
22+
name: UnitComboboxDemo
23+
24+
- path: source\UnitComboLib\bin\Release
25+
name: UnitComboLib

source/CleanAll.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ECHO.
66
ECHO This script deletes all temporary build files in their
77
ECHO corresponding BIN and OBJ Folder contained in the following projects
88
ECHO.
9-
ECHO UnitCombobox
9+
ECHO UnitComboboxDemo
1010
ECHO UnitComboLib
1111
ECHO.
1212
REM Ask the user if hes really sure to continue beyond this point XXXXXXXX
@@ -21,8 +21,8 @@ ECHO.
2121
ECHO Deleting BIN and OBJ Folders in UnitCombobox
2222
ECHO.
2323
RMDIR /S /Q .\.vs
24-
RMDIR /S /Q .\UnitCombobox\bin
25-
RMDIR /S /Q .\UnitCombobox\obj
24+
RMDIR /S /Q .\UnitComboboxDemo\bin
25+
RMDIR /S /Q .\UnitComboboxDemo\obj
2626
ECHO.
2727
ECHO Deleting BIN and OBJ Folders in UnitComboLib
2828
ECHO.

source/UnitComboLib/AssemblyInfo.cs

+10
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/UnitComboLib/Properties/AssemblyInfo.cs

-55
This file was deleted.

source/UnitComboLib/Properties/Resources.Designer.cs

-63
This file was deleted.

source/UnitComboLib/Properties/Resources.resx

-117
This file was deleted.

source/UnitComboLib/Properties/Settings.Designer.cs

-26
This file was deleted.

source/UnitComboLib/Properties/Settings.settings

-7
This file was deleted.

0 commit comments

Comments
 (0)