Skip to content
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

Jump to bottom

multitargeting with core #1

Merged
merged 3 commits into from
Jan 15, 2019
Merged

multitargeting with core #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b301ec
multitargeting with core
virzak Jan 11, 2019
be38c6d
improved for net40
virzak Jan 14, 2019
911a5c5
easy to pack
virzak Jan 15, 2019
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
79 changes: 41 additions & 38 deletions source/UserNotification.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,41 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserNotification", "UserNotification\UserNotification.csproj", "{AF255663-9320-4EBA-92CF-D0D6AAC951C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserNotificationDemo", "UserNotificationDemo\UserNotificationDemo.csproj", "{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|x86.ActiveCfg = Debug|x86
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|x86.Build.0 = Debug|x86
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|Any CPU.Build.0 = Release|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|x86.ActiveCfg = Release|x86
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|x86.Build.0 = Release|x86
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|x86.ActiveCfg = Debug|x86
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|x86.Build.0 = Debug|x86
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|Any CPU.Build.0 = Release|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|x86.ActiveCfg = Release|x86
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28407.52
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UserNotification", "UserNotification\UserNotification.csproj", "{AF255663-9320-4EBA-92CF-D0D6AAC951C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UserNotificationDemo", "UserNotificationDemo\UserNotificationDemo.csproj", "{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|x86.ActiveCfg = Debug|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Debug|x86.Build.0 = Debug|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|Any CPU.Build.0 = Release|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|x86.ActiveCfg = Release|Any CPU
{AF255663-9320-4EBA-92CF-D0D6AAC951C0}.Release|x86.Build.0 = Release|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|x86.ActiveCfg = Debug|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Debug|x86.Build.0 = Debug|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|Any CPU.Build.0 = Release|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|x86.ActiveCfg = Release|Any CPU
{6995ABFD-720F-41E7-BE8B-38F23BA4BB57}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8ECC8A60-05D9-4318-AE29-80ACF81DF548}
EndGlobalSection
EndGlobal
46 changes: 0 additions & 46 deletions source/UserNotification/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

225 changes: 27 additions & 198 deletions source/UserNotification/UserNotification.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,208 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" 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>{AF255663-9320-4EBA-92CF-D0D6AAC951C0}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UserNotification</RootNamespace>
<AssemblyName>UserNotification</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworks>net40;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>
<Prefer32Bit>false</Prefer32Bit>
<DocumentationFile>bin\Debug\UserNotification.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\UserNotification.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>

<PropertyGroup>
<AssemblyTitle>UserNotification</AssemblyTitle>
<PackageId>Dirkster.UserNotifications</PackageId>
<Product>Themable user notifications through pop-up elements</Product>
<Copyright>2012 - 2018</Copyright>
<Company>Open Source</Company>
<Description>https://github.com/Dirkster99/Edi</Description>
<VersionPrefix>1.5.0</VersionPrefix>
<VersionSuffix>alpha</VersionSuffix>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>bin\Release\UserNotification.XML</DocumentationFile>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>


<!-- Begin issue 255: The following section can be removed penging the bug: https://github.com/dotnet/wpf/issues/255 -->
<PropertyGroup>
<DisableImplicitFrameworkReferences Condition="'$(TargetFramework)' == 'net40' or '$(TargetFramework)' == 'net35'">true</DisableImplicitFrameworkReferences>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />

<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Events\ShowNotificationEvent.cs" />
<Compile Include="Interfaces\INotifyableViewModel.cs" />
<Compile Include="Local\Strings.de-DE.Designer.cs">
<DependentUpon>Strings.de-DE.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Local\Strings.Designer.cs">
<DependentUpon>Strings.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Local\Strings.es-ES.Designer.cs">
<DependentUpon>Strings.es-ES.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Local\Strings.fr-FR.Designer.cs">
<DependentUpon>Strings.fr-FR.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Local\Strings.hi.Designer.cs">
<DependentUpon>Strings.hi.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Local\Strings.it-IT.Designer.cs">
<DependentUpon>Strings.it-IT.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Local\Strings.nl-NL.Designer.cs">
<DependentUpon>Strings.nl-NL.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Local\Strings.zh-Hans.Designer.cs">
<DependentUpon>Strings.zh-Hans.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Themes\ResourceKeys.cs" />
<Compile Include="ViewModel\Base\ViewModelBase.cs" />
<Compile Include="ViewModel\NotificationViewModel.cs" />
<Compile Include="ViewModel\SendNotificationViewModel.cs" />
<Compile Include="View\NotifyableContentControl.cs" />
<Compile Include="View\NotifyableWindow.cs" />
<Compile Include="View\NotificationCloseButton.cs" />
<Compile Include="View\NotificationWindow.xaml.cs">
<DependentUpon>NotificationWindow.xaml</DependentUpon>
</Compile>
<Compile Include="View\SimpleNotificationWindow.xaml.cs">
<DependentUpon>SimpleNotificationWindow.xaml</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Page Include="Resources\CloseButtonStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\LightBrushs.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\DarkBrushs.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Generic.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\SimpleNotificationWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\close.png" />
</ItemGroup>
<ItemGroup>
<Page Include="View\NotificationWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Local\Strings.de-DE.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.de-DE.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Local\Strings.es-ES.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.es-ES.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Local\Strings.fr-FR.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.fr-FR.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Local\Strings.hi.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.hi.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Local\Strings.it-IT.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.it-IT.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Local\Strings.nl-NL.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.nl-NL.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Local\Strings.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Local\Strings.zh-Hans.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Strings.zh-Hans.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\close_x_dark.png" />
<Resource Include="Resources\close_x_light.png" />
</ItemGroup>
<ItemGroup>
<Content Include="Resources\close_x.svg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<!-- End issue 255 -->

</Project>
Loading