From 4881e4c96a25cf84d202c6a8b2c3915f2dde0dac Mon Sep 17 00:00:00 2001
From: LORDofDOOM <tb@bbz-int.de>
Date: Thu, 23 Nov 2017 00:54:44 +0100
Subject: [PATCH] [Core] Add netstandard20 target to OpenHardwareMonitorLib,
 drop old OpenHardwareMonitorLibNetStandard, drop App.config (not needed),
 upgrade sln to VS15 (mixed targets dont works in older VS versions), add
 RuntimeIdentifiers to prevent build errors in current VS

---
 App.config                               |   7 --
 OpenHardwareMonitor.csproj               |   5 +-
 OpenHardwareMonitor.sln                  |  14 ++-
 OpenHardwareMonitorLib.csproj            | 105 +++++---------------
 OpenHardwareMonitorLibNetStandard.csproj | 117 -----------------------
 OpenHardwareMonitorLibNetStandard.sln    |  57 -----------
 packages.config                          |   2 +-
 7 files changed, 38 insertions(+), 269 deletions(-)
 delete mode 100644 App.config
 delete mode 100644 OpenHardwareMonitorLibNetStandard.csproj
 delete mode 100644 OpenHardwareMonitorLibNetStandard.sln

diff --git a/App.config b/App.config
deleted file mode 100644
index 736209e..0000000
--- a/App.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <startup>
-    <supportedRuntime version="v4.0" />
-    <supportedRuntime version="v2.0.50727"/>
-  </startup>
-</configuration>
diff --git a/OpenHardwareMonitor.csproj b/OpenHardwareMonitor.csproj
index 8a0198a..e74d263 100644
--- a/OpenHardwareMonitor.csproj
+++ b/OpenHardwareMonitor.csproj
@@ -7,6 +7,7 @@
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>WinExe</OutputType>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
     <NoStandardLibraries>false</NoStandardLibraries>
     <AssemblyName>OpenHardwareMonitor</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
@@ -62,8 +63,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.10.0.3\lib\net20\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration.Install" />
@@ -175,7 +175,6 @@
     <EmbeddedResource Include="Resources\nvidia.png" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
     <None Include="packages.config" />
     <None Include="Resources\app.manifest">
       <SubType>Designer</SubType>
diff --git a/OpenHardwareMonitor.sln b/OpenHardwareMonitor.sln
index e9bc643..a768d98 100644
--- a/OpenHardwareMonitor.sln
+++ b/OpenHardwareMonitor.sln
@@ -1,7 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitorLib", "OpenHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2009
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenHardwareMonitorLib", "OpenHardwareMonitorLib.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitor", "OpenHardwareMonitor.csproj", "{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -44,20 +46,22 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6A8EF661-2BD7-498F-8FB9-28182B3B0BE5}
+	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = OpenHardwareMonitor.csproj
 		Policies = $0
 		$0.DotNetNamingPolicy = $1
 		$1.DirectoryNamespaceAssociation = None
 		$1.ResourceNamePolicy = FileFormatDefault
-		$0.TextStylePolicy = $2
+		$0.TextStylePolicy = $3
 		$2.FileWidth = 120
 		$2.TabWidth = 2
 		$2.NoTabsAfterNonTabs = True
 		$2.inheritsSet = VisualStudio
 		$2.inheritsScope = text/plain
 		$2.scope = text/plain
-		$0.TextStylePolicy = $3
 		$3.inheritsSet = null
 		$3.scope = text/x-csharp
 		$0.CSharpFormattingPolicy = $4
diff --git a/OpenHardwareMonitorLib.csproj b/OpenHardwareMonitorLib.csproj
index fc4f117..678286c 100644
--- a/OpenHardwareMonitorLib.csproj
+++ b/OpenHardwareMonitorLib.csproj
@@ -1,63 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B0397530-545A-471D-BB74-027AE456DF1A}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <RootNamespace>OpenHardwareMonitor</RootNamespace>
     <AssemblyName>OpenHardwareMonitorLib</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <OutputTypeEx>Library</OutputTypeEx>
+    <RuntimeIdentifiers>win</RuntimeIdentifiers>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>Bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>Bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System" />
     <Reference Include="System.Management" />
   </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
+    <PackageReference Include="System.IO.Ports" Version="4.4.0" />
+    <PackageReference Include="System.Management" Version="4.5.0-preview1-25825-08" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0-preview2-25707-02" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+  </ItemGroup>
+
+
   <ItemGroup>
     <Compile Include="Collections\Pair.cs" />
     <Compile Include="Collections\RingCollection.cs" />
@@ -144,37 +111,17 @@
     <Compile Include="Collections\IReadOnlyArray.cs" />
     <Compile Include="Collections\ListSet.cs" />
     <Compile Include="Collections\ReadOnlyArray.cs" />
+    <Compile Include="Hardware\ThreadAffinity.cs" />
     <Compile Include="Properties\AssemblyLibInfo.cs" />
     <Compile Include="Properties\AssemblyVersion.cs" />
-    <Compile Include="Hardware\ThreadAffinity.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="Hardware\WinRing0.sys" />
     <EmbeddedResource Include="Hardware\WinRing0x64.sys" />
   </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>
-  -->
+
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/OpenHardwareMonitorLibNetStandard.csproj b/OpenHardwareMonitorLibNetStandard.csproj
deleted file mode 100644
index b4946a6..0000000
--- a/OpenHardwareMonitorLibNetStandard.csproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-	<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
-    <PackageReference Include="System.IO.Ports" Version="4.4.0" />
-    <PackageReference Include="System.Management" Version="4.5.0-preview1-25825-08" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0-preview2-25707-02" />
-    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
-  </ItemGroup>  
-  
-  <ItemGroup>
-    <Compile Include="Collections\Pair.cs" />
-    <Compile Include="Collections\RingCollection.cs" />
-    <Compile Include="Hardware\ATI\ADL.cs" />
-    <Compile Include="Hardware\ATI\ATIGPU.cs" />
-    <Compile Include="Hardware\ATI\ATIGroup.cs" />
-    <Compile Include="Hardware\Control.cs" />
-    <Compile Include="Hardware\CPU\AMD17CPU.cs" />
-    <Compile Include="Hardware\FirmwareTable.cs" />
-    <Compile Include="Hardware\HDD\DebugSmart.cs" />
-    <Compile Include="Hardware\HDD\DriveAttributeValue.cs" />
-    <Compile Include="Hardware\HDD\DriveThresholdValue.cs" />
-    <Compile Include="Hardware\HDD\HDDGeneric.cs" />
-    <Compile Include="Hardware\HDD\ISmart.cs" />
-    <Compile Include="Hardware\HDD\SmartAttribute.cs" />
-    <Compile Include="Hardware\HDD\SmartNames.cs" />
-    <Compile Include="Hardware\HDD\RequireSmartAttribute.cs" />
-    <Compile Include="Hardware\HDD\NamePrefixAttribute.cs" />
-    <Compile Include="Hardware\HDD\SSDIndilinx.cs" />
-    <Compile Include="Hardware\HDD\SSDIntel.cs" />
-    <Compile Include="Hardware\HDD\SSDMicron.cs" />
-    <Compile Include="Hardware\HDD\SSDPlextor.cs" />
-    <Compile Include="Hardware\HDD\SSDSamsung.cs" />
-    <Compile Include="Hardware\HDD\SSDSandforce.cs" />
-    <Compile Include="Hardware\IControl.cs" />
-    <Compile Include="Hardware\IOControlCode.cs" />
-    <Compile Include="Hardware\Computer.cs" />
-    <Compile Include="Hardware\CPU\AMDCPU.cs" />
-    <Compile Include="Hardware\CPU\GenericCPU.cs" />
-    <Compile Include="Hardware\CPU\AMD0FCPU.cs" />
-    <Compile Include="Hardware\CPU\AMD10CPU.cs" />
-    <Compile Include="Hardware\CPU\CPUGroup.cs" />
-    <Compile Include="Hardware\CPU\CPUID.cs" />
-    <Compile Include="Hardware\CPU\CPULoad.cs" />
-    <Compile Include="Hardware\CPU\IntelCPU.cs" />
-    <Compile Include="Hardware\LPC\LPCPort.cs" />
-    <Compile Include="Hardware\LPC\NCT677X.cs" />
-    <Compile Include="Hardware\Mainboard\GigabyteTAMG.cs" />
-    <Compile Include="Hardware\Mainboard\Identification.cs" />
-    <Compile Include="Hardware\Opcode.cs" />
-    <Compile Include="Hardware\OperatingSystem.cs" />
-    <Compile Include="Hardware\RAM\GenericRAM.cs" />
-    <Compile Include="Hardware\RAM\RAMGroup.cs" />
-    <Compile Include="Hardware\Ring0.cs" />
-    <Compile Include="Hardware\KernelDriver.cs" />
-    <Compile Include="Hardware\Hardware.cs" />
-    <Compile Include="Hardware\HDD\AbstractHarddrive.cs" />
-    <Compile Include="Hardware\HDD\HarddriveGroup.cs" />
-    <Compile Include="Hardware\HDD\WindowsSmart.cs" />
-    <Compile Include="Hardware\Heatmaster\Heatmaster.cs" />
-    <Compile Include="Hardware\Heatmaster\HeatmasterGroup.cs" />
-    <Compile Include="Hardware\IComputer.cs" />
-    <Compile Include="Hardware\Identifier.cs" />
-    <Compile Include="Hardware\IElement.cs" />
-    <Compile Include="Hardware\IGroup.cs" />
-    <Compile Include="Hardware\IHardware.cs" />
-    <Compile Include="Hardware\IParameter.cs" />
-    <Compile Include="Hardware\ISensor.cs" />
-    <Compile Include="Hardware\IVisitor.cs" />
-    <Compile Include="Hardware\LPC\Chip.cs" />
-    <Compile Include="Hardware\LPC\F718XX.cs" />
-    <Compile Include="Hardware\LPC\ISuperIO.cs" />
-    <Compile Include="Hardware\LPC\IT87XX.cs" />
-    <Compile Include="Hardware\LPC\LMSensors.cs" />
-    <Compile Include="Hardware\LPC\LPCIO.cs" />
-    <Compile Include="Hardware\LPC\W836XX.cs" />
-    <Compile Include="Hardware\Mainboard\Mainboard.cs" />
-    <Compile Include="Hardware\Mainboard\MainboardGroup.cs" />
-    <Compile Include="Hardware\Mainboard\Manufacturer.cs" />
-    <Compile Include="Hardware\Mainboard\Model.cs" />
-    <Compile Include="Hardware\SMBIOS.cs" />
-    <Compile Include="Hardware\Mainboard\SuperIOHardware.cs" />
-    <Compile Include="Hardware\Nvidia\NVAPI.cs" />
-    <Compile Include="Hardware\Nvidia\NvidiaGPU.cs" />
-    <Compile Include="Hardware\Nvidia\NvidiaGroup.cs" />
-    <Compile Include="Hardware\Parameter.cs" />
-    <Compile Include="Hardware\Sensor.cs" />
-    <Compile Include="Hardware\SensorVisitor.cs" />
-    <Compile Include="Hardware\TBalancer\FTD2XX.cs" />
-    <Compile Include="Hardware\TBalancer\TBalancer.cs" />
-    <Compile Include="Hardware\TBalancer\TBalancerGroup.cs" />
-    <Compile Include="Hardware\ISettings.cs" />
-    <Compile Include="Hardware\HexStringArray.cs" />
-    <Compile Include="Collections\IReadOnlyArray.cs" />
-    <Compile Include="Collections\ListSet.cs" />
-    <Compile Include="Collections\ReadOnlyArray.cs" />
-    <Compile Include="Hardware\ThreadAffinity.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Hardware\WinRing0.sys" />
-    <EmbeddedResource Include="Hardware\WinRing0x64.sys" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/OpenHardwareMonitorLibNetStandard.sln b/OpenHardwareMonitorLibNetStandard.sln
deleted file mode 100644
index ebbf40f..0000000
--- a/OpenHardwareMonitorLibNetStandard.sln
+++ /dev/null
@@ -1,57 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenHardwareMonitorLib", "OpenHardwareMonitorLibNetStandard.csproj", "{B0397530-545A-471D-BB74-027AE456DF1A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0397530-545A-471D-BB74-027AE456DF1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5E0C1F7-9E9B-46F2-AC88-8C9C1C923880}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCC43E58-E473-403E-A84D-63FEDC723040}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCC43E58-E473-403E-A84D-63FEDC723040}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCC43E58-E473-403E-A84D-63FEDC723040}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCC43E58-E473-403E-A84D-63FEDC723040}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4554296-094E-4CAC-8EAE-44EB250666C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4554296-094E-4CAC-8EAE-44EB250666C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4554296-094E-4CAC-8EAE-44EB250666C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4554296-094E-4CAC-8EAE-44EB250666C6}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = OpenHardwareMonitor.csproj
-		Policies = $0
-		$0.DotNetNamingPolicy = $1
-		$1.DirectoryNamespaceAssociation = None
-		$1.ResourceNamePolicy = FileFormatDefault
-		$0.TextStylePolicy = $2
-		$2.FileWidth = 120
-		$2.TabWidth = 2
-		$2.NoTabsAfterNonTabs = True
-		$2.inheritsSet = VisualStudio
-		$2.inheritsScope = text/plain
-		$2.scope = text/plain
-		$0.TextStylePolicy = $3
-		$3.inheritsSet = null
-		$3.scope = text/x-csharp
-		$0.CSharpFormattingPolicy = $4
-		$4.inheritsSet = Mono
-		$4.inheritsScope = text/x-csharp
-		$4.scope = text/x-csharp
-	EndGlobalSection
-EndGlobal
diff --git a/packages.config b/packages.config
index 86df876..c332ba7 100644
--- a/packages.config
+++ b/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net20" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>
\ No newline at end of file