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 5, 2019
2 parents 10db0ae + 7ef0d8f commit 7c93452
Show file tree
Hide file tree
Showing 13 changed files with 103 additions and 387 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/MRULib.svg)](https://github.com/Dirkster99/MRULib/releases/latest)
[![NuGet](https://img.shields.io/nuget/dt/Dirkster.HistoryControlLib.svg)](http://nuget.org/packages/Dirkster.HistoryControlLib)

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

<table border="0" width="100%">
<tr>
<td><img src="https://github.com/Dirkster99/Docu/blob/master/HistoryControlLib/Branch_32x.png?raw=true" width="24"/></td> <td><h1>HistoryControlLib</h1></td>
Expand Down
30 changes: 30 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
version: 1.1.{build}

branches:
only:
- master

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

build:
verbosity: minimal

configuration: Release

platform: Any CPU

image: Visual Studio 2019 Preview

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

artifacts:
- path: source\BrowseHistoryDemo\bin\Release
name: BrowseHistoryDemo

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

- path: source\HistoryControlLib\bin\Release
name: HistoryControlLib
34 changes: 17 additions & 17 deletions source/BrowseHistoryDemo.sln
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.27130.2036
# Visual Studio Version 16
VisualStudioVersion = 16.0.29230.61
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowseHistoryDemo", "BrowseHistoryDemo\BrowseHistoryDemo.csproj", "{4D2E6726-2FCC-4085-97A0-AB77B8E78358}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HistoryControlLib", "HistoryControlLib\HistoryControlLib.csproj", "{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserHistoryDemoLib", "BrowserHistoryDemoLib\BrowserHistoryDemoLib.csproj", "{D0CA35BB-2EC3-42D6-A329-D86EF8287DC7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowseHistoryThemesDemo", "BrowseHistoryThemesDemo\BrowseHistoryThemesDemo.csproj", "{5F1D60B6-0A78-48E1-A771-F328FF1E900B}"
Expand All @@ -21,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsModel", "Components
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Settings", "Settings", "{33EAF3BC-9B43-4E50-95D6-9FB531F9F2EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HistoryControlLib", "HistoryControlLib\HistoryControlLib.csproj", "{93394321-71D7-47A8-86B5-76AFF001C9A2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -43,18 +43,6 @@ Global
{4D2E6726-2FCC-4085-97A0-AB77B8E78358}.Release|x64.Build.0 = Release|Any CPU
{4D2E6726-2FCC-4085-97A0-AB77B8E78358}.Release|x86.ActiveCfg = Release|Any CPU
{4D2E6726-2FCC-4085-97A0-AB77B8E78358}.Release|x86.Build.0 = Release|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Debug|x64.ActiveCfg = Debug|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Debug|x64.Build.0 = Debug|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Debug|x86.ActiveCfg = Debug|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Debug|x86.Build.0 = Debug|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Release|Any CPU.Build.0 = Release|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Release|x64.ActiveCfg = Release|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Release|x64.Build.0 = Release|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Release|x86.ActiveCfg = Release|Any CPU
{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}.Release|x86.Build.0 = Release|Any CPU
{D0CA35BB-2EC3-42D6-A329-D86EF8287DC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D0CA35BB-2EC3-42D6-A329-D86EF8287DC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D0CA35BB-2EC3-42D6-A329-D86EF8287DC7}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -115,6 +103,18 @@ Global
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|x64.Build.0 = Release|x64
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|x86.ActiveCfg = Release|x86
{9B0BA841-5A2F-4ED3-A908-253DBCA70E77}.Release|x86.Build.0 = Release|x86
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Debug|x64.ActiveCfg = Debug|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Debug|x64.Build.0 = Debug|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Debug|x86.ActiveCfg = Debug|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Debug|x86.Build.0 = Debug|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Release|Any CPU.Build.0 = Release|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Release|x64.ActiveCfg = Release|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Release|x64.Build.0 = Release|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Release|x86.ActiveCfg = Release|Any CPU
{93394321-71D7-47A8-86B5-76AFF001C9A2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion source/BrowseHistoryDemo/BrowseHistoryDemo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<Name>BrowserHistoryDemoLib</Name>
</ProjectReference>
<ProjectReference Include="..\HistoryControlLib\HistoryControlLib.csproj">
<Project>{54a1d71e-3dad-4eab-b2a4-22e0c69ddb2e}</Project>
<Project>{93394321-71d7-47a8-86b5-76aff001c9a2}</Project>
<Name>HistoryControlLib</Name>
</ProjectReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<Name>Settings</Name>
</ProjectReference>
<ProjectReference Include="..\HistoryControlLib\HistoryControlLib.csproj">
<Project>{54a1d71e-3dad-4eab-b2a4-22e0c69ddb2e}</Project>
<Project>{93394321-71d7-47a8-86b5-76aff001c9a2}</Project>
<Name>HistoryControlLib</Name>
</ProjectReference>
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions source/BrowserHistoryDemoLib/BrowserHistoryDemoLib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@
<DependentUpon>BrowseHistoryDemoControl.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HistoryControlLib\HistoryControlLib.csproj">
<Project>{54a1d71e-3dad-4eab-b2a4-22e0c69ddb2e}</Project>
<Name>HistoryControlLib</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="Views\BrowseHistoryDebugView.xaml">
<SubType>Designer</SubType>
Expand All @@ -73,5 +67,11 @@
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HistoryControlLib\HistoryControlLib.csproj">
<Project>{93394321-71d7-47a8-86b5-76aff001c9a2}</Project>
<Name>HistoryControlLib</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
10 changes: 10 additions & 0 deletions source/HistoryControlLib/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)
)]
130 changes: 36 additions & 94 deletions source/HistoryControlLib/HistoryControlLib.csproj
Original file line number Diff line number Diff line change
@@ -1,112 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{54A1D71E-3DAD-4EAB-B2A4-22E0C69DDB2E}</ProjectGuid>
<OutputType>library</OutputType>
<RootNamespace>HistoryControlLib</RootNamespace>
<AssemblyName>HistoryControlLib</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworks>net4;netcoreapp3.0</TargetFrameworks>
<UseWPF>true</UseWPF>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\HistoryControlLib.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\HistoryControlLib.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>

<PropertyGroup>
<AssemblyTitle>HistoryControlLib</AssemblyTitle>
<PackageId>Dirkster.HistoryControlLib</PackageId>
<Product>HistoryControlLib</Product>
<Copyright>2018 - 2019</Copyright>
<Company>Open Source</Company>
<Description>Implements a themable recent locations (forward, backward, up. pop-up list) control a la Windows (7-10) Explorer.</Description>
<Version>1.1</Version>
<AssemblyVersion>1.1</AssemblyVersion>
<FileVersion>1.1</FileVersion>
<VersionPrefix>1.1</VersionPrefix>
<PackageProjectUrl>https://github.com/Dirkster99/HistoryControlLib</PackageProjectUrl>
<RepositoryUrl>https://github.com/Dirkster99/HistoryControlLib</RepositoryUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageTags>wpf mvvm c# .net metro black light themed control library recent locations forward backward up history control</PackageTags>
<IconUrl>https://github.com/Dirkster99/Docu/blob/master/HistoryControlLib/Branch_64x.png?raw=true</IconUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReleaseNotes>Package Update with support based on .NetCore 3 Preview 8 and .Net4.5.</PackageReleaseNotes>
<NeutralLanguage>en</NeutralLanguage>
</PropertyGroup>

<ItemGroup>
<Compile Include="Behaviors\SelectionChangedCommand.cs" />
<Compile Include="Controls\LocationsDropDown.cs" />
<Compile Include="Factory.cs" />
<Compile Include="Themes\ResourceKeys.cs" />
<Compile Include="ViewModels\Base\BaseViewModel.cs" />
<Compile Include="ViewModels\BrowseHistory.cs" />
<Compile Include="Interfaces\IBrowseHistory.cs" />
<Page Include="Themes\LightBrushs.xaml">
<Page Update="Controls\LocationsDropDown.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Styles\HistoryButtonStyle.xaml">
<Page Update="Styles\HistoryButtonStyle.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\DarkBrushs.xaml">
<Page Update="Themes\DarkBrushs.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<Page Update="Themes\DarkTheme.xaml">
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\DarkTheme.xaml">
<Generator>MSBuild:Compile</Generator>
<Page Update="Themes\Generic.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\LightTheme.xaml">
<Page Update="Themes\LightBrushs.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\LocationsDropDown.xaml">
<Page Update="Themes\LightTheme.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
55 changes: 0 additions & 55 deletions source/HistoryControlLib/Properties/AssemblyInfo.cs

This file was deleted.

Loading

0 comments on commit 7c93452

Please sign in to comment.