Move xaml stuff to Xaml folder

This commit is contained in:
Antony Male 2014-03-15 14:11:27 +00:00
parent 907c59acf1
commit 06fa5b646d
7 changed files with 6 additions and 6 deletions

View File

@ -39,7 +39,7 @@ namespace Stylet
public BootstrapperBase()
{
var rc = new ResourceDictionary() { Source = new Uri("pack://application:,,,/Stylet;component/StyletResourceDictionary.xaml", UriKind.Absolute) };
var rc = new ResourceDictionary() { Source = new Uri("pack://application:,,,/Stylet;component/Xaml/StyletResourceDictionary.xaml", UriKind.Absolute) };
this.MergedDictionaries.Add(rc);
this.Start();

View File

@ -43,17 +43,17 @@
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="ActionExtension.cs" />
<Compile Include="Xaml\ActionExtension.cs" />
<Compile Include="AssemblySource.cs" />
<Compile Include="BindableCollection.cs" />
<Compile Include="BootstrapperBase.cs" />
<Compile Include="CommandAction.cs" />
<Compile Include="Xaml\CommandAction.cs" />
<Compile Include="Conductor.cs" />
<Compile Include="ConductorAllActive.cs" />
<Compile Include="ConductorBase.cs" />
<Compile Include="ConductorBaseWithActiveItem.cs" />
<Compile Include="ConductorOneActive.cs" />
<Compile Include="EventAction.cs" />
<Compile Include="Xaml\EventAction.cs" />
<Compile Include="EventAggregator.cs" />
<Compile Include="Execute.cs" />
<Compile Include="ExpressionExtensions.cs" />
@ -78,7 +78,7 @@
<Compile Include="WindowManager.cs" />
</ItemGroup>
<ItemGroup>
<Page Include="StyletResourceDictionary.xaml">
<Page Include="Xaml\StyletResourceDictionary.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>

View File

@ -131,7 +131,7 @@ namespace StyletUnitTests
this.conductor.ActivateItem(screen.Object);
this.conductor.DeactivateItem(screen.Object, false);
screen.Verify(x => x.Deactivate(false));
Assert.That(this.conductor.Items, Is.EquivalentTo(new[] { screen.Object }))
Assert.That(this.conductor.Items, Is.EquivalentTo(new[] { screen.Object }));
}
[Test]