Skip to content

Commit

Permalink
Merge pull request #1 from Dirkster99/NetCore3
Browse files Browse the repository at this point in the history
Multitargeting NetCore 3/.Net 4
  • Loading branch information
Dirkster99 authored Sep 3, 2019
2 parents 69efc07 + f10d1b3 commit 4bd4a38
Show file tree
Hide file tree
Showing 26 changed files with 184 additions and 911 deletions.
2 changes: 2 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
[![Release](https://img.shields.io/github/release/Dirkster99/UnitComboLib.svg)](https://github.com/Dirkster99/UnitComboLib/releases/latest)
[![NuGet](https://img.shields.io/nuget/dt/Dirkster.UnitComboLib.svg)](http://nuget.org/packages/Dirkster.UnitComboLib)

![Net4](https://badgen.net/badge/Framework/.Net 4/blue) ![NetCore3](https://badgen.net/badge/Framework/NetCore 3/blue)

# Overview

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.
Expand Down
25 changes: 25 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: 1.1.{build}

configuration: Release

platform: Any CPU

image: Visual Studio 2019 Preview

install:
- cmd: choco install dotnetcore-sdk --pre

before_build:
- cmd: nuget restore source/UnitCombobox.sln

build:

verbosity: minimal

artifacts:

- path: source\UnitComboboxDemo\bin\Release
name: UnitComboboxDemo

- path: source\UnitComboLib\bin\Release
name: UnitComboLib
6 changes: 3 additions & 3 deletions source/CleanAll.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ECHO.
ECHO This script deletes all temporary build files in their
ECHO corresponding BIN and OBJ Folder contained in the following projects
ECHO.
ECHO UnitCombobox
ECHO UnitComboboxDemo
ECHO UnitComboLib
ECHO.
REM Ask the user if hes really sure to continue beyond this point XXXXXXXX
Expand All @@ -21,8 +21,8 @@ ECHO.
ECHO Deleting BIN and OBJ Folders in UnitCombobox
ECHO.
RMDIR /S /Q .\.vs
RMDIR /S /Q .\UnitCombobox\bin
RMDIR /S /Q .\UnitCombobox\obj
RMDIR /S /Q .\UnitComboboxDemo\bin
RMDIR /S /Q .\UnitComboboxDemo\obj
ECHO.
ECHO Deleting BIN and OBJ Folders in UnitComboLib
ECHO.
Expand Down
10 changes: 10 additions & 0 deletions source/UnitComboLib/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System.Windows;

[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
55 changes: 0 additions & 55 deletions source/UnitComboLib/Properties/AssemblyInfo.cs

This file was deleted.

63 changes: 0 additions & 63 deletions source/UnitComboLib/Properties/Resources.Designer.cs

This file was deleted.

117 changes: 0 additions & 117 deletions source/UnitComboLib/Properties/Resources.resx

This file was deleted.

26 changes: 0 additions & 26 deletions source/UnitComboLib/Properties/Settings.Designer.cs

This file was deleted.

7 changes: 0 additions & 7 deletions source/UnitComboLib/Properties/Settings.settings

This file was deleted.

Loading

0 comments on commit 4bd4a38

Please sign in to comment.