Skip to content

Commit 34dd463

Browse files
authored
Merge pull request #199 from dotnet-ad/develop
0.9.5
2 parents 82b229d + 9fe70a9 commit 34dd463

File tree

76 files changed

+318
-14543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+318
-14543
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,9 @@ paket-files/
9090

9191
# Mac folder file
9292
.DS_Store
93+
94+
95+
# this file can be merge conflict hell, never commit these.
96+
Sources/Microcharts.Droid/Resources/Resource.designer.cs
97+
Sources/Microcharts.Samples.Droid/Resources/Resource.designer.cs
98+
Sources/Microcharts.Samples.Forms/Microcharts.Samples.Forms.Android/Resources/Resource.designer.cs

Documentation/.gitignore

-9
This file was deleted.

Documentation/api/.gitignore

-4
This file was deleted.

Documentation/api/.manifest

-102
This file was deleted.

Documentation/docfx.json

-81
This file was deleted.

Documentation/guides/quickstart.md

-67
This file was deleted.

Documentation/guides/toc.yml

-2
This file was deleted.
-40.2 KB
Binary file not shown.

Documentation/images/Bar.png

-5.34 KB
Binary file not shown.

Documentation/images/Bikr.gif

-1.58 MB
Binary file not shown.

Documentation/images/Donut.png

-11.4 KB
Binary file not shown.

Documentation/images/Line.png

-9.86 KB
Binary file not shown.

Documentation/images/Logo.png

-35.4 KB
Binary file not shown.

Documentation/images/Logo.sketch

-35.3 KB
Binary file not shown.

Documentation/images/Point.png

-6.7 KB
Binary file not shown.

Documentation/images/Radar.png

-12.8 KB
Binary file not shown.

Documentation/images/RadialGauge.png

-18.2 KB
Binary file not shown.
-24.1 KB
Binary file not shown.
-117 KB
Binary file not shown.

Documentation/index.md

-5
This file was deleted.

Documentation/samples/bikr.md

-5
This file was deleted.

Documentation/samples/toc.yml

-2
This file was deleted.

Documentation/toc.yml

-7
This file was deleted.

NuGet/Package.Forms.nuspec

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>Microcharts.Forms</id>
5-
<version>0.9.0</version>
5+
<version>0.9.5</version>
66
<title>Microcharts for Xamarin.Forms</title>
77
<authors>Aloïs Deniel, Ed Lomonaco</authors>
88
<owners>Aloïs Deniel, Ed Lomonaco</owners>
@@ -15,14 +15,17 @@
1515
<dependencies>
1616
<group targetFramework="netstandard2.0">
1717
<dependency id="Microcharts" version="0.9.0" />
18-
<dependency id="Xamarin.Forms" version="2.4.0.282" />
19-
<dependency id="System.ValueTuple" version="4.4.0" />
20-
<dependency id="SkiaSharp.Views.Forms" version="1.59.1.1" />
18+
<dependency id="SkiaSharp" version="2.80.1" />
19+
<dependency id="SkiaSharp.HarfBuzz" version="2.80.1" />
20+
<dependency id="SkiaSharp.Views.Forms" version="2.80.1" />
21+
<dependency id="System.ValueTuple" version="4.5.0" />
22+
<dependency id="Xamarin.Forms" version="4.7.0.1179" />
2123
</group>
2224
</dependencies>
2325
</metadata>
2426
<files>
2527
<!-- .NET Standard 2.0 -->
28+
<file src="..\Sources\Microcharts\bin\Release\netstandard2.0\Microcharts.dll" target="lib\netstandard2.0\Microcharts.dll"/>
2629
<file src="..\Sources\Microcharts.Forms\bin\Release\netstandard2.0\Microcharts.Forms.dll" target="lib\netstandard2.0\Microcharts.Forms.dll"/>
2730
</files>
2831
</package>

NuGet/Package.nuspec

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>Microcharts</id>
5-
<version>0.9.0</version>
5+
<version>0.9.5</version>
66
<title>Microcharts</title>
77
<authors>Aloïs Deniel, Ed Lomonaco</authors>
88
<owners>Aloïs Deniel, Ed Lomonaco</owners>
@@ -15,6 +15,7 @@
1515
<dependencies>
1616
<group targetFramework="netstandard2.0">
1717
<dependency id="SkiaSharp" version="2.80.1" />
18+
<dependency id="SkiaSharp.HarfBuzz" version="2.80.1" />
1819
<dependency id="System.ValueTuple" version="4.5.0" />
1920
</group>
2021
<group targetFramework="monoandroid1.0">

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ More info on how you can help can be found [here](https://github.com/dotnet-ad/M
1818

1919
## Gallery
2020

21-
![gallery](Documentation/images/Bikr.gif)
22-
23-
![gallery](Documentation/images/Gallery.png)
21+
![animation gallery](assets/animations.gif)
22+
23+
![gallery](assets/Gallery.png)
2424

2525
## Install
2626

Sources/Droid/Assets/AboutAssets.txt

-19
This file was deleted.

0 commit comments

Comments
 (0)