Browse Source

Start fixing broken sample projects

pull/2519/head
Jumar Macato 7 years ago
parent
commit
545053c7b1
No known key found for this signature in database GPG Key ID: B19884DAC3A5BF3F
  1. 2
      build/EmbedXaml.props
  2. 1
      samples/BindingDemo/BindingDemo.csproj
  3. 4
      samples/RemoteDemo/RemoteDemo.csproj
  4. 4
      samples/RenderDemo/App.xaml
  5. 13
      samples/RenderDemo/MainWindow.xaml
  6. 7
      samples/RenderDemo/Pages/AnimationsPage.xaml
  7. 14
      samples/RenderDemo/Pages/ClippingPage.xaml
  8. 6
      samples/RenderDemo/Pages/DrawingPage.xaml
  9. 1
      samples/RenderDemo/RenderDemo.csproj
  10. 1
      samples/VirtualizationDemo/VirtualizationDemo.csproj

2
build/EmbedXaml.props

@ -8,4 +8,4 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</AvaloniaResource> </AvaloniaResource>
</ItemGroup> </ItemGroup>
</Project> </Project>

1
samples/BindingDemo/BindingDemo.csproj

@ -14,4 +14,5 @@
<Import Project="..\..\build\ReactiveUI.props" /> <Import Project="..\..\build\ReactiveUI.props" />
<Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" /> <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
<Import Project="..\..\build\ReferenceCoreLibraries.props" /> <Import Project="..\..\build\ReferenceCoreLibraries.props" />
<Import Project="..\..\build\BuildTargets.targets" />
</Project> </Project>

4
samples/RemoteDemo/RemoteDemo.csproj

@ -1,14 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" /> <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\build\SampleApp.props" /> <Import Project="..\..\build\SampleApp.props" />
<Import Project="..\..\build\ReferenceCoreLibraries.props" /> <Import Project="..\..\build\ReferenceCoreLibraries.props" />
<Import Project="..\..\build\BuildTargets.targets" />
</Project> </Project>

4
samples/RenderDemo/App.xaml

@ -1,4 +1,6 @@
<Application xmlns="https://github.com/avaloniaui"> <Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="RenderDemo.App">
<Application.Styles> <Application.Styles>
<StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/> <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
<StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/> <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>

13
samples/RenderDemo/MainWindow.xaml

@ -1,8 +1,11 @@
<Window xmlns="https://github.com/avaloniaui" <Window
Title="AvaloniaUI Rendering Test" xmlns="https://github.com/avaloniaui"
xmlns:pages="clr-namespace:RenderDemo.Pages" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Width="800" x:Class="RenderDemo.MainWindow"
Height="600"> Title="AvaloniaUI Rendering Test"
xmlns:pages="clr-namespace:RenderDemo.Pages"
Width="800"
Height="600">
<DockPanel> <DockPanel>
<Menu DockPanel.Dock="Top"> <Menu DockPanel.Dock="Top">
<MenuItem Header="Rendering"> <MenuItem Header="Rendering">

7
samples/RenderDemo/Pages/AnimationsPage.xaml

@ -1,6 +1,7 @@
<UserControl <UserControl
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="RenderDemo.Pages.AnimationsPage">
<UserControl.Styles> <UserControl.Styles>
<Styles> <Styles>
<Styles.Resources> <Styles.Resources>

14
samples/RenderDemo/Pages/ClippingPage.xaml

@ -1,9 +1,11 @@
<UserControl <UserControl
xmlns="https://github.com/avaloniaui"> xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="RenderDemo.Pages.ClippingPage">
<Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto"> <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto">
<Grid.Styles> <Grid.Styles>
<Styles> <Styles>
<Style Selector="Border#clipped :pointerover"> <Style Selector="Border#clipped:pointerover">
<Setter Property="Border.Background" Value="Crimson"/> <Setter Property="Border.Background" Value="Crimson"/>
</Style> </Style>
<Style Selector="Border#clipChild"> <Style Selector="Border#clipChild">
@ -17,11 +19,7 @@ xmlns="https://github.com/avaloniaui">
</Style> </Style>
</Styles> </Styles>
</Grid.Styles> </Grid.Styles>
<Border Name="clipped" <Border Name="clipped" Background="Yellow" Width="100" Height="100" Clip="M 58.625 0.07421875
Background="Yellow"
Width="100"
Height="100"
Clip="M 58.625 0.07421875
C 50.305778 0.26687364 42.411858 7.0346526 41.806641 15.595703 C 50.305778 0.26687364 42.411858 7.0346526 41.806641 15.595703
C 42.446442 22.063923 39.707425 13.710754 36.982422 12.683594 C 42.446442 22.063923 39.707425 13.710754 36.982422 12.683594
C 29.348395 6.1821635 16.419398 8.4359222 11.480469 17.195312 C 29.348395 6.1821635 16.419398 8.4359222 11.480469 17.195312

6
samples/RenderDemo/Pages/DrawingPage.xaml

@ -1,5 +1,7 @@
<UserControl xmlns="https://github.com/avaloniaui" <UserControl
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="RenderDemo.Pages.DrawingPage">
<UserControl.Styles> <UserControl.Styles>
<Style> <Style>
<Style.Resources> <Style.Resources>

1
samples/RenderDemo/RenderDemo.csproj

@ -14,4 +14,5 @@
<Import Project="..\..\build\ReactiveUI.props" /> <Import Project="..\..\build\ReactiveUI.props" />
<Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" /> <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
<Import Project="..\..\build\ReferenceCoreLibraries.props" /> <Import Project="..\..\build\ReferenceCoreLibraries.props" />
<Import Project="..\..\build\BuildTargets.targets" />
</Project> </Project>

1
samples/VirtualizationDemo/VirtualizationDemo.csproj

@ -14,4 +14,5 @@
<Import Project="..\..\build\ReactiveUI.props" /> <Import Project="..\..\build\ReactiveUI.props" />
<Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" /> <Import Condition="'$(TargetFramework)'=='net461'" Project="..\..\build\NetFX.props" />
<Import Project="..\..\build\ReferenceCoreLibraries.props" /> <Import Project="..\..\build\ReferenceCoreLibraries.props" />
<Import Project="..\..\build\BuildTargets.targets" />
</Project> </Project>

Loading…
Cancel
Save