Skip to content

Commit ac46289

Browse files
Dirkster99Dirkster99
authored
Merge pull request #1 from Dirkster99/NetCore3
Multitargeting NetCore 3/Net 4.5.2
2 parents d0d23a2 + 98d243e commit ac46289

21 files changed

+1381
-454
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[![Build status](https://ci.appveyor.com/api/projects/status/nw16d7fi59x0se0p?svg=true)](https://ci.appveyor.com/project/Dirkster99/suggestboxlib) [![Release](https://img.shields.io/github/release/Dirkster99/SuggestBoxLib.svg)](https://github.com/Dirkster99/SuggestBoxLib/releases/latest) [![NuGet](https://img.shields.io/nuget/dt/Dirkster.SuggestBoxLib.svg)](http://nuget.org/packages/Dirkster.SuggestBoxLib)
22

3+
![Net4](https://badgen.net/badge/Framework/.Net 4/blue) ![NetCore3](https://badgen.net/badge/Framework/NetCore 3/blue)
4+
35
The SuggestBox control in this repository was originally developed by <b>Leung Yat Chun Joseph <a href="https://github.com/lycj">lycj</a></b> in his FileExplorer application originating from CodePlex and <a href="https://www.codeproject.com/Members/Fainx">CodeProject</a>.
46

57
# SuggestBoxLib

‎appveyor.yml‎

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

‎source/Components/Settings/Settings/Settings.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
7979
<HintPath>..\..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
8080
</Reference>
81-
<Reference Include="MLib, Version=1.0.10.0, Culture=neutral, processorArchitecture=MSIL">
82-
<HintPath>..\..\..\packages\Dirkster.MLib.1.0.10\lib\net4\MLib.dll</HintPath>
81+
<Reference Include="MLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
82+
<HintPath>..\..\..\packages\Dirkster.MLib.1.2.0\lib\net4\MLib.dll</HintPath>
8383
</Reference>
8484
<Reference Include="PresentationFramework" />
8585
<Reference Include="System" />

‎source/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.10" 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/Demos/SuggestBoxDemo/GenericSuggestBoxDemo.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
<ItemGroup />
101101
<ItemGroup>
102102
<ProjectReference Include="..\..\SuggestBoxLib\SuggestBoxLib.csproj">
103-
<Project>{78bf82dc-38fd-41dc-a8ce-45c79f628103}</Project>
104-
<Name>SuggestLib</Name>
103+
<Project>{f6d38418-cd9a-4f26-bc8b-12c9bd74a672}</Project>
104+
<Name>SuggestBoxLib</Name>
105105
</ProjectReference>
106106
<ProjectReference Include="..\SuggestBoxTestLib\SuggestBoxTestLib.csproj">
107107
<Project>{f6a08289-52e8-45cd-928b-e71d7bcb6290}</Project>

‎source/Demos/SuggestBoxTestLib/SuggestBoxTestLib.csproj‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,17 @@
6363
<DependentUpon>DemoView.xaml</DependentUpon>
6464
</Compile>
6565
</ItemGroup>
66-
<ItemGroup>
67-
<ProjectReference Include="..\..\SuggestBoxLib\SuggestBoxLib.csproj">
68-
<Project>{78bf82dc-38fd-41dc-a8ce-45c79f628103}</Project>
69-
<Name>SuggestLib</Name>
70-
</ProjectReference>
71-
</ItemGroup>
7266
<ItemGroup>
7367
<Page Include="Views\DemoView.xaml">
7468
<SubType>Designer</SubType>
7569
<Generator>MSBuild:Compile</Generator>
7670
</Page>
7771
</ItemGroup>
78-
<ItemGroup />
72+
<ItemGroup>
73+
<ProjectReference Include="..\..\SuggestBoxLib\SuggestBoxLib.csproj">
74+
<Project>{f6d38418-cd9a-4f26-bc8b-12c9bd74a672}</Project>
75+
<Name>SuggestBoxLib</Name>
76+
</ProjectReference>
77+
</ItemGroup>
7978
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8079
</Project>

‎source/Demos/ThemedSuggestBoxDemo/ThemedSuggestBoxDemo.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@
4444
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
4545
</Reference>
4646
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\Dirkster.MWindowLib.1.0.4.2\lib\net452\Microsoft.Expression.Interactions.dll</HintPath>
47+
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\Microsoft.Expression.Interactions.dll</HintPath>
4848
</Reference>
49-
<Reference Include="MLib, Version=1.0.10.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\Dirkster.MLib.1.0.10\lib\net4\MLib.dll</HintPath>
49+
<Reference Include="MLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\..\packages\Dirkster.MLib.1.2.0\lib\net4\MLib.dll</HintPath>
5151
</Reference>
5252
<Reference Include="MWindowInterfacesLib, Version=1.0.4.2, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\Dirkster.MWindowLib.1.0.4.2\lib\net452\MWindowInterfacesLib.dll</HintPath>
53+
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\MWindowInterfacesLib.dll</HintPath>
5454
</Reference>
55-
<Reference Include="MWindowLib, Version=1.0.4.2, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\Dirkster.MWindowLib.1.0.4.2\lib\net452\MWindowLib.dll</HintPath>
55+
<Reference Include="MWindowLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\MWindowLib.dll</HintPath>
5757
</Reference>
5858
<Reference Include="System" />
5959
<Reference Include="System.Data" />
6060
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<HintPath>..\..\..\packages\Dirkster.MWindowLib.1.0.4.2\lib\net452\System.Windows.Interactivity.dll</HintPath>
61+
<HintPath>..\..\packages\Dirkster.MWindowLib.1.2.1\lib\net452\System.Windows.Interactivity.dll</HintPath>
6262
</Reference>
6363
<Reference Include="System.Xml" />
6464
<Reference Include="Microsoft.CSharp" />
@@ -149,8 +149,8 @@
149149
<Name>Settings</Name>
150150
</ProjectReference>
151151
<ProjectReference Include="..\..\SuggestBoxLib\SuggestBoxLib.csproj">
152-
<Project>{78bf82dc-38fd-41dc-a8ce-45c79f628103}</Project>
153-
<Name>SuggestLib</Name>
152+
<Project>{f6d38418-cd9a-4f26-bc8b-12c9bd74a672}</Project>
153+
<Name>SuggestBoxLib</Name>
154154
</ProjectReference>
155155
<ProjectReference Include="..\SuggestBoxTestLib\SuggestBoxTestLib.csproj">
156156
<Project>{f6a08289-52e8-45cd-928b-e71d7bcb6290}</Project>

‎source/Demos/ThemedSuggestBoxDemo/ViewModels/AppViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public ICommand ThemeSelectionChangedCommand
102102
if (theme != null)
103103
{
104104
_AppTheme.ApplyTheme(Application.Current.MainWindow,
105-
theme.Model.Name);
105+
theme.Model.DisplayName);
106106
}
107107
});
108108
}

‎source/Demos/ThemedSuggestBoxDemo/ViewModels/ThemeDefinitionViewModel.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
namespace ThemedSuggestBoxDemo.ViewModels
22
{
3-
using MLib.Themes;
3+
using MLib.Interfaces;
44

55
public class ThemeDefinitionViewModel : Base.ViewModelBase
66
{
77
#region private fields
8-
readonly private ThemeDefinition _model;
8+
readonly private IThemeInfo _model;
99

1010
private bool _IsSelected;
1111
#endregion private fields
1212

1313
#region constructors
14-
public ThemeDefinitionViewModel(ThemeDefinition model)
14+
public ThemeDefinitionViewModel(IThemeInfo model)
1515
: this()
1616
{
1717
_model = model;
@@ -28,7 +28,7 @@ protected ThemeDefinitionViewModel()
2828
/// <summary>
2929
/// Gets the static theme model based data items.
3030
/// </summary>
31-
public ThemeDefinition Model
31+
public IThemeInfo Model
3232
{
3333
get
3434
{

‎source/Demos/ThemedSuggestBoxDemo/ViewModels/ThemeViewModel.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ public ThemeViewModel()
3232

3333
foreach (var item in settings.Themes.GetThemeInfos())
3434
{
35-
var list = new List<string>();
36-
foreach (var subitem in item.ThemeSources)
37-
list.Add(subitem.ToString());
38-
39-
_ListOfThemes.Add(item.DisplayName, new ThemeDefinitionViewModel(new ThemeDefinition(item.DisplayName, list)));
35+
_ListOfThemes.Add(item.DisplayName, new ThemeDefinitionViewModel(item));
4036
}
4137

4238
// Lets make sure there is a default

0 commit comments

Comments
 (0)