From 7b59629c9307e9dfb4b8ef64afcd12809fafd62c Mon Sep 17 00:00:00 2001
From: icedream <icedream2k9@die-optimisten.net>
Date: Sat, 18 Apr 2015 23:08:07 +0200
Subject: [PATCH] Upgrade to .NET Framework 4.5 and update dependencies.

---
 .../Addon/MinifiedMediaAddonFileInfo.cs       |  3 ++-
 .../GarrysMod.AddonCreator.csproj             | 21 +++++++++++--------
 src/addoncreator/app.config                   |  3 +++
 src/addoncreator/packages.config              |  4 ++--
 4 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 src/addoncreator/app.config

diff --git a/src/addoncreator/Addon/MinifiedMediaAddonFileInfo.cs b/src/addoncreator/Addon/MinifiedMediaAddonFileInfo.cs
index f27e809..484b33a 100644
--- a/src/addoncreator/Addon/MinifiedMediaAddonFileInfo.cs
+++ b/src/addoncreator/Addon/MinifiedMediaAddonFileInfo.cs
@@ -74,7 +74,8 @@ namespace GarrysMod.AddonCreator.Addon
                 }
             }
 
-            using (var tags = TagLib.File.Create(_tempFile))
+            using (var s = new FileStream(_tempFile, FileMode.Open, FileAccess.Read))
+            using (var tags = TagLib.File.Create(new StreamFileAbstraction(_tempFile, s, s)))
             {
                 if (tags.PossiblyCorrupt && !IgnoreCorrupted)
                 {
diff --git a/src/addoncreator/GarrysMod.AddonCreator.csproj b/src/addoncreator/GarrysMod.AddonCreator.csproj
index eb7b164..0860122 100644
--- a/src/addoncreator/GarrysMod.AddonCreator.csproj
+++ b/src/addoncreator/GarrysMod.AddonCreator.csproj
@@ -9,10 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GarrysMod.AddonCreator</RootNamespace>
     <AssemblyName>gmadsharp</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -41,20 +42,21 @@
     <OutputPath>$(SolutionDir)\bin\$(Configuration)\$(Platform)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject>GarrysMod.AddonCreator.Program</StartupObject>
+    <StartupObject>
+    </StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.6.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="policy.2.0.taglib-sharp">
-      <HintPath>$(SolutionDir)\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll</HintPath>
+      <HintPath>$(SolutionDir)\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="taglib-sharp">
-      <HintPath>$(SolutionDir)\packages\taglib.2.1.0.0\lib\taglib-sharp.dll</HintPath>
+    <Reference Include="System.IO" />
+    <Reference Include="System.Runtime" />
+    <Reference Include="TagLib.Portable, Version=2.1.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\TagLib.Portable.1.0.2\lib\portable-net45+win8+wpa81\TagLib.Portable.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -73,6 +75,7 @@
     <Compile Include="Addon\SegmentedAddonFileInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/addoncreator/app.config b/src/addoncreator/app.config
new file mode 100644
index 0000000..51278a4
--- /dev/null
+++ b/src/addoncreator/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/src/addoncreator/packages.config b/src/addoncreator/packages.config
index abbd14a..fba3a65 100644
--- a/src/addoncreator/packages.config
+++ b/src/addoncreator/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net40" />
-  <package id="taglib" version="2.1.0.0" targetFramework="net40" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+  <package id="TagLib.Portable" version="1.0.2" targetFramework="net45" />
 </packages>
\ No newline at end of file