Skip to content

Fix Rider errors / Allow avares import #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 6, 2022
Merged

Fix Rider errors / Allow avares import #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6702ee6
Add AvaloniaResource
Dec 9, 2021
8e986a5
Merge branch 'master' into Fix-AvaloniaResource
Dec 28, 2021
c2c62ab
fix
Feb 5, 2022
5e65a7e
Merge branch 'master' of https://github.com/oxyplot/oxyplot-avalonia …
Feb 5, 2022
5d221af
fix pipeline
Feb 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
<RepositoryUrl>https://github.com/oxyplot/oxyplot.git</RepositoryUrl>
<VersionPrefix>2.1.0</VersionPrefix>
</PropertyGroup>

<ItemGroup>
<Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
</Compile>
<AvaloniaResource Include="**\*.xaml">
<SubType>Designer</SubType>
</AvaloniaResource>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="**\*.xaml;Assets\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
<PackageReference Include="Avalonia" Version="0.10.11" />
Expand Down
4 changes: 2 additions & 2 deletions Source/OxyPlot.Avalonia/Themes/Default.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="http://oxyplot.org/avalonia"
xmlns:converters="clr-namespace:OxyPlot.Avalonia.Converters;assembly=OxyPlot.Avalonia">
xmlns:local="clr-namespace:OxyPlot.Avalonia"
xmlns:converters="clr-namespace:OxyPlot.Avalonia.Converters">

<Style Selector="local|TrackerControl">
<Setter Property="Background" Value="#E0FFFFA0" />
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
versioningScheme: 'byPrereleaseNumber'
- job: Linux
pool:
vmImage: 'ubuntu 16.04'
vmImage: 'ubuntu-latest'
variables:
solution: '**/*.sln'
buildPlatform: 'Any CPU'
Expand Down