Skip to content

Commit e858e12

Browse files
author
Hendrik Mennen
authored
Fix Rider errors / Allow avares import (#46)
1 parent 4d996f9 commit e858e12

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@
1313
<RepositoryUrl>https://github.com/oxyplot/oxyplot.git</RepositoryUrl>
1414
<VersionPrefix>2.1.0</VersionPrefix>
1515
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<Compile Update="**\*.xaml.cs">
19+
<DependentUpon>%(Filename)</DependentUpon>
20+
</Compile>
21+
<AvaloniaResource Include="**\*.xaml">
22+
<SubType>Designer</SubType>
23+
</AvaloniaResource>
24+
</ItemGroup>
25+
1626
<ItemGroup>
1727
<EmbeddedResource Include="**\*.xaml;Assets\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
1828
<PackageReference Include="Avalonia" Version="0.10.11" />

Source/OxyPlot.Avalonia/Themes/Default.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Styles xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:local="http://oxyplot.org/avalonia"
4-
xmlns:converters="clr-namespace:OxyPlot.Avalonia.Converters;assembly=OxyPlot.Avalonia">
3+
xmlns:local="clr-namespace:OxyPlot.Avalonia"
4+
xmlns:converters="clr-namespace:OxyPlot.Avalonia.Converters">
55

66
<Style Selector="local|TrackerControl">
77
<Setter Property="Background" Value="#E0FFFFA0" />

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
versioningScheme: 'byPrereleaseNumber'
3737
- job: Linux
3838
pool:
39-
vmImage: 'ubuntu 16.04'
39+
vmImage: 'ubuntu-latest'
4040
variables:
4141
solution: '**/*.sln'
4242
buildPlatform: 'Any CPU'

0 commit comments

Comments
 (0)