From cb40fbbb9da5baddd3099b36fa2796450bb4f66f Mon Sep 17 00:00:00 2001 From: Joan Charmant Date: Sat, 27 Jul 2013 18:10:16 +0200 Subject: [PATCH] Switched target framework to 3.5 and converted projects and solution for VS2010. --- .hgignore | 2 + .../Kinovea.SharpDevelop.sln | 0 .../Kinovea.VCSharpExpress2008.sln | 0 .../Kinovea.VS2008.sln | 0 ...wser.csproj => Kinovea.FileBrowser.csproj} | 63 +- .../Languages/FileBrowserLang.Designer.cs | 40 +- FileBrowser/Properties/Resources.Designer.cs | 47 +- .../Kinovea.Camera.DirectShow.csproj | 17 +- .../Kinovea.Camera.HTTP.csproj | 25 +- Kinovea.Camera/Kinovea.Camera.csproj | 22 +- Kinovea.Camera/Properties/Icons.Designer.cs | 219 ++--- Kinovea.VS2010.sln | 183 +++++ Kinovea.sln | 77 -- .../PlayerServer/PlayerServer.vcxproj | 160 ++++ PlayerServer/bin/Kinovea.Video.FFMpeg.dll | Bin 68608 -> 0 bytes Root/{Root.csproj => Kinovea.csproj} | 42 +- Root/Languages/RootLang.Designer.cs | 202 ++--- Root/Properties/Resources.Designer.cs | 173 ++-- Root/Properties/Settings.Designer.cs | 4 +- ...er.csproj => Kinovea.ScreenManager.csproj} | 153 ++-- .../Languages/ScreenManagerLang.Designer.cs | 700 ++++++++-------- .../Properties/Backgrounds.Designer.cs | 69 +- ScreenManager/Properties/Capture.Designer.cs | 141 ++-- ScreenManager/Properties/Drawings.Designer.cs | 363 +++------ .../Properties/Resources.Designer.cs | 753 ++++++------------ ...ervices.csproj => Kinovea.Services.csproj} | 58 +- ...{Updater.csproj => Kinovea.Updater.csproj} | 55 +- Updater/Languages/UpdaterLang.Designer.cs | 58 +- Updater/Properties/Resources.Designer.cs | 41 +- Video/{Video.csproj => Kinovea.Video.csproj} | 46 +- 30 files changed, 1796 insertions(+), 1917 deletions(-) rename Kinovea.SharpDevelop.sln => Deprecated/Kinovea.SharpDevelop.sln (100%) rename Kinovea.VCSharpExpress2008.sln => Deprecated/Kinovea.VCSharpExpress2008.sln (100%) rename Kinovea.VisualStudio2008.sln => Deprecated/Kinovea.VS2008.sln (100%) rename FileBrowser/{FileBrowser.csproj => Kinovea.FileBrowser.csproj} (77%) create mode 100644 Kinovea.VS2010.sln delete mode 100644 Kinovea.sln create mode 100644 PlayerServer/PlayerServer/PlayerServer.vcxproj delete mode 100644 PlayerServer/bin/Kinovea.Video.FFMpeg.dll rename Root/{Root.csproj => Kinovea.csproj} (91%) rename ScreenManager/{ScreenManager.csproj => Kinovea.ScreenManager.csproj} (89%) rename Services/{Services.csproj => Kinovea.Services.csproj} (75%) rename Updater/{Updater.csproj => Kinovea.Updater.csproj} (77%) rename Video/{Video.csproj => Kinovea.Video.csproj} (70%) diff --git a/.hgignore b/.hgignore index 9ad335fae..a52489385 100644 --- a/.hgignore +++ b/.hgignore @@ -21,3 +21,5 @@ FileBrowser/Languages/FileBrowserLang.resources ScreenManager/Languages/ScreenManagerLang.resources Updater/Languages/UpdaterLang.resources Tools/helptools/es/web/*.* +*.opensdf +*.sdf diff --git a/Kinovea.SharpDevelop.sln b/Deprecated/Kinovea.SharpDevelop.sln similarity index 100% rename from Kinovea.SharpDevelop.sln rename to Deprecated/Kinovea.SharpDevelop.sln diff --git a/Kinovea.VCSharpExpress2008.sln b/Deprecated/Kinovea.VCSharpExpress2008.sln similarity index 100% rename from Kinovea.VCSharpExpress2008.sln rename to Deprecated/Kinovea.VCSharpExpress2008.sln diff --git a/Kinovea.VisualStudio2008.sln b/Deprecated/Kinovea.VS2008.sln similarity index 100% rename from Kinovea.VisualStudio2008.sln rename to Deprecated/Kinovea.VS2008.sln diff --git a/FileBrowser/FileBrowser.csproj b/FileBrowser/Kinovea.FileBrowser.csproj similarity index 77% rename from FileBrowser/FileBrowser.csproj rename to FileBrowser/Kinovea.FileBrowser.csproj index 98a488286..d6cacb55a 100644 --- a/FileBrowser/FileBrowser.csproj +++ b/FileBrowser/Kinovea.FileBrowser.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,13 +10,33 @@ Properties Kinovea.FileBrowser Kinovea.FileBrowser - v2.0 + v3.5 C:\Documents and Settings\Administrateur\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis False False 4 false 1591 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + full @@ -25,6 +45,7 @@ prompt 16973824 true + AllRules.ruleset pdbonly @@ -32,6 +53,7 @@ TRACE prompt 16973824 + AllRules.ruleset bin\x86\Debug\ @@ -41,6 +63,8 @@ x86 prompt true + AllRules.ruleset + false bin\x86\Release\ @@ -50,6 +74,7 @@ x86 prompt false + AllRules.ruleset False @@ -74,6 +99,7 @@ full AnyCPU prompt + AllRules.ruleset true @@ -85,14 +111,12 @@ Full x86 prompt + AllRules.ruleset ..\Refs\ExpTreeLib.dll - - ..\Refs\LinqBridge.dll - False ..\Refs\log4net.dll @@ -104,7 +128,9 @@ - + + Form + FormCameraWizard.cs @@ -147,13 +173,13 @@ 7EC5DEBF-DF52-40F5-A9FE-1B2007B6116D Kinovea.Camera - + {8AA92254-A016-4A84-925C-F5B07E02F8A8} - Services + Kinovea.Services - + {4CBB8462-00A7-4814-AD3B-07C82EEEB0DE} - Video + Kinovea.Video @@ -193,6 +219,23 @@ Resources.Designer.cs + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + +