From 80727029d6f6a2cb6f8eaf0bf7fd6abd7898bf42 Mon Sep 17 00:00:00 2001
From: icedream <icedream2k9@die-optimisten.net>
Date: Wed, 14 Jan 2015 23:02:45 +0100
Subject: [PATCH] Upgrade target to .NET Framework 4.5. Related to #1.

---
 src/updater/App.config                        |  2 +-
 src/updater/CitizenMP Server Updater.csproj   | 22 +++++--------------
 src/updater/FodyWeavers.xml                   |  2 +-
 src/updater/packages.config                   |  4 ++--
 src/wrapper/App.config                        |  2 +-
 .../CitizenMP Server Updater Wrapper.csproj   |  9 ++++----
 6 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/updater/App.config b/src/updater/App.config
index 74ade9d..d1428ad 100644
--- a/src/updater/App.config
+++ b/src/updater/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
 </configuration>
diff --git a/src/updater/CitizenMP Server Updater.csproj b/src/updater/CitizenMP Server Updater.csproj
index bdc2d1b..5727684 100644
--- a/src/updater/CitizenMP Server Updater.csproj	
+++ b/src/updater/CitizenMP Server Updater.csproj	
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CitizenMP.Server.Installer</RootNamespace>
     <AssemblyName>citizenmp_server_updater</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>95b7e825</NuGetPackageImportStamp>
     <TargetFrameworkProfile />
@@ -48,26 +48,17 @@
     <StartupObject>CitizenMP.Server.Installer.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommandLine, Version=1.9.71.2, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(SolutionDir)\packages\CommandLineParser.1.9.71\lib\net40\CommandLine.dll</HintPath>
+    <Reference Include="CommandLine">
+      <HintPath>$(SolutionDir)\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Build" />
-    <Reference Include="Microsoft.Build.Conversion.v4.0" />
-    <Reference Include="Microsoft.Build.Engine" />
-    <Reference Include="Microsoft.Build.Framework" />
-    <Reference Include="Microsoft.Build.Tasks.v4.0" />
-    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="Microsoft.Build, Version=12.0.0.0" />
+    <Reference Include="Microsoft.Build.Engine, Version=12.0.0.0" />
+    <Reference Include="Microsoft.Build.Framework, Version=12.0.0.0" />
     <Reference Include="Mono.Posix">
       <HintPath>$(SolutionDir)\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CommandLineOptions.cs" />
@@ -202,7 +193,6 @@ if [ ! -e "$(SolutionDir)src/updater/costura32"/git*.so ]; then
 fi
 </PreBuildEvent>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)packages\Fody.1.26.1\build\Fody.targets" Condition="Exists('$(SolutionDir)packages\Fody.1.26.1\build\Fody.targets')" />
   <Import Project="$(SolutionDir)packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.26.4\build\Fody.targets')" />
   <Import Project="$(SolutionDir)packages\GitVersionTask.2.0.0\Build\GitVersionTask.targets" Condition="Exists('..\..\packages\GitVersionTask.2.0.0\Build\GitVersionTask.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/updater/FodyWeavers.xml b/src/updater/FodyWeavers.xml
index de948e1..1cb90cb 100644
--- a/src/updater/FodyWeavers.xml
+++ b/src/updater/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers>
-	<Costura CreateTemporaryAssemblies="true" />
+	<Costura CreateTemporaryAssemblies="true"/>
 </Weavers>
\ No newline at end of file
diff --git a/src/updater/packages.config b/src/updater/packages.config
index c12c045..9f18ba2 100644
--- a/src/updater/packages.config
+++ b/src/updater/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
-  <package id="Costura.Fody-Mono" version="1.3.3.5" targetFramework="net40" developmentDependency="true" />
+  <package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
+  <package id="Costura.Fody-Mono" version="1.3.3.5" targetFramework="net45" developmentDependency="true" />
   <package id="Fody" version="1.26.4" targetFramework="net40" developmentDependency="true" />
   <package id="GitVersionTask" version="2.0.0" targetFramework="net40" developmentDependency="true" />
   <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
diff --git a/src/wrapper/App.config b/src/wrapper/App.config
index 74ade9d..d1428ad 100644
--- a/src/wrapper/App.config
+++ b/src/wrapper/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
 </configuration>
diff --git a/src/wrapper/CitizenMP Server Updater Wrapper.csproj b/src/wrapper/CitizenMP Server Updater Wrapper.csproj
index 83e0bdf..9d1e903 100644
--- a/src/wrapper/CitizenMP Server Updater Wrapper.csproj	
+++ b/src/wrapper/CitizenMP Server Updater Wrapper.csproj	
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CitizenMP.Server.Updater.Wrapper</RootNamespace>
     <AssemblyName>citimp_upd</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -95,8 +95,7 @@
       <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System" />
       <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.IO" />
       <Using xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Namespace="System.Xml.Linq" />
-      <Code xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Type="Fragment" Language="cs">
-<![CDATA[
+      <Code xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Type="Fragment" Language="cs"><![CDATA[
 var config = XElement.Load(Config.ItemSpec).Elements("Costura").FirstOrDefault();
 
 if (config == null) return true;
@@ -115,8 +114,8 @@ var filesToCleanup = Files.Select(f => f.ItemSpec).Where(f => !excludedAssemblie
 
 foreach (var item in filesToCleanup)
   File.Delete(item);
-]]>
-      </Code></Task>
+]]></Code>
+    </Task>
   </UsingTask>
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />