Merge pull request #10 from emoacht/develop

Develop
emoacht · Aug 22, 2015 · 01f5635 · 01f5635
2 parents 552d96b + b050234
commit 01f5635
Show file tree

Hide file tree

Showing 12 changed files with 600 additions and 589 deletions.
diff --git a/DiskGazer/App.config b/DiskGazer/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
     </startup>
 </configuration>
diff --git a/DiskGazer/Common/NotificationObject.cs b/DiskGazer/Common/NotificationObject.cs
@@ -13,7 +13,7 @@ public abstract class NotificationObject : INotifyPropertyChanged
 	{
 		public event PropertyChangedEventHandler PropertyChanged;
 
-		protected virtual void RaisePropertyChanged<T>(Expression<Func<T>> propertyExpression)
+		protected void RaisePropertyChanged<T>(Expression<Func<T>> propertyExpression)
 		{
 			if (propertyExpression == null)
 				throw new ArgumentNullException("propertyExpression");
@@ -25,7 +25,7 @@ protected virtual void RaisePropertyChanged<T>(Expression<Func<T>> propertyExpre
 			this.RaisePropertyChanged(memberExpression.Member.Name);
 		}
 
-		protected virtual void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+		protected void RaisePropertyChanged([CallerMemberName] string propertyName = null)
 		{
 			var handler = this.PropertyChanged;
 			if (handler != null)

diff --git a/DiskGazer/DiskGazer.csproj b/DiskGazer/DiskGazer.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DiskGazer</RootNamespace>
     <AssemblyName>DiskGazer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -171,7 +171,9 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">

diff --git a/DiskGazer/Library/MonitorAware.dll b/DiskGazer/Library/MonitorAware.dll