--- a/.hgignore Tue Jan 05 15:53:48 2010 +0100
+++ b/.hgignore Fri Jan 08 11:33:24 2010 +0100
@@ -3,3 +3,6 @@
glob:*.user
glob:*.sln.cache
glob:*.suo
+glob:Backup/*
+glob:_UpgradeReport_Files/*
+glob:UpgradeLog.XML
--- a/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.BaseMVVM/Commands/Commands.cs Fri Jan 08 11:33:24 2010 +0100
@@ -494,7 +494,39 @@
get;
private set;
}
-
+ public static class WebCamControl
+ {
+ static WebCamControl()
+ {
+ CamRecordLanch = new Command("CamRecordLanch");
+ CamRecordBegin = new Command("CamRecordBegin");
+ CamRecordEnd = new Command("CamRecordEnd");
+ CamRecordStop = new Command("CamRecordStop");
+ }
+ public static Command CamRecordStop
+ {
+ get;
+ private set;
+ }
+ public static Command CamRecordLanch
+ {
+ get;
+ private set;
+ }
+ public static Command CamRecordBegin
+ {
+ get;
+ private set;
+ }
+ public static Command CamRecordEnd
+ {
+ get;
+ private set;
+ }
+ public static void Initialize()
+ {
+ }
+ }
public static class ProductionView
{
@@ -546,6 +578,7 @@
ProductionTimeLine.Initialize();
VideoViewer.Initialize();
ProductionView.Initialize();
+ Commands.WebCamControl.Initialize();
}
}
--- a/client/src/Iri.Modernisation.BaseMVVM/Iri.Modernisation.BaseMVVM.csproj Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.BaseMVVM/Iri.Modernisation.BaseMVVM.csproj Fri Jan 08 11:33:24 2010 +0100
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +14,33 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Iri.Modernisation.BaseMVVM</RootNamespace>
<AssemblyName>Iri.Modernisation.BaseMVVM</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <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' ">
<DebugSymbols>true</DebugSymbols>
@@ -25,6 +52,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -35,6 +63,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="SLExtensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -54,7 +83,24 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ViewModel\ViewModel.cs" />
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+ <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="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
<Target Name="BeforeBuild">
--- a/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/Iri.Modernisation.Controls.csproj Fri Jan 08 11:33:24 2010 +0100
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +14,35 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Iri.Modernisation.Controls</RootNamespace>
<AssemblyName>Iri.Modernisation.Controls</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
- <ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
+ <ExpressionBlendVersion>3.1.11111.0</ExpressionBlendVersion>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <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 />
+ <Utf8Output>true</Utf8Output>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -26,6 +54,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,6 +65,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Berico.Windows.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=95e080ea159af4db, processorArchitecture=MSIL">
@@ -93,6 +123,7 @@
<Compile Include="ViewModel\ProductionTimeLine\ProductionTimeLineVM.cs" />
<Compile Include="ViewModel\ProductionView\ProductionViewVM.cs" />
<Compile Include="ViewModel\VideoViewer\VideoViewerVM.cs" />
+ <Compile Include="ViewModel\WebCamControl\WebCamControlVM.cs" />
<Compile Include="View\AnnotationMaker\AnnotationMaker.xaml.cs">
<DependentUpon>AnnotationMaker.xaml</DependentUpon>
</Compile>
@@ -190,135 +221,206 @@
<Compile Include="View\VideoViewer\VideoViewer.xaml.cs">
<DependentUpon>VideoViewer.xaml</DependentUpon>
</Compile>
+ <Compile Include="View\WebCamControl\WebCamControl.xaml.cs">
+ <DependentUpon>WebCamControl.xaml</DependentUpon>
+ </Compile>
</ItemGroup>
<ItemGroup>
<Page Include="View\AnnotationMaker\AnnotationMaker.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\BookTimeLine\BookTimeLine.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ClickMenu\ClickMenu.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ClickMenu\ClickMenuItem.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ClickMenu\ClickMenuPanelAnnoter.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ClickMenu\ClickMenuPanelContextualiser.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ClickMenu\ClickMenuLayer.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ClickMenu\icons\ClickMenuIcon_TextAnnotation.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ConsultationBookView\AnnotationViewer.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ConsultationBookView\ConsultationBookView.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ConsultationView\ConsultationView.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ContextualBinderLayer\ContextualBinderLayer.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\HeaderControl\ButtonHeaderControl.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\HeaderProduction\HeaderProduction.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\HeaderProduction\HeaderProductionChapter.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\HeaderProduction\HeaderProductionPartControler.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\Main\Main.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\NavigationBar\ConsultMenu.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ContextualLinkBinder.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\HeaderControl\HeaderControl.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\NavigationBar\NavigationBar.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\NavigationBar\PersonnalChutier.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\PolemicElement.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\NavigationBar\ProductionMenu.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\NavigationBar\ReferencesChutier.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\PolemicView\PolemicView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ProductionEditor\ProductionEditor.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ProductionTimeLine\CustomableIndexElement.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ProductionTimeLine\CustomableVideoElement.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ProductionTimeLine\ProductionTimeLine.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\ProductionView\ProductionView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="View\VideoViewer\VideoViewer.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
+ <Page Include="View\WebCamControl\WebCamControl.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
@@ -347,7 +449,24 @@
<ItemGroup>
<Resource Include="View\ClickMenu\icons\home.png" />
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+ <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="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
<Target Name="BeforeBuild">
--- a/client/src/Iri.Modernisation.Controls/Resources/HeaderProduction/InstructionTextRessource.Designer.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/Resources/HeaderProduction/InstructionTextRessource.Designer.cs Fri Jan 08 11:33:24 2010 +0100
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3082
+// Runtime Version:4.0.21006.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class InstructionTextRessource {
--- a/client/src/Iri.Modernisation.Controls/View/MenuableUserControl.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/MenuableUserControl.cs Fri Jan 08 11:33:24 2010 +0100
@@ -18,9 +18,9 @@
{
MouseEnter += new MouseEventHandler(MenuableUserControl_MouseEnter);
MouseLeave += new MouseEventHandler(MenuableUserControl_MouseLeave);
- MouseLeftButtonDown += new MouseButtonEventHandler(MenuableUserControl_MouseLeftButtonDown);
-
- MouseLeftButtonUp += new MouseButtonEventHandler(MenuableUserControl_MouseLeftButtonUp);
+ MouseRightButtonDown += new MouseButtonEventHandler(MenuableUserControl_MouseRightButtonDown);
+
+ MouseRightButtonUp += new MouseButtonEventHandler(MenuableUserControl_MouseRightButtonUp);
}
void MenuableUserControl_MouseLeave(object sender, MouseEventArgs e)
@@ -34,15 +34,18 @@
}
- void MenuableUserControl_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+ void MenuableUserControl_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
{
- ((MenuableViewModel)base.DataContext).MenuableUserControl_MouseLeftButtonUp(sender, e);
+ ((MenuableViewModel)base.DataContext).DisactiveContextualMenu(sender, e);
}
- void MenuableUserControl_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ void MenuableUserControl_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
{
- if(this.IsEnabled)
- ((MenuableViewModel)base.DataContext).MenuableUserControl_MouseLeftButtonDown(sender,e);
+ if (this.IsEnabled)
+ {
+ e.Handled = true;
+ ((MenuableViewModel)base.DataContext).ActiveContextualMenu(sender, e);
+ }
}
--- a/client/src/Iri.Modernisation.Controls/View/PolemicElement.xaml.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/PolemicElement.xaml.cs Fri Jan 08 11:33:24 2010 +0100
@@ -20,13 +20,18 @@
InitializeComponent();
MouseEnter += new MouseEventHandler(PolemicElementControl_MouseEnter);
-
+ MouseLeave += new MouseEventHandler(PolemicElementControl_MouseLeave);
}
+ void PolemicElementControl_MouseLeave(object sender, MouseEventArgs e)
+ {
+ LayoutRoot.Background.Opacity = 1;
+ }
+
void PolemicElementControl_MouseEnter(object sender, MouseEventArgs e)
{
- //throw new NotImplementedException();
+ LayoutRoot.Background.Opacity = 0.5;
}
--- a/client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/ProductionEditor/ProductionEditor.xaml Fri Jan 08 11:33:24 2010 +0100
@@ -1,17 +1,25 @@
-<UserControl x:Class="Iri.Modernisation.Controls.View.ProductionEditor"
+<UserControl
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:View="clr-namespace:Iri.Modernisation.Controls.View">
+ xmlns:Converter="clr-namespace:Iri.Modernisation.Controls.Converter"
+ xmlns:View="clr-namespace:Iri.Modernisation.Controls.View" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Class="Iri.Modernisation.Controls.View.ProductionEditor"
+ mc:Ignorable="d">
+ <UserControl.Resources>
+ <Converter:BoolToVisibility x:Key="BoolToVisibility"/>
+
+
+ </UserControl.Resources>
<StackPanel x:Name="ProductionViewerPanel">
<StackPanel x:Name="ProductionViewerControlPanel" Height="29" Orientation="Horizontal">
- <ToggleButton x:Name="ProductionViewerDisplayWebcamButton" Width="75" Content="Webcam"/>
+ <ToggleButton IsChecked="{Binding IsRecordMode, Mode=TwoWay}" x:Name="ProductionViewerDisplayWebcamButton" Width="75" Content="Webcam"/>
</StackPanel>
- <View:VideoViewer x:Name="VideoViewerElement" DataContext="{Binding ViewModelVideoViewer}" Margin="0,0,24,0" Height="227"/>
- <StackPanel x:Name="DescriptionSegmentPanel" Height="128">
- <TextBox IsEnabled="{Binding IsEditableIndex}" x:Name="TitleSegmentLabel" Text="{Binding SelectedIndexTitle,Mode=TwoWay}" TextWrapping="Wrap" Height="24" Margin="0,0,8,0"/>
- <TextBox IsEnabled="{Binding IsEditableIndex}" x:Name="DescriptionSegmentLabel" Text="{Binding SelectedIndexDescription,Mode=TwoWay}" TextWrapping="Wrap" Height="64" AcceptsReturn="True" VerticalScrollBarVisibility="Visible"/>
- <TextBox IsEnabled="{Binding IsEditableIndex}" x:Name="KeyWordLabel" Text="{Binding SelectedIndexTags,Mode=TwoWay}" TextWrapping="Wrap" Height="24" Margin="0,0,8,0"/>
+ <View:WebCamControl Visibility="{Binding IsRecordMode, Converter={StaticResource BoolToVisibility}}"/>
+ <View:VideoViewer x:Name="VideoViewerElement" DataContext="{Binding ViewModelVideoViewer}" Margin="0" Height="227" Width="Auto" d:LayoutOverrides="Height, VerticalMargin"/>
+ <StackPanel x:Name="DescriptionSegmentPanel" Height="128">
+ <TextBox IsEnabled="{Binding IsEditableIndex}" x:Name="TitleSegmentLabel" Text="{Binding SelectedIndexTitle, Mode=TwoWay}" TextWrapping="Wrap" Height="24" Margin="0,0,8,0"/>
+ <TextBox IsEnabled="{Binding IsEditableIndex}" x:Name="DescriptionSegmentLabel" Text="{Binding SelectedIndexDescription, Mode=TwoWay}" TextWrapping="Wrap" Height="64" AcceptsReturn="True" VerticalScrollBarVisibility="Visible"/>
+ <TextBox IsEnabled="{Binding IsEditableIndex}" x:Name="KeyWordLabel" Text="{Binding SelectedIndexTags, Mode=TwoWay}" TextWrapping="Wrap" Height="24" Margin="0,0,8,0"/>
</StackPanel>
</StackPanel>
</UserControl>
--- a/client/src/Iri.Modernisation.Controls/View/ProductionView/ProductionView.xaml.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/ProductionView/ProductionView.xaml.cs Fri Jan 08 11:33:24 2010 +0100
@@ -10,6 +10,7 @@
using System.Windows.Media.Animation;
using System.Windows.Shapes;
using Iri.Modernisation.BaseMVVM.Commands;
+
namespace Iri.Modernisation.Controls.View
{
public partial class ProductionView : UserControl
--- a/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml Fri Jan 08 11:33:24 2010 +0100
@@ -7,7 +7,7 @@
xmlns:Converter="clr-namespace:Iri.Modernisation.Controls.Converter"
xmlns:Input="clr-namespace:SLExtensions.Input;assembly=SLExtensions"
xmlns:View="clr-namespace:Iri.Modernisation.Controls.View"
- x:Class="Iri.Modernisation.Controls.View.VideoViewer" Width="240">
+ x:Class="Iri.Modernisation.Controls.View.VideoViewer" Width="223" Height="173">
<UserControl.Resources>
<Converter:BoolToVisibility x:Key="BoolToVisibility"></Converter:BoolToVisibility>
</UserControl.Resources>
@@ -15,7 +15,7 @@
<TextBlock x:Name="textBlock" Text="{Binding Info}" TextWrapping="Wrap"/>
<!-- Source="{Binding Source,Mode=TwoWay}" -->
- <MediaElement AutoPlay="{Binding AutoPlay}" x:Name="VideoScreen" Position="{Binding Position,Mode=TwoWay}" Source="{Binding USource,Mode=TwoWay}" Margin="8,0" MediaFailed="VideoScreen_MediaFailed" MarkerReached="VideoScreen_MarkerReached" />
+ <MediaElement AutoPlay="{Binding AutoPlay}" x:Name="VideoScreen" Position="{Binding Position,Mode=TwoWay}" Source="{Binding USource,Mode=TwoWay}" Margin="8,0" MediaFailed="VideoScreen_MediaFailed" MarkerReached="VideoScreen_MarkerReached" Height="146" VerticalAlignment="Top" />
<StackPanel x:Name="VideoViewerControlPanel" Orientation="Horizontal" Margin="8,0" VerticalAlignment="Bottom" HorizontalAlignment="Center">
<Button Visibility="{Binding PlayControl, Converter={StaticResource BoolToVisibility}}" Input:CommandService.Command="PreviousVideo" x:Name="VideoControlPreviousChapter" Content="<<"/>
<Button Visibility="{Binding RecordControl, Converter={StaticResource BoolToVisibility}}" Input:CommandService.Command="RecordVideo" x:Name="VideoControlRecord" Width="43" Content="O" />
--- a/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Fri Jan 08 11:33:24 2010 +0100
@@ -22,6 +22,7 @@
{
get
{
+
return (String)GetValue(SourceProperty);
}
set
@@ -48,7 +49,8 @@
Commands.GoToTime.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(GoToTime_Executed);
Commands.VideoViewer.Pause.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(Pause_Executed);
Commands.VideoViewer.Play.Executed +=new EventHandler<SLExtensions.Input.ExecutedEventArgs>(Play_Executed);
- }
+
+ }
void VideoScreen_MediaOpened(object sender, RoutedEventArgs e)
{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/Iri.Modernisation.Controls/View/WebCamControl/WebCamControl.xaml Fri Jan 08 11:33:24 2010 +0100
@@ -0,0 +1,20 @@
+<UserControl
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:Input="clr-namespace:SLExtensions.Input;assembly=SLExtensions"
+ mc:Ignorable="d"
+ x:Class="Iri.Modernisation.Controls.View.WebCamControl" Height="243" Width="223">
+
+ <Grid x:Name="LayoutRoot">
+
+ <StackPanel x:Name="VideoViewerControlPanel" Orientation="Horizontal" Margin="8,0,8,8" VerticalAlignment="Bottom">
+ <Button x:Name="VideoControlLanch" Input:CommandService.Command="CamRecordLanch" Width="43" Content="^" />
+ <Button x:Name="VideoControlRecord" Input:CommandService.Command="CamRecordBegin" Width="43" Content="O" />
+ <Button x:Name="VideoControlStop" Input:CommandService.Command="CamRecordEnd" Width="43" Content="[]" />
+ <Button x:Name="VideoControlClose" Input:CommandService.Command="CamRecordStop" Width="25" Content="X"/>
+ </StackPanel>
+ <Rectangle x:Name="VideoScreen" Fill="White" Margin="8,8,5,34" Stroke="Black"/>
+ </Grid>
+</UserControl>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/Iri.Modernisation.Controls/View/WebCamControl/WebCamControl.xaml.cs Fri Jan 08 11:33:24 2010 +0100
@@ -0,0 +1,58 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using Iri.Modernisation.BaseMVVM.Commands;
+namespace Iri.Modernisation.Controls.View
+{
+ public partial class WebCamControl : UserControl
+ {
+ private CaptureSource _captureSource;
+ public WebCamControl()
+ {
+ // Required to initialize variables
+ InitializeComponent();
+ _captureSource = new CaptureSource()
+ {
+ VideoCaptureDevice = CaptureDeviceConfiguration.GetDefaultVideoCaptureDevice(),
+ AudioCaptureDevice = CaptureDeviceConfiguration.GetDefaultAudioCaptureDevice()
+ };
+ VideoBrush vidBrush = new VideoBrush();
+ vidBrush.SetSource(_captureSource);
+ VideoScreen.Fill = vidBrush;
+
+ Commands.WebCamControl.CamRecordLanch.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(CamRecordLanch_Executed);
+ Commands.WebCamControl.CamRecordStop.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(CamRecordStop_Executed);
+ Commands.WebCamControl.CamRecordEnd.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(CamRecordEnd_Executed);
+ Commands.WebCamControl.CamRecordBegin.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(CamRecordBegin_Executed);
+ }
+
+ void CamRecordStop_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
+ {
+ _captureSource.Stop();
+ }
+
+ void CamRecordEnd_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
+ {
+
+ }
+
+ void CamRecordLanch_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
+ {
+ if (CaptureDeviceConfiguration.AllowedDeviceAccess || CaptureDeviceConfiguration.RequestDeviceAccess())
+ {
+ _captureSource.Start();
+ }
+ }
+
+ void CamRecordBegin_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
--- a/client/src/Iri.Modernisation.Controls/ViewModel/MenuableViewModel.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/MenuableViewModel.cs Fri Jan 08 11:33:24 2010 +0100
@@ -19,8 +19,8 @@
}
- public abstract void MenuableUserControl_MouseLeftButtonDown(object sender, MouseButtonEventArgs e);
- public abstract void MenuableUserControl_MouseLeftButtonUp(object sender, MouseButtonEventArgs e);
+ public abstract void ActiveContextualMenu(object sender, MouseButtonEventArgs e);
+ public abstract void DisactiveContextualMenu(object sender, MouseButtonEventArgs e);
public abstract void MenuableUserControl_MouseLeave(object sender, MouseEventArgs e);
public abstract void MenuableUserControl_MouseEnter(object sender, MouseEventArgs e);
--- a/client/src/Iri.Modernisation.Controls/ViewModel/PolemicElementVM.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/PolemicElementVM.cs Fri Jan 08 11:33:24 2010 +0100
@@ -20,10 +20,7 @@
/// </summary>
public class PolemicElementVM : MenuableViewModel
{
- /// <summary>
- /// Timer lançant le ClickMenu
- /// </summary>
- private System.Windows.Threading.DispatcherTimer DisplayTimer = new System.Windows.Threading.DispatcherTimer();
+
private MouseButtonEventArgs _selectedCoord;
/// <summary>
@@ -222,38 +219,27 @@
Description = _element.Description;
Tags = _element.Tags;
Chapter = _element.Chapter;
- DisplayTimer.Interval = new TimeSpan(0, 0, 0, 0, 500);
- DisplayTimer.Tick += new EventHandler(myDispatcherTimer_Tick);
+
if (_element is Annotation)
{
_type = ((Annotation)_element).Type.Color;
}
}
-
- /// <summary>
- /// Lors d'un Tick,c'est à dire, lors d'un appuie long sur un élément
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- void myDispatcherTimer_Tick(object sender, EventArgs e)
- {
- DisplayTimer.Stop();
- Commands.PolemicElement.ElementSelected.Execute(_selectedCoord, _element);
- }
+
-
- public override void MenuableUserControl_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+
+ public override void ActiveContextualMenu(object sender, MouseButtonEventArgs e)
{
_selectedCoord = e;
Commands.PolemicElement.SelectPolemicElement.Execute(_element);
- DisplayTimer.Start();
+ Commands.PolemicElement.ElementSelected.Execute(_selectedCoord, _element);
}
- public override void MenuableUserControl_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+ public override void DisactiveContextualMenu(object sender, MouseButtonEventArgs e)
{
- DisplayTimer.Stop();
+
Commands.ContextualBinderLayer.EndBind.Execute(Type, _element);
}
--- a/client/src/Iri.Modernisation.Controls/ViewModel/ProductionEditor/ProductionEditorVM.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/ProductionEditor/ProductionEditorVM.cs Fri Jan 08 11:33:24 2010 +0100
@@ -13,10 +13,25 @@
using System.Collections.Generic;
using System.Linq;
using Iri.Modernisation.BaseMVVM.Commands;
+
namespace Iri.Modernisation.Controls.ViewModel
{
public class ProductionEditorVM: BaseMVVM.ViewModel.ViewModel
{
+ private CaptureSource _captureSource;
+ public CaptureSource CaptureSource
+ {
+ get
+ {
+ return _captureSource;
+ }
+ set
+ {
+ _captureSource = value;
+ OnPropertyChanged("CaptureSource");
+ }
+ }
+
private VideoViewerVM _videoViewerVM;
public VideoViewerVM ViewModelVideoViewer
{
@@ -98,10 +113,36 @@
set
{
_isRecordMode = value;
+ IsEditMode = !value;
+ if (value)
+ {
+
+
+ }
+ else
+ {
+
+ }
OnPropertyChanged("IsRecordMode");
+
}
}
+ private bool _isEditMode;
+ public bool IsEditMode
+ {
+ get
+ {
+ return _isEditMode;
+ }
+ set
+ {
+ _isEditMode = value;
+ OnPropertyChanged("IsEditMode");
+ }
+ }
+
+
private bool _isEditableIndex;
public bool IsEditableIndex
{
@@ -127,6 +168,7 @@
Source = Vs.Path
};
ViewModelVideoViewer.AutoPlay = false;
+ IsRecordMode = false;
InitializeCommands();
}
private void InitializeCommands()
@@ -134,9 +176,11 @@
Commands.ProductionTimeLine.IndexSelected.Executed += new EventHandler<SLExtensions.Input.ExecutedEventArgs>(IndexSelected_Executed);
+
}
void IndexSelected_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e)
{
+
IsEditableIndex = (bool)e.Parameter;
_selectedSegmentIndex = (SegmentIndex)e.Source;
_selectedIndexTitle = _selectedSegmentIndex.Title;
--- a/client/src/Iri.Modernisation.Controls/ViewModel/VideoViewer/VideoViewerVM.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/VideoViewer/VideoViewerVM.cs Fri Jan 08 11:33:24 2010 +0100
@@ -122,6 +122,8 @@
AutoPlay = false;
}
+
+
public event EventHandler<VideoViewerVMEventArgs> Tick;
private void InitializeCommands()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/Iri.Modernisation.Controls/ViewModel/WebCamControl/WebCamControlVM.cs Fri Jan 08 11:33:24 2010 +0100
@@ -0,0 +1,25 @@
+using System;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Shapes;
+using Iri.Modernisation.BaseMVVM.Commands;
+namespace Iri.Modernisation.Controls.ViewModel
+{
+ public class WebCamControlVM : BaseMVVM.ViewModel.ViewModel
+ {
+
+
+
+ public WebCamControlVM()
+ {
+
+
+ }
+ }
+}
--- a/client/src/Iri.Modernisation.Data/Iri.Modernisation.Data.csproj Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Data/Iri.Modernisation.Data.csproj Fri Jan 08 11:33:24 2010 +0100
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +14,33 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Iri.Modernisation.Data</RootNamespace>
<AssemblyName>Iri.Modernisation.Data</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <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' ">
<DebugSymbols>true</DebugSymbols>
@@ -25,6 +52,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -35,6 +63,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Windows" />
@@ -77,7 +106,24 @@
<ItemGroup>
<None Include="ClassDiagram1.cd" />
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+ <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="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
<Target Name="BeforeBuild">
--- a/client/src/Iri.Modernisation.Lang/Iri.Modernisation.Lang.csproj Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Lang/Iri.Modernisation.Lang.csproj Fri Jan 08 11:33:24 2010 +0100
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,10 +14,33 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Iri.Modernisation.Lang</RootNamespace>
<AssemblyName>Iri.Modernisation.Lang</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <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' ">
<DebugSymbols>true</DebugSymbols>
@@ -25,6 +52,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -35,6 +63,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Windows" />
@@ -77,7 +106,24 @@
<LastGenOutput>LangResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+ <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="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
<Target Name="BeforeBuild">
--- a/client/src/Iri.Modernisation.Lang/LangResource.Designer.cs Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Lang/LangResource.Designer.cs Fri Jan 08 11:33:24 2010 +0100
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3082
+// Runtime Version:4.0.21006.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class LangResource {
@@ -29,8 +29,7 @@
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- public LangResource()
- {
+ public LangResource() {
}
/// <summary>
--- a/client/src/Iri.Modernisation.Styles/Iri.Modernisation.Styles.csproj Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.Styles/Iri.Modernisation.Styles.csproj Fri Jan 08 11:33:24 2010 +0100
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +14,34 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Iri.Modernisation.Styles</RootNamespace>
<AssemblyName>Iri.Modernisation.Styles</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <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' ">
<DebugSymbols>true</DebugSymbols>
@@ -26,6 +53,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -36,6 +64,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Berico.Windows.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=95e080ea159af4db, processorArchitecture=MSIL">
@@ -57,25 +86,52 @@
<Page Include="Templates_AnnotationMaker.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="Templates_Binder.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="Templates_CommonTemplate.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="Templates_ConsultMenu.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
<Page Include="Templates_MainWindow.xaml">
<Generator>MSBuild:MarkupCompilePass1</Generator>
<SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+ <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="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
<Target Name="BeforeBuild">
--- a/client/src/Iri.Modernisation.sln Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation.sln Fri Jan 08 11:33:24 2010 +0100
@@ -1,6 +1,6 @@
-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}") = "Iri.Modernisation", "Iri.Modernisation\Iri.Modernisation.csproj", "{ED790C83-AC5E-4357-96A1-81B468E99582}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iri.Modernisation.Controls", "Iri.Modernisation.Controls\Iri.Modernisation.Controls.csproj", "{A54E46A6-2438-46A4-8253-9B868F529052}"
--- a/client/src/Iri.Modernisation/Iri.Modernisation.csproj Tue Jan 05 15:53:48 2010 +0100
+++ b/client/src/Iri.Modernisation/Iri.Modernisation.csproj Fri Jan 08 11:33:24 2010 +0100
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Iri.Modernisation</RootNamespace>
<AssemblyName>Iri.Modernisation</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightApplication>true</SilverlightApplication>
<SupportedCultures>fr-FR;en-US</SupportedCultures>
<XapOutputs>true</XapOutputs>
@@ -28,6 +32,29 @@
<LinkedServerProject>
</LinkedServerProject>
<ExpressionBlendVersion>3.0.1927.0</ExpressionBlendVersion>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <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' ">
<DebugSymbols>true</DebugSymbols>
@@ -39,6 +66,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -49,6 +77,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Berico.Windows.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=95e080ea159af4db, processorArchitecture=MSIL">
@@ -85,10 +114,14 @@
<ApplicationDefinition Include="App.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
@@ -115,7 +148,24 @@
<ItemGroup>
<Content Include="ProjectConfig.xml" />
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+ <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="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
<Target Name="BeforeBuild">
--- a/client/test/mainInterface/Iri.Modernisation.Test.MainInterface.sln Tue Jan 05 15:53:48 2010 +0100
+++ b/client/test/mainInterface/Iri.Modernisation.Test.MainInterface.sln Fri Jan 08 11:33:24 2010 +0100
@@ -1,6 +1,6 @@
-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}") = "Iri.Modernisation.Test.MainInterface", "Iri.Modernisation.Test.MainInterface\Iri.Modernisation.Test.MainInterface.csproj", "{05A2B5AA-51FC-4ECC-B0A6-7961CD354DE3}"
EndProject
Global
--- a/client/test/mainInterface/Iri.Modernisation.Test.MainInterface/Iri.Modernisation.Test.MainInterface.csproj Tue Jan 05 15:53:48 2010 +0100
+++ b/client/test/mainInterface/Iri.Modernisation.Test.MainInterface/Iri.Modernisation.Test.MainInterface.csproj Fri Jan 08 11:33:24 2010 +0100
@@ -1,4 +1,8 @@
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ </PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Iri.Modernisation.Test.MainInterface</RootNamespace>
<AssemblyName>Iri.Modernisation.Test.MainInterface</AssemblyName>
- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<SilverlightApplication>true</SilverlightApplication>
<SupportedCultures>fr-FR;en-US</SupportedCultures>
<XapOutputs>true</XapOutputs>
@@ -27,6 +31,13 @@
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<LinkedServerProject>
</LinkedServerProject>
+ <TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
+ <SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>3.5</OldToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -38,6 +49,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -48,6 +60,7 @@
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Berico.Windows.Controls, Version=1.0.0.0, Culture=neutral, PublicKeyToken=95e080ea159af4db, processorArchitecture=MSIL">
@@ -99,10 +112,14 @@
<ApplicationDefinition Include="App.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:MarkupCompilePass1</Generator>
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
@@ -120,7 +137,7 @@
<None Include="Properties\OutOfBrowserSettings.xml" />
<None Include="Properties\AppManifest.xml" />
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" />
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.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.
<Target Name="BeforeBuild">