From 04ca3e400c3bdc6c3689a07fa928fce381a3e28c Mon Sep 17 00:00:00 2001
From: Stefan Persson <stefan.persson@telldus.se>
Date: Mon, 10 Nov 2008 17:54:55 +0000
Subject: [PATCH] Changes to make it .NET 2.0 compatible

---
 scheduler/DeviceHandler/DeviceHandler.csproj       |  9 +++++++--
 scheduler/DeviceHandler/Properties/AssemblyInfo.cs |  4 ++--
 scheduler/DeviceScheduler/DataStorage.Designer.cs  | 14 ++++++++++++--
 scheduler/DeviceScheduler/DeviceScheduler.csproj   | 11 ++++-------
 .../DeviceScheduler/Languages/Localization.cs      |  2 +-
 .../DeviceScheduler/Properties/AssemblyInfo.cs     |  4 ++--
 scheduler/DeviceScheduler/frmSchedule.cs           |  2 +-
 .../DeviceSchedulerAgent/DataStorage.Designer.cs   | 14 ++++++++++++--
 .../DeviceSchedulerAgent.csproj                    | 13 +++++--------
 .../Properties/AssemblyInfo.cs                     |  4 ++--
 10 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/scheduler/DeviceHandler/DeviceHandler.csproj b/scheduler/DeviceHandler/DeviceHandler.csproj
index 0c6c5520..8282e078 100644
--- a/scheduler/DeviceHandler/DeviceHandler.csproj
+++ b/scheduler/DeviceHandler/DeviceHandler.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{292E034F-C3B8-4CED-87DD-479040094118}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -12,9 +12,11 @@
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
+    <TargetFrameworkSubset>
+    </TargetFrameworkSubset>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,6 +44,9 @@
     <Compile Include="Handler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\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.
diff --git a/scheduler/DeviceHandler/Properties/AssemblyInfo.cs b/scheduler/DeviceHandler/Properties/AssemblyInfo.cs
index 627588c0..6e39202e 100644
--- a/scheduler/DeviceHandler/Properties/AssemblyInfo.cs
+++ b/scheduler/DeviceHandler/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2007.1.*")]
-[assembly: AssemblyFileVersion("2007.1.*")]
+[assembly: AssemblyVersion("2007.1.1.2")]
+[assembly: AssemblyFileVersion("2007.1.1.2")]
diff --git a/scheduler/DeviceScheduler/DataStorage.Designer.cs b/scheduler/DeviceScheduler/DataStorage.Designer.cs
index 9d771ac6..17d951d5 100644
--- a/scheduler/DeviceScheduler/DataStorage.Designer.cs
+++ b/scheduler/DeviceScheduler/DataStorage.Designer.cs
@@ -299,7 +299,7 @@ namespace DeviceScheduler {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
         [global::System.Serializable()]
         [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
-        public partial class JobDataTable : global::System.Data.TypedTableBase<JobRow> {
+        public partial class JobDataTable : global::System.Data.DataTable, global::System.Collections.IEnumerable {
             
             private global::System.Data.DataColumn columnID;
             
@@ -444,6 +444,11 @@ namespace DeviceScheduler {
                             ID})));
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public virtual global::System.Collections.IEnumerator GetEnumerator() {
+                return this.Rows.GetEnumerator();
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public override global::System.Data.DataTable Clone() {
                 JobDataTable cln = ((JobDataTable)(base.Clone()));
@@ -616,7 +621,7 @@ namespace DeviceScheduler {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
         [global::System.Serializable()]
         [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
-        public partial class JobActionsDataTable : global::System.Data.TypedTableBase<JobActionsRow> {
+        public partial class JobActionsDataTable : global::System.Data.DataTable, global::System.Collections.IEnumerable {
             
             private global::System.Data.DataColumn columnID;
             
@@ -734,6 +739,11 @@ namespace DeviceScheduler {
                             ID})));
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public virtual global::System.Collections.IEnumerator GetEnumerator() {
+                return this.Rows.GetEnumerator();
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public override global::System.Data.DataTable Clone() {
                 JobActionsDataTable cln = ((JobActionsDataTable)(base.Clone()));
diff --git a/scheduler/DeviceScheduler/DeviceScheduler.csproj b/scheduler/DeviceScheduler/DeviceScheduler.csproj
index 2544ba8b..ae4f4a27 100644
--- a/scheduler/DeviceScheduler/DeviceScheduler.csproj
+++ b/scheduler/DeviceScheduler/DeviceScheduler.csproj
@@ -13,7 +13,7 @@
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <PublishUrl>publish\</PublishUrl>
@@ -31,6 +31,8 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkSubset>
+    </TargetFrameworkSubset>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,13 +53,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Deployment" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
@@ -176,6 +172,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
     <None Include="DataStorage.xsc">
       <DependentUpon>DataStorage.xsd</DependentUpon>
     </None>
diff --git a/scheduler/DeviceScheduler/Languages/Localization.cs b/scheduler/DeviceScheduler/Languages/Localization.cs
index c0ff26ca..782fad31 100644
--- a/scheduler/DeviceScheduler/Languages/Localization.cs
+++ b/scheduler/DeviceScheduler/Languages/Localization.cs
@@ -66,7 +66,7 @@ namespace DeviceScheduler
                 return ResMngr.GetString(name);
 
             }
-            catch (Exception ex)
+            catch
             {
                 return "";
             }
diff --git a/scheduler/DeviceScheduler/Properties/AssemblyInfo.cs b/scheduler/DeviceScheduler/Properties/AssemblyInfo.cs
index f4779a0b..8eefc934 100644
--- a/scheduler/DeviceScheduler/Properties/AssemblyInfo.cs
+++ b/scheduler/DeviceScheduler/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2007.1.*")]
-[assembly: AssemblyFileVersion("2007.1.*")]
+[assembly: AssemblyVersion("2007.1.1.2")]
+[assembly: AssemblyFileVersion("2007.1.1.2")]
diff --git a/scheduler/DeviceScheduler/frmSchedule.cs b/scheduler/DeviceScheduler/frmSchedule.cs
index cfba4a11..2dc74ac0 100644
--- a/scheduler/DeviceScheduler/frmSchedule.cs
+++ b/scheduler/DeviceScheduler/frmSchedule.cs
@@ -280,7 +280,7 @@ namespace DeviceScheduler
                     else
                         task.SetAccountInformation(m_Job.Username, password);
                 }
-                catch (Exception e)
+                catch
                 {
                     MessageBox.Show(Localization.GetString("FailedToSetPassword"),
                         Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
diff --git a/scheduler/DeviceSchedulerAgent/DataStorage.Designer.cs b/scheduler/DeviceSchedulerAgent/DataStorage.Designer.cs
index 72d9d6ad..ac827e4e 100644
--- a/scheduler/DeviceSchedulerAgent/DataStorage.Designer.cs
+++ b/scheduler/DeviceSchedulerAgent/DataStorage.Designer.cs
@@ -299,7 +299,7 @@ namespace DeviceSchedulerAgent {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
         [global::System.Serializable()]
         [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
-        public partial class JobDataTable : global::System.Data.TypedTableBase<JobRow> {
+        public partial class JobDataTable : global::System.Data.DataTable, global::System.Collections.IEnumerable {
             
             private global::System.Data.DataColumn columnID;
             
@@ -424,6 +424,11 @@ namespace DeviceSchedulerAgent {
                             ID})));
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public virtual global::System.Collections.IEnumerator GetEnumerator() {
+                return this.Rows.GetEnumerator();
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public override global::System.Data.DataTable Clone() {
                 JobDataTable cln = ((JobDataTable)(base.Clone()));
@@ -586,7 +591,7 @@ namespace DeviceSchedulerAgent {
         [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
         [global::System.Serializable()]
         [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
-        public partial class JobActionsDataTable : global::System.Data.TypedTableBase<JobActionsRow> {
+        public partial class JobActionsDataTable : global::System.Data.DataTable, global::System.Collections.IEnumerable {
             
             private global::System.Data.DataColumn columnID;
             
@@ -704,6 +709,11 @@ namespace DeviceSchedulerAgent {
                             ID})));
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            public virtual global::System.Collections.IEnumerator GetEnumerator() {
+                return this.Rows.GetEnumerator();
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             public override global::System.Data.DataTable Clone() {
                 JobActionsDataTable cln = ((JobActionsDataTable)(base.Clone()));
diff --git a/scheduler/DeviceSchedulerAgent/DeviceSchedulerAgent.csproj b/scheduler/DeviceSchedulerAgent/DeviceSchedulerAgent.csproj
index 5a998dc7..f5503bee 100644
--- a/scheduler/DeviceSchedulerAgent/DeviceSchedulerAgent.csproj
+++ b/scheduler/DeviceSchedulerAgent/DeviceSchedulerAgent.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C06932EC-7FF5-420B-A637-BE5802E8B896}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -18,7 +18,9 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkSubset>
+    </TargetFrameworkSubset>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,13 +41,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -65,6 +61,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="DataStorage.xsc">
       <DependentUpon>DataStorage.xsd</DependentUpon>
     </None>
diff --git a/scheduler/DeviceSchedulerAgent/Properties/AssemblyInfo.cs b/scheduler/DeviceSchedulerAgent/Properties/AssemblyInfo.cs
index efbf3bd3..4a234651 100644
--- a/scheduler/DeviceSchedulerAgent/Properties/AssemblyInfo.cs
+++ b/scheduler/DeviceSchedulerAgent/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2007.1.*")]
-[assembly: AssemblyFileVersion("2007.1.*")]
+[assembly: AssemblyVersion("2007.1.1.2")]
+[assembly: AssemblyFileVersion("2007.1.1.2")]