Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents 3bd5627 + 515d5e6 commit 30be6dde29cd22732ceba13933d0e75f4917b101 janekf committed Apr 18, 2012
@@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Pacman.Engine</RootNamespace>
<AssemblyName>Pacman.Engine</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0"?>
<configuration>
<configSections>
- <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration" />
+ <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection, Microsoft.Practices.Unity.Configuration"/>
</configSections>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
</startup>
<unity xmlns="http://schemas.microsoft.com/practices/2010/unity">
- <assembly name="Pacman" />
- <assembly name="Pacman.Engine" />
+ <assembly name="Pacman"/>
+ <assembly name="Pacman.Engine"/>
- <namespace name="Pacman" />
- <namespace name="Pacman.Views" />
- <namespace name="Pacman.ViewModels" />
- <namespace name="Pacman.Engine" />
+ <namespace name="Pacman"/>
+ <namespace name="Pacman.Views"/>
+ <namespace name="Pacman.ViewModels"/>
+ <namespace name="Pacman.Engine"/>
<container>
<register type="IShell" mapTo="ShellViewModel"/>
- <register type="IPlayerInfo" mapTo="PlayerInfo"><lifetime type="singleton" /></register>
+ <register type="IPlayerInfo" mapTo="PlayerInfo"><lifetime type="singleton"/></register>
</container>
</unity>
-</configuration>
+</configuration>
@@ -10,7 +10,7 @@ public static void Configure()
ILog logger = new ConsoleLogger();
ILog errorLogger = new ErrorLogger();
- LogManager.GetLog = type => type == typeof(ActionMessage) ? logger : errorLogger;
+ LogManager.GetLog = type => type == typeof(ViewModelBinder) ? logger : errorLogger;
}
private class ConsoleLogger : ILog
@@ -9,10 +9,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Pacman</RootNamespace>
<AssemblyName>Pacman</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -15,7 +15,11 @@ public StartViewModel(IPlayerInfo playerInfo)
public string PlayerName
{
get { return this.playerInfo.Name; }
- set { this.playerInfo.Name = value; }
+ set
+ {
+ this.playerInfo.Name = value;
+ NotifyOfPropertyChange(() => PlayerName);
+ }
}
protected IConductor Conductor

0 comments on commit 30be6dd

Please sign in to comment.