jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Changes to make it .NET 2.0 compatible

Browse source
This commit is contained in:
Stefan Persson 2008-11-10 17:54:55 +00:00
parent 6b91f5be22
commit 04ca3e400c
10 changed files with 48 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scheduler/DeviceHandler/DeviceHandler.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{292E034F-C3B8-4CED-87DD-479040094118}</ProjectGuid> <ProjectGuid>{292E034F-C3B8-4CED-87DD-479040094118}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
@ -12,9 +12,11 @@
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -42,6 +44,9 @@
<Compile Include="Handler.cs" /> <Compile Include="Handler.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.

4
scheduler/DeviceHandler/Properties/AssemblyInfo.cs
View file

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("2007.1.*")] [assembly: AssemblyVersion("2007.1.1.2")]
[assembly: AssemblyFileVersion("2007.1.*")] [assembly: AssemblyFileVersion("2007.1.1.2")]

14
scheduler/DeviceScheduler/DataStorage.Designer.cs generated
View file

@ -299,7 +299,7 @@ namespace DeviceScheduler {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
[global::System.Serializable()] [global::System.Serializable()]
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] [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; private global::System.Data.DataColumn columnID;
@ -444,6 +444,11 @@ namespace DeviceScheduler {
ID}))); ID})));
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public virtual global::System.Collections.IEnumerator GetEnumerator() {
return this.Rows.GetEnumerator();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public override global::System.Data.DataTable Clone() { public override global::System.Data.DataTable Clone() {
JobDataTable cln = ((JobDataTable)(base.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.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
[global::System.Serializable()] [global::System.Serializable()]
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] [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; private global::System.Data.DataColumn columnID;
@ -734,6 +739,11 @@ namespace DeviceScheduler {
ID}))); ID})));
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public virtual global::System.Collections.IEnumerator GetEnumerator() {
return this.Rows.GetEnumerator();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public override global::System.Data.DataTable Clone() { public override global::System.Data.DataTable Clone() {
JobActionsDataTable cln = ((JobActionsDataTable)(base.Clone())); JobActionsDataTable cln = ((JobActionsDataTable)(base.Clone()));

11
scheduler/DeviceScheduler/DeviceScheduler.csproj
View file

@ -13,7 +13,7 @@
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
@ -31,6 +31,8 @@
<IsWebBootstrapper>false</IsWebBootstrapper> <IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -51,13 +53,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Deployment" /> <Reference Include="System.Deployment" />
<Reference Include="System.Design" /> <Reference Include="System.Design" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
@ -176,6 +172,7 @@
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="app.config" />
<None Include="DataStorage.xsc"> <None Include="DataStorage.xsc">
<DependentUpon>DataStorage.xsd</DependentUpon> <DependentUpon>DataStorage.xsd</DependentUpon>
</None> </None>

2
scheduler/DeviceScheduler/Languages/Localization.cs
View file

@ -66,7 +66,7 @@ namespace DeviceScheduler
return ResMngr.GetString(name); return ResMngr.GetString(name);
} }
catch (Exception ex) catch
{ {
return ""; return "";
} }

4
scheduler/DeviceScheduler/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2007.1.*")] [assembly: AssemblyVersion("2007.1.1.2")]
[assembly: AssemblyFileVersion("2007.1.*")] [assembly: AssemblyFileVersion("2007.1.1.2")]

2
scheduler/DeviceScheduler/frmSchedule.cs
View file

@ -280,7 +280,7 @@ namespace DeviceScheduler
else else
task.SetAccountInformation(m_Job.Username, password); task.SetAccountInformation(m_Job.Username, password);
} }
catch (Exception e) catch
{ {
MessageBox.Show(Localization.GetString("FailedToSetPassword"), MessageBox.Show(Localization.GetString("FailedToSetPassword"),
Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error); Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);

14
scheduler/DeviceSchedulerAgent/DataStorage.Designer.cs generated
View file

@ -299,7 +299,7 @@ namespace DeviceSchedulerAgent {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
[global::System.Serializable()] [global::System.Serializable()]
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] [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; private global::System.Data.DataColumn columnID;
@ -424,6 +424,11 @@ namespace DeviceSchedulerAgent {
ID}))); ID})));
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public virtual global::System.Collections.IEnumerator GetEnumerator() {
return this.Rows.GetEnumerator();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public override global::System.Data.DataTable Clone() { public override global::System.Data.DataTable Clone() {
JobDataTable cln = ((JobDataTable)(base.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.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
[global::System.Serializable()] [global::System.Serializable()]
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] [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; private global::System.Data.DataColumn columnID;
@ -704,6 +709,11 @@ namespace DeviceSchedulerAgent {
ID}))); ID})));
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public virtual global::System.Collections.IEnumerator GetEnumerator() {
return this.Rows.GetEnumerator();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public override global::System.Data.DataTable Clone() { public override global::System.Data.DataTable Clone() {
JobActionsDataTable cln = ((JobActionsDataTable)(base.Clone())); JobActionsDataTable cln = ((JobActionsDataTable)(base.Clone()));

13
scheduler/DeviceSchedulerAgent/DeviceSchedulerAgent.csproj
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C06932EC-7FF5-420B-A637-BE5802E8B896}</ProjectGuid> <ProjectGuid>{C06932EC-7FF5-420B-A637-BE5802E8B896}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
@ -18,7 +18,9 @@
<UpgradeBackupLocation> <UpgradeBackupLocation>
</UpgradeBackupLocation> </UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion> <OldToolsVersion>2.0</OldToolsVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -39,13 +41,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
@ -65,6 +61,7 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="DataStorage.xsc"> <None Include="DataStorage.xsc">
<DependentUpon>DataStorage.xsd</DependentUpon> <DependentUpon>DataStorage.xsd</DependentUpon>
</None> </None>

4
scheduler/DeviceSchedulerAgent/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2007.1.*")] [assembly: AssemblyVersion("2007.1.1.2")]
[assembly: AssemblyFileVersion("2007.1.*")] [assembly: AssemblyFileVersion("2007.1.1.2")]