这是indexloc提供的服务，不要输入任何密码
Skip to content

Mutlitargeting NetCore 3/.Net4 #1

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 3, 2019
Merged

Mutlitargeting NetCore 3/.Net4 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[![Build status](https://ci.appveyor.com/api/projects/status/0e19uif3f40tsppi?svg=true)](https://ci.appveyor.com/project/Dirkster99/colorpickerlib)
[![Release](https://img.shields.io/github/release/Dirkster99/colorpickerlib.svg)](https://github.com/Dirkster99/colorpickerlib/releases/latest)
[![NuGet](https://img.shields.io/nuget/dt/Dirkster.colorpickerlib.svg)](http://nuget.org/packages/Dirkster.colorpickerlib)

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

# ColorPickerLib
A WPF/MVVM implementation of a themeable color picker control

Expand Down
32 changes: 32 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
version: 1.6.{build}

branches:
only:
- master

configuration: Release

platform: Any CPU

image: Visual Studio 2019 Preview

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

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

build:

verbosity: minimal

artifacts:

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

- path: source\MLibTest\ThemedDemo\bin\Release
name: ThemedDemo

- path: source\ColorPickerLib\bin\Release
name: ColorPickerLib
34 changes: 17 additions & 17 deletions source/ColorPickerDemo.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.29209.152
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPickerDemo", "ColorPickerDemo\ColorPickerDemo.csproj", "{D2AEE076-83D6-4B96-B420-B6782CAA0E44}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPickerLib", "ColorPickerLib\ColorPickerLib.csproj", "{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MLibTest", "MLibTest", "{762EF7D1-DF7E-45C1-A5DB-A0B079A0933D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{BBC3130A-38F7-4C77-894D-80E190235555}"
Expand All @@ -21,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThemedDemo", "MLibTest\Them
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPickerDemoLib", "ColorPickerDemoLib\ColorPickerDemoLib.csproj", "{6FB67EF1-8867-4C75-8C5D-3952A85C27DA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ColorPickerLib", "ColorPickerLib\ColorPickerLib.csproj", "{120B4F72-0BF6-4272-B1BF-68444131570C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -43,18 +43,6 @@ Global
{D2AEE076-83D6-4B96-B420-B6782CAA0E44}.Release|x64.Build.0 = Release|Any CPU
{D2AEE076-83D6-4B96-B420-B6782CAA0E44}.Release|x86.ActiveCfg = Release|Any CPU
{D2AEE076-83D6-4B96-B420-B6782CAA0E44}.Release|x86.Build.0 = Release|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Debug|x64.ActiveCfg = Debug|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Debug|x64.Build.0 = Debug|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Debug|x86.ActiveCfg = Debug|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Debug|x86.Build.0 = Debug|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Release|Any CPU.Build.0 = Release|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Release|x64.ActiveCfg = Release|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Release|x64.Build.0 = Release|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Release|x86.ActiveCfg = Release|Any CPU
{E64CE47C-10A6-490E-B1B1-84F00FD6C1D2}.Release|x86.Build.0 = Release|Any CPU
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{252126D1-E1D9-49C3-910B-FCF2266265EF}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -115,6 +103,18 @@ Global
{6FB67EF1-8867-4C75-8C5D-3952A85C27DA}.Release|x64.Build.0 = Release|Any CPU
{6FB67EF1-8867-4C75-8C5D-3952A85C27DA}.Release|x86.ActiveCfg = Release|Any CPU
{6FB67EF1-8867-4C75-8C5D-3952A85C27DA}.Release|x86.Build.0 = Release|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Debug|x64.ActiveCfg = Debug|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Debug|x64.Build.0 = Debug|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Debug|x86.ActiveCfg = Debug|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Debug|x86.Build.0 = Debug|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Release|Any CPU.Build.0 = Release|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Release|x64.ActiveCfg = Release|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Release|x64.Build.0 = Release|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Release|x86.ActiveCfg = Release|Any CPU
{120B4F72-0BF6-4272-B1BF-68444131570C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
6 changes: 3 additions & 3 deletions source/ColorPickerDemo/ColorPickerDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="NumericUpDownLib, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dirkster.NumericUpDownLib.2.2.2\lib\net4\NumericUpDownLib.dll</HintPath>
<Reference Include="NumericUpDownLib, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dirkster.NumericUpDownLib.2.4.0\lib\net40\NumericUpDownLib.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -105,7 +105,7 @@
<Name>ColorPickerDemoLib</Name>
</ProjectReference>
<ProjectReference Include="..\ColorPickerLib\ColorPickerLib.csproj">
<Project>{e64ce47c-10a6-490e-b1b1-84f00fd6c1d2}</Project>
<Project>{120b4f72-0bf6-4272-b1bf-68444131570c}</Project>
<Name>ColorPickerLib</Name>
</ProjectReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/ColorPickerDemo/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dirkster.NumericUpDownLib" version="2.2.2" targetFramework="net45" />
<package id="Dirkster.NumericUpDownLib" version="2.4.0" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion source/ColorPickerDemoLib/ColorPickerDemoLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ColorPickerLib\ColorPickerLib.csproj">
<Project>{e64ce47c-10a6-490e-b1b1-84f00fd6c1d2}</Project>
<Project>{120b4f72-0bf6-4272-b1bf-68444131570c}</Project>
<Name>ColorPickerLib</Name>
</ProjectReference>
</ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions source/ColorPickerLib/AssemblyInfo.cs
View file
Open in desktop
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)
)]
Loading