support .NET 3.5 and later

stjeong · Sep 25, 2013 · 0bb3e7c · 0bb3e7c
1 parent 8d40917
commit 0bb3e7c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 25 deletions.
diff --git a/Server/DocumentController/App.xaml.cs b/Server/DocumentController/App.xaml.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
-using System.Linq;
 using System.Windows;
 
 namespace DocumentController

diff --git a/Server/DocumentController/DocumentController.csproj b/Server/DocumentController/DocumentController.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DocumentController</RootNamespace>
     <AssemblyName>DocumentController</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -97,13 +97,9 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -152,6 +148,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="app.config" />
     <None Include="Generated\ProcessWpfCode.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
     </None>

diff --git a/Server/DocumentController/Http/MyHttpServer.cs b/Server/DocumentController/Http/MyHttpServer.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using Bend.Util;
 using System.IO;

diff --git a/Server/DocumentController/Http/SimpleHttpServer.cs b/Server/DocumentController/Http/SimpleHttpServer.cs
@@ -184,8 +184,11 @@ public HttpServer(int port) {
             this.port = port;
         }
 
-        public void listen() {
+        public void listen() 
+        {
+#pragma warning disable 0618
             listener = new TcpListener(port);
+#pragma warning restore 0618
             listener.Start();
 
             try

diff --git a/Server/DocumentController/MainWindow.xaml.cs b/Server/DocumentController/MainWindow.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
@@ -148,14 +147,7 @@ private void DeleteOldSnapshot()
         {
             if (Directory.Exists(_tempPath) == true)
             {
-                foreach (string path in Directory.EnumerateDirectories(_tempPath))
-                {
-                    try
-                    {
-                        Directory.Delete(path, true);
-                    }
-                    catch { }
-                }
+                Directory.Delete(_tempPath, true);
             }
         }
 

diff --git a/Server/DocumentController/Properties/Resources.Designer.cs b/Server/DocumentController/Properties/Resources.Designer.cs
diff --git a/Server/DocumentController/Properties/Settings.Designer.cs b/Server/DocumentController/Properties/Settings.Designer.cs
diff --git a/Server/DocumentController/app.config b/Server/DocumentController/app.config
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0.30319"/>
+    <supportedRuntime version="v2.0.50727"/>
+  </startup>
+</configuration>
diff --git a/Server/OfficePPT2007/OfficePPT2007.csproj b/Server/OfficePPT2007/OfficePPT2007.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OfficePPT2007</RootNamespace>
     <AssemblyName>OfficePPT2007</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
@@ -20,6 +20,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,7 +44,6 @@
     <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>

diff --git a/Server/OfficePPT2010/OfficePPT2010.csproj b/Server/OfficePPT2010/OfficePPT2010.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OfficePPT2010</RootNamespace>
     <AssemblyName>OfficePPT2010</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
@@ -20,6 +20,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,7 +45,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>

diff --git a/Server/OfficePPT2010/ViewerController.cs b/Server/OfficePPT2010/ViewerController.cs
@@ -75,7 +75,7 @@ public PPTDocument ReadAll(int width, int height)
             int slideNumber = 0;
 
             List<string> files = new List<string>();
-            files.AddRange(Directory.EnumerateFiles(_tempPath));
+            files.AddRange(Directory.GetFiles(_tempPath));
 
             files.Sort(CompareOnlyNumbers);