Skip to content

Commit

Permalink
Switched target framework to 3.5 and converted projects and solution …
Browse files Browse the repository at this point in the history
…for VS2010.
  • Loading branch information
JoanCharmant committed Jul 27, 2013
1 parent b14c2c4 commit cb40fbb
Show file tree
Hide file tree
Showing 30 changed files with 1,796 additions and 1,917 deletions.
2 changes: 2 additions & 0 deletions .hgignore
Expand Up @@ -21,3 +21,5 @@ FileBrowser/Languages/FileBrowserLang.resources
ScreenManager/Languages/ScreenManagerLang.resources
Updater/Languages/UpdaterLang.resources
Tools/helptools/es/web/*.*
*.opensdf
*.sdf
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<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>
Expand All @@ -10,13 +10,33 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Kinovea.FileBrowser</RootNamespace>
<AssemblyName>Kinovea.FileBrowser</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<SourceAnalysisOverrideSettingsFile>C:\Documents and Settings\Administrateur\Application Data\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<NoWarn>1591</NoWarn>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType>
Expand All @@ -25,13 +45,15 @@
<ErrorReport>prompt</ErrorReport>
<BaseAddress>16973824</BaseAddress>
<DebugSymbols>true</DebugSymbols>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<BaseAddress>16973824</BaseAddress>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
Expand All @@ -41,6 +63,8 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<DebugSymbols>true</DebugSymbols>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
Expand All @@ -50,6 +74,7 @@
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<DebugSymbols>false</DebugSymbols>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Optimize>False</Optimize>
Expand All @@ -74,6 +99,7 @@
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugExternals|x86' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -85,14 +111,12 @@
<DebugType>Full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="ExpTreeLib">
<HintPath>..\Refs\ExpTreeLib.dll</HintPath>
</Reference>
<Reference Include="LinqBridge">
<HintPath>..\Refs\LinqBridge.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Refs\log4net.dll</HintPath>
Expand All @@ -104,7 +128,9 @@
<ItemGroup>
<Compile Include="Commands\CommandDeleteShortcut.cs" />
<Compile Include="FileBrowser.cs" />
<Compile Include="UserInterface\FormCameraWizard.cs" />
<Compile Include="UserInterface\FormCameraWizard.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UserInterface\FormCameraWizard.Designer.cs">
<DependentUpon>FormCameraWizard.cs</DependentUpon>
</Compile>
Expand Down Expand Up @@ -147,13 +173,13 @@
<Project>7EC5DEBF-DF52-40F5-A9FE-1B2007B6116D</Project>
<Name>Kinovea.Camera</Name>
</ProjectReference>
<ProjectReference Include="..\Services\Services.csproj">
<ProjectReference Include="..\Services\Kinovea.Services.csproj">
<Project>{8AA92254-A016-4A84-925C-F5B07E02F8A8}</Project>
<Name>Services</Name>
<Name>Kinovea.Services</Name>
</ProjectReference>
<ProjectReference Include="..\Video\Video.csproj">
<ProjectReference Include="..\Video\Kinovea.Video.csproj">
<Project>{4CBB8462-00A7-4814-AD3B-07C82EEEB0DE}</Project>
<Name>Video</Name>
<Name>Kinovea.Video</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -193,6 +219,23 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</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.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</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.
Expand Down
40 changes: 20 additions & 20 deletions FileBrowser/Languages/FileBrowserLang.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 16 additions & 31 deletions FileBrowser/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cb40fbb

Please sign in to comment.