From f114304ec9fbed6f7be7b3555f4537efd3004abd Mon Sep 17 00:00:00 2001
From: Holger Boerchers <holger@boerchers.com>
Date: Sun, 2 Sep 2018 21:33:54 +0200
Subject: [PATCH] Added Microsoft.net.Compilers

---
 MaterialModernWPF/App.xaml.cs                 |  1 -
 MaterialModernWPF/MaterialModernWPF.csproj    | 19 +++++++++++++++----
 .../MaterialModernWPF.csproj.DotSettings      |  2 ++
 .../Service/CalculationPackage.cs             |  4 ++--
 MaterialModernWPF/packages.config             |  5 +++--
 5 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 MaterialModernWPF/MaterialModernWPF.csproj.DotSettings

diff --git a/MaterialModernWPF/App.xaml.cs b/MaterialModernWPF/App.xaml.cs
index eb4a543..24f1189 100644
--- a/MaterialModernWPF/App.xaml.cs
+++ b/MaterialModernWPF/App.xaml.cs
@@ -35,7 +35,6 @@ namespace MaterialModernWPF
             return Container.Resolve<Shell>();
         }
 
-
         protected override void ConfigureModuleCatalog(IModuleCatalog moduleCatalog)
         {
             moduleCatalog.AddModule(typeof(MainModule));
diff --git a/MaterialModernWPF/MaterialModernWPF.csproj b/MaterialModernWPF/MaterialModernWPF.csproj
index a7a9d12..4586c7e 100644
--- a/MaterialModernWPF/MaterialModernWPF.csproj
+++ b/MaterialModernWPF/MaterialModernWPF.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,6 +16,8 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x64</PlatformTarget>
@@ -26,6 +29,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,6 +39,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>airballoon.ico</ApplicationIcon>
@@ -50,8 +55,8 @@
       <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.0.1044, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MaterialDesignThemes.2.4.0.1044\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.4.1.1101, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.2.4.1.1101\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="ModernWpf.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c99d0cfbea7491ef, processorArchitecture=MSIL">
       <HintPath>..\packages\ModernWpf.Core.2.0.0-beta01\lib\net40-Client\ModernWpf.Core.dll</HintPath>
@@ -68,8 +73,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -167,6 +172,12 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.9.0\build\Microsoft.Net.Compilers.props'))" />
+  </Target>
   <!-- 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">
diff --git a/MaterialModernWPF/MaterialModernWPF.csproj.DotSettings b/MaterialModernWPF/MaterialModernWPF.csproj.DotSettings
new file mode 100644
index 0000000..195c460
--- /dev/null
+++ b/MaterialModernWPF/MaterialModernWPF.csproj.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">Latest</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/MaterialModernWPF/Service/CalculationPackage.cs b/MaterialModernWPF/Service/CalculationPackage.cs
index 324458d..a83ed39 100644
--- a/MaterialModernWPF/Service/CalculationPackage.cs
+++ b/MaterialModernWPF/Service/CalculationPackage.cs
@@ -9,7 +9,7 @@ namespace MaterialModernWPF.Service
         private readonly IEventAggregator _eventAggregator;
         private bool _isSelected;
 
-        public CalculationPackage(IEventAggregator eventAggregator)
+        protected CalculationPackage(IEventAggregator eventAggregator)
         {
             _eventAggregator = eventAggregator;
         }
@@ -21,7 +21,7 @@ namespace MaterialModernWPF.Service
             get => _isSelected;
             set
             {
-                if (Equals(_isSelected, value)) return;
+                if (_isSelected == value) return;
                 _isSelected = value;
                 _eventAggregator.GetEvent<CalculationPackageSelectionChangedEvent>().Publish((this, value));
             }
diff --git a/MaterialModernWPF/packages.config b/MaterialModernWPF/packages.config
index fe6e5b5..d70d698 100644
--- a/MaterialModernWPF/packages.config
+++ b/MaterialModernWPF/packages.config
@@ -3,10 +3,11 @@
   <package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" />
   <package id="DryIoc.dll" version="2.12.10" targetFramework="net461" />
   <package id="MaterialDesignColors" version="1.1.3" targetFramework="net452" />
-  <package id="MaterialDesignThemes" version="2.4.0.1044" targetFramework="net461" />
+  <package id="MaterialDesignThemes" version="2.4.1.1101" targetFramework="net461" />
+  <package id="Microsoft.Net.Compilers" version="2.9.0" targetFramework="net461" developmentDependency="true" />
   <package id="ModernWpf.Core" version="2.0.0-beta01" targetFramework="net461" />
   <package id="Prism.Core" version="7.1.0.172-pre" targetFramework="net461" />
   <package id="Prism.DryIoc" version="7.1.0.172-pre" targetFramework="net461" />
   <package id="Prism.Wpf" version="7.1.0.172-pre" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
\ No newline at end of file