summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfcolin2010-05-04 08:27:42 +0000
committerfcolin2010-05-04 08:27:42 +0000
commit74bd75ab2b3426a68fbcf08e24e91f7f86cef400 (patch)
tree410a04524f214e5dcae9132d2be17751b0ed8672
parentba6bc254f78ed1ed2a599a2fcaf935c52d34bb33 (diff)
downloadivy-csharp-74bd75ab2b3426a68fbcf08e24e91f7f86cef400.zip
ivy-csharp-74bd75ab2b3426a68fbcf08e24e91f7f86cef400.tar.gz
ivy-csharp-74bd75ab2b3426a68fbcf08e24e91f7f86cef400.tar.bz2
ivy-csharp-74bd75ab2b3426a68fbcf08e24e91f7f86cef400.tar.xz
passage a Vs 2010
-rw-r--r--Ivy.sln4
-rw-r--r--Ivy/Ivy.csproj5
-rw-r--r--Ivy/Properties/Settings.Designer.cs4
-rw-r--r--Ivy/app.config56
-rw-r--r--IvyControl/IvyControl.csproj6
-rw-r--r--IvyDaemon/IvyDaemon.csproj6
-rw-r--r--IvyDaemon/Properties/Settings.Designer.cs4
-rw-r--r--IvyFilter/IvyFilter.csproj6
-rw-r--r--IvyPerf/IvyPerf.csproj20
-rw-r--r--IvyProbe/IvyProbe.csproj5
-rw-r--r--IvyProbe/Properties/Settings.Designer.cs4
-rw-r--r--IvyProbeConsole/IvyProbeConsole.csproj6
-rw-r--r--IvyProbeConsole/Properties/Settings.Designer.cs4
-rw-r--r--getopt/getopt.csproj6
-rw-r--r--getopt/getopt.csproj.user3
-rw-r--r--getopt/vssver2.sccbin142 -> 142 bytes
16 files changed, 81 insertions, 58 deletions
diff --git a/Ivy.sln b/Ivy.sln
index 18ed02a..a2ff75f 100644
--- a/Ivy.sln
+++ b/Ivy.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyDaemon", "IvyDaemon\IvyDaemon.csproj", "{B10AB29F-D678-4472-9BA3-D627262E14E1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IvyPerf", "IvyPerf\IvyPerf.csproj", "{839C9A55-7EFD-4326-95C3-2960DF390FF2}"
diff --git a/Ivy/Ivy.csproj b/Ivy/Ivy.csproj
index a6bdbdc..2063191 100644
--- a/Ivy/Ivy.csproj
+++ b/Ivy/Ivy.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -48,8 +49,6 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <TargetFrameworkSubset>
- </TargetFrameworkSubset>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
diff --git a/Ivy/Properties/Settings.Designer.cs b/Ivy/Properties/Settings.Designer.cs
index 6e12b49..0cda32a 100644
--- a/Ivy/Properties/Settings.Designer.cs
+++ b/Ivy/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1434
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -12,7 +12,7 @@ namespace IvyBus.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Ivy/app.config b/Ivy/app.config
index 0746898..0df9489 100644
--- a/Ivy/app.config
+++ b/Ivy/app.config
@@ -1,30 +1,30 @@
<?xml version="1.0"?>
<configuration>
- <configSections>
- <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <section name="IvyBus.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
- </sectionGroup>
- </configSections>
- <applicationSettings>
- <IvyBus.Properties.Settings>
- <setting name="IvyProtocolVersion" serializeAs="String">
- <value>3</value>
- </setting>
- <setting name="IvyPing" serializeAs="String">
- <value>False</value>
- </setting>
- <setting name="IvyDebug" serializeAs="String">
- <value>False</value>
- </setting>
- <setting name="IvyBus" serializeAs="String">
- <value/>
- </setting>
- <setting name="AppName" serializeAs="String">
- <value/>
- </setting>
- <setting name="ReadyMessage" serializeAs="String">
- <value/>
- </setting>
- </IvyBus.Properties.Settings>
- </applicationSettings>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+ <configSections>
+ <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <section name="IvyBus.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+ </sectionGroup>
+ </configSections>
+ <applicationSettings>
+ <IvyBus.Properties.Settings>
+ <setting name="IvyProtocolVersion" serializeAs="String">
+ <value>3</value>
+ </setting>
+ <setting name="IvyPing" serializeAs="String">
+ <value>False</value>
+ </setting>
+ <setting name="IvyDebug" serializeAs="String">
+ <value>False</value>
+ </setting>
+ <setting name="IvyBus" serializeAs="String">
+ <value/>
+ </setting>
+ <setting name="AppName" serializeAs="String">
+ <value/>
+ </setting>
+ <setting name="ReadyMessage" serializeAs="String">
+ <value/>
+ </setting>
+ </IvyBus.Properties.Settings>
+ </applicationSettings>
+ <startup/></configuration>
diff --git a/IvyControl/IvyControl.csproj b/IvyControl/IvyControl.csproj
index ff99f72..686c269 100644
--- a/IvyControl/IvyControl.csproj
+++ b/IvyControl/IvyControl.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,7 +18,8 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/IvyDaemon/IvyDaemon.csproj b/IvyDaemon/IvyDaemon.csproj
index 1ecde29..65b9f1e 100644
--- a/IvyDaemon/IvyDaemon.csproj
+++ b/IvyDaemon/IvyDaemon.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -34,7 +35,7 @@
<GenerateManifests>true</GenerateManifests>
<SignManifests>false</SignManifests>
<IsWebBootstrapper>true</IsWebBootstrapper>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyDaemon\</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
@@ -53,6 +54,7 @@
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
diff --git a/IvyDaemon/Properties/Settings.Designer.cs b/IvyDaemon/Properties/Settings.Designer.cs
index afa5d91..71dbeff 100644
--- a/IvyDaemon/Properties/Settings.Designer.cs
+++ b/IvyDaemon/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1433
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -12,7 +12,7 @@ namespace IvyDaemon.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/IvyFilter/IvyFilter.csproj b/IvyFilter/IvyFilter.csproj
index 55deff5..57de8da 100644
--- a/IvyFilter/IvyFilter.csproj
+++ b/IvyFilter/IvyFilter.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,7 +18,8 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
diff --git a/IvyPerf/IvyPerf.csproj b/IvyPerf/IvyPerf.csproj
index feaa087..3470225 100644
--- a/IvyPerf/IvyPerf.csproj
+++ b/IvyPerf/IvyPerf.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -34,7 +35,10 @@
<GenerateManifests>false</GenerateManifests>
<SignManifests>false</SignManifests>
<IsWebBootstrapper>true</IsWebBootstrapper>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetZone>LocalIntranet</TargetZone>
+ <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyPerf\</PublishUrl>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
@@ -50,8 +54,6 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetZone>LocalIntranet</TargetZone>
- <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
@@ -126,6 +128,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
<Visible>False</Visible>
<ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@@ -141,6 +148,11 @@
<ProductName>.NET Framework 3.5</ProductName>
<Install>false</Install>
</BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="Properties\app.manifest" />
diff --git a/IvyProbe/IvyProbe.csproj b/IvyProbe/IvyProbe.csproj
index 86dcf9b..ef69dc1 100644
--- a/IvyProbe/IvyProbe.csproj
+++ b/IvyProbe/IvyProbe.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -35,7 +36,7 @@
</ManifestKeyFile>
<GenerateManifests>true</GenerateManifests>
<SignManifests>false</SignManifests>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<PublishUrl>\\samba\fcolin\public_html\ClickOnce\IvyProbe\</PublishUrl>
<Install>true</Install>
diff --git a/IvyProbe/Properties/Settings.Designer.cs b/IvyProbe/Properties/Settings.Designer.cs
index 498601b..b907809 100644
--- a/IvyProbe/Properties/Settings.Designer.cs
+++ b/IvyProbe/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1433
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -12,7 +12,7 @@ namespace IvyProbe.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/IvyProbeConsole/IvyProbeConsole.csproj b/IvyProbeConsole/IvyProbeConsole.csproj
index 33a7b5b..d292d65 100644
--- a/IvyProbeConsole/IvyProbeConsole.csproj
+++ b/IvyProbeConsole/IvyProbeConsole.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
@@ -48,8 +49,9 @@
<InstallUrl>http://www.tls.cena.fr/~fcolin/ClickOnce/IvyProbeConsole/</InstallUrl>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<BootstrapperEnabled>true</BootstrapperEnabled>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
<ApplicationRevision>3</ApplicationRevision>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
diff --git a/IvyProbeConsole/Properties/Settings.Designer.cs b/IvyProbeConsole/Properties/Settings.Designer.cs
index 11b290c..9928359 100644
--- a/IvyProbeConsole/Properties/Settings.Designer.cs
+++ b/IvyProbeConsole/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Ce code a été généré par un outil.
-// Version du runtime :2.0.50727.1433
+// Version du runtime :4.0.30319.1
//
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si
// le code est régénéré.
@@ -12,7 +12,7 @@ namespace IvyProbeConsole.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/getopt/getopt.csproj b/getopt/getopt.csproj
index 5f312f0..7c5d631 100644
--- a/getopt/getopt.csproj
+++ b/getopt/getopt.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
@@ -30,7 +31,8 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
diff --git a/getopt/getopt.csproj.user b/getopt/getopt.csproj.user
index cfcf828..a9f6b49 100644
--- a/getopt/getopt.csproj.user
+++ b/getopt/getopt.csproj.user
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastOpenVersion>7.10.3077</LastOpenVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/getopt/vssver2.scc b/getopt/vssver2.scc
index 6ff394e..9e78308 100644
--- a/getopt/vssver2.scc
+++ b/getopt/vssver2.scc
Binary files differ