Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 25f485b

Browse files
author
Jason Smith
committed
Merge master
2 parents 83da90f + 61b5c00 commit 25f485b

File tree

56 files changed

+1126
-237
lines changed

Some content is hidden

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

56 files changed

+1126
-237
lines changed

‎.nuspec/Xamarin.Forms.Maps.nuspec‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20">
3434
<reference file="Xamarin.Forms.Maps.dll" />
3535
</group>
36+
<group targetFramework="netstandard1.0">
37+
<reference file="Xamarin.Forms.Maps.dll" />
38+
</group>
3639
<group targetFramework="Xamarin.iOS10">
3740
<reference file="Xamarin.Forms.Maps.dll" />
3841
<reference file="Xamarin.Forms.Maps.iOS.dll" />
@@ -64,8 +67,10 @@
6467
</references>
6568
</metadata>
6669
<files>
67-
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
70+
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
71+
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\netstandard1.0" />
6872
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
73+
<file src="..\docs\Xamarin.Forms.Maps.xml" target="lib\netstandard1.0" />
6974

7075
<file src="..\Xamarin.Forms.Maps.Android\bin\$Configuration$\Xamarin.Forms.Maps.Android.dll" target="lib\MonoAndroid10" />
7176
<file src="..\Xamarin.Forms.Maps\bin\$Configuration$\Xamarin.Forms.Maps.dll" target="lib\MonoAndroid10" />
@@ -125,6 +130,7 @@
125130

126131
<!-- Xaml Design-time Stuff -->
127132
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10\Design" />
133+
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\netstandard1.0" />
128134
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\MonoAndroid10\Design" />
129135
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\Xamarin.iOS10\Design" />
130136
<file src="..\Xamarin.Forms.Maps.Design\bin\$Configuration$\Xamarin.Forms.Maps.Design.dll" target="lib\WP80\Design" />

‎.nuspec/Xamarin.Forms.Pages.nuspec‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<group targetFramework="portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10">
2323
<reference file="Xamarin.Forms.Pages.dll" />
2424
</group>
25+
<group targetFramework="netstandard1.0">
26+
<reference file="Xamarin.Forms.Pages.dll" />
27+
</group>
2528
<group targetFramework="Xamarin.iOS10">
2629
<reference file="Xamarin.Forms.Pages.dll" />
2730
</group>
@@ -45,7 +48,9 @@
4548
<files>
4649
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10" />
4750

48-
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\MonoAndroid10" />
51+
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\netstandard1.0" />
52+
53+
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\MonoAndroid10" />
4954

5055
<file src="..\Xamarin.Forms.Pages\bin\$Configuration$\Xamarin.Forms.Pages.dll" target="lib\Xamarin.iOS10" />
5156

‎.nuspec/Xamarin.Forms.nuspec‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@
3737
<reference file="Xamarin.Forms.Platform.dll" />
3838
<reference file="Xamarin.Forms.Xaml.dll" />
3939
</group>
40+
<group targetFramework="netstandard1.0">
41+
<reference file="Xamarin.Forms.Core.dll" />
42+
<reference file="Xamarin.Forms.Platform.dll" />
43+
<reference file="Xamarin.Forms.Xaml.dll" />
44+
</group>
4045
<group targetFramework="Xamarin.iOS10">
4146
<reference file="Xamarin.Forms.Core.dll" />
4247
<reference file="Xamarin.Forms.Platform.dll" />
@@ -98,15 +103,37 @@
98103
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*pdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
99104
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*mdb" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
100105

106+
<!--netstandard-->
107+
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.dll" target="lib\netstandard1.0" />
108+
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*pdb" target="lib\netstandard1.0" />
109+
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\Xamarin.Forms.Core.*mdb" target="lib\netstandard1.0" />
110+
<file src="..\docs\Xamarin.Forms.Core.xml" target="lib\netstandard1.0" />
111+
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="lib\netstandard1.0" />
112+
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*pdb" target="lib\netstandard1.0" />
113+
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\Xamarin.Forms.Xaml.*mdb" target="lib\netstandard1.0" />
114+
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\netstandard1.0" />
115+
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\netstandard1.0" />
116+
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*pdb" target="lib\netstandard1.0" />
117+
<file src="..\Xamarin.Forms.Platform\bin\$Configuration$\Xamarin.Forms.Platform.*mdb" target="lib\netstandard1.0" />
118+
101119
<!--Xaml PCL Stuff-->
102120
<file src="Xamarin.Forms.targets" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms$IdAppend$.targets" />
103121
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
104122
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
105123
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
106124

107-
<!-- Xaml Design-time Stuff -->
125+
<!--Xaml netstandard Stuff-->
126+
<file src="Xamarin.Forms.targets" target="build\netstandard1.0\Xamarin.Forms$IdAppend$.targets" />
127+
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Build.Tasks.dll" target="build\netstandard1.0" />
128+
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Core.dll" target="build\netstandard1.0" />
129+
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Xamarin.Forms.Xaml.dll" target="build\netstandard1.0" />
130+
131+
<!-- Xaml Design-time Stuff -->
108132
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Design" />
109133
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Design" />
134+
135+
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\netstandard1.0\Design" />
136+
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\netstandard1.0\Design" />
110137

111138
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid10\Design" />
112139
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid10\Design" />
@@ -132,6 +159,11 @@
132159
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
133160
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20" />
134161

162+
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.dll" target="build\netstandard1.0" />
163+
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Mdb.dll" target="build\netstandard1.0" />
164+
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Pdb.dll" target="build\netstandard1.0" />
165+
<file src="..\Xamarin.Forms.Build.Tasks\bin\$Configuration$\Mono.Cecil.Rocks.dll" target="build\netstandard1.0" />
166+
135167
<!--Android-->
136168
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid10" />
137169
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid10" />

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<img src="banner.png" alt="Xamarin.Forms banner" height="145" >
22
# Xamarin.Forms #
33

4-
Xamarin.Forms provides a way to quickly build native apps for iOS, Android, and Windows, completely in C#.
4+
Xamarin.Forms provides a way to quickly build native apps for iOS, Android, Windows and macOS, completely in C#.
55

66
Read more about the platform at https://www.xamarin.com/forms.
77

‎Xamarin.Forms.Build.Tasks/TypeReferenceExtensions.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,16 @@ public static MethodReference GetImplicitOperatorTo(this TypeReference fromType,
249249
if (TypeRefComparer.Default.Equals(fromType, toType))
250250
return null;
251251

252-
var implicitOperatorsOnFromType = fromType.GetMethods(md => md.IsPublic && md.IsStatic && md.IsSpecialName && md.Name == "op_Implicit", module);
253-
var implicitOperatorsOnToType = toType.GetMethods(md => md.IsPublic && md.IsStatic && md.IsSpecialName && md.Name == "op_Implicit", module);
252+
var implicitOperatorsOnFromType = fromType.GetMethods(md => md.IsPublic
253+
&& md.IsStatic
254+
&& md.IsSpecialName
255+
&& md.Name == "op_Implicit", module);
256+
var implicitOperatorsOnToType = toType.GetMethods(md => md.IsPublic
257+
&& md.IsStatic
258+
&& md.IsSpecialName
259+
&& md.Name == "op_Implicit", module);
254260
var implicitOperators = implicitOperatorsOnFromType.Concat(implicitOperatorsOnToType).ToList();
261+
255262
if (implicitOperators.Any()) {
256263
foreach (var op in implicitOperators) {
257264
var cast = op.Item1;
@@ -260,8 +267,12 @@ public static MethodReference GetImplicitOperatorTo(this TypeReference fromType,
260267
var returnType = castDef.ReturnType;
261268
if (returnType.IsGenericParameter)
262269
returnType = ((GenericInstanceType)opDeclTypeRef).GenericArguments [((GenericParameter)returnType).Position];
263-
if (returnType.InheritsFromOrImplements(toType))
264-
return castDef;
270+
if (!returnType.InheritsFromOrImplements(toType))
271+
continue;
272+
var paramType = cast.Parameters[0].ParameterType;
273+
if (!fromType.InheritsFromOrImplements(paramType))
274+
continue;
275+
return castDef;
265276
}
266277
}
267278
return null;

‎Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,23 @@ public static TypeReference GetTypeReference(this XmlType xmlType, ModuleDefinit
107107
if (type != null)
108108
break;
109109

110+
var clrNamespace = asm.ClrNamespace;
111+
var typeName = name.Replace('+', '/'); //Nested types
112+
var idx = typeName.LastIndexOf('.');
113+
if (idx >= 0) {
114+
clrNamespace += '.' + typeName.Substring(0, typeName.LastIndexOf('.'));
115+
typeName = typeName.Substring(typeName.LastIndexOf('.') + 1);
116+
}
110117
var assemblydefinition = module.Assembly.Name.Name == asm.AssemblyName ?
111118
module.Assembly :
112119
module.AssemblyResolver.Resolve(AssemblyNameReference.Parse(asm.AssemblyName));
113120

114-
type = assemblydefinition.MainModule.GetType(asm.ClrNamespace, name);
121+
type = assemblydefinition.MainModule.GetType(clrNamespace + "." + typeName);
115122
if (type == null)
116123
{
117124
var exportedtype =
118125
assemblydefinition.MainModule.ExportedTypes.FirstOrDefault(
119-
(ExportedType arg) => arg.IsForwarder && arg.Namespace == asm.ClrNamespace && arg.Name == name);
126+
(ExportedType arg) => arg.IsForwarder && arg.Namespace == clrNamespace && arg.Name == typeName);
120127
if (exportedtype != null)
121128
type = exportedtype.Resolve();
122129
}

‎Xamarin.Forms.ControlGallery.Android/BrokenImageSourceHandler.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
using System;
2+
using System.Threading;
3+
using System.Threading.Tasks;
4+
using Android.Content;
5+
using Android.Graphics;
6+
using Xamarin.Forms;
7+
using Xamarin.Forms.ControlGallery.Android;
8+
using Xamarin.Forms.Controls.Issues;
9+
using Xamarin.Forms.Platform.Android;
10+
11+
[assembly: ExportRenderer(typeof(_51173Image), typeof(_51173CustomImageRenderer))]
12+
namespace Xamarin.Forms.ControlGallery.Android
13+
{
14+
public sealed class BrokenImageSourceHandler : IImageSourceHandler
15+
{
16+
public Task<Bitmap> LoadImageAsync(ImageSource imagesource, Context context, CancellationToken cancelationToken = default(CancellationToken))
17+
{
18+
throw new Exception("Fail");
19+
}
20+
}
21+
22+
public class _51173CustomImageRenderer : ImageRenderer
23+
{
24+
protected override async Task TryUpdateBitmap(Image previous = null)
25+
{
26+
try
27+
{
28+
await UpdateBitmap(previous).ConfigureAwait(false);
29+
}
30+
catch (Exception ex)
31+
{
32+
await Application.Current.MainPage.DisplayAlert("Image Error 51173", $"The image failed to load, here's why: {ex.Message}", "OK");
33+
}
34+
}
35+
}
36+
}
37+
38+

‎Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
using System.Runtime.CompilerServices;
33
using System.Runtime.InteropServices;
44
using Android.App;
5+
using Xamarin.Forms.Controls;
6+
using Xamarin.Forms.Platform.Android;
57
using Xamarin.Forms;
6-
8+
using Xamarin.Forms.ControlGallery.Android;
9+
710
// General Information about an assembly is controlled through the following
811
// set of attributes. Change these attribute values to modify the information
912
// associated with an assembly.
@@ -37,6 +40,8 @@
3740
[assembly: Android.App.MetaData("com.google.android.maps.v2.API_KEY", Value = "AIzaSyAdstcJQswxEjzX5YjLaMcu2aRVEBJw39Y")]
3841
[assembly: Xamarin.Forms.ResolutionGroupName ("XamControl")]
3942

43+
// Deliberately broken image source and handler so we can test handling of image loading errors
44+
[assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))]
4045
#if TEST_LEGACY_RENDERERS
4146
[assembly: ExportRenderer(typeof(Button), typeof(Xamarin.Forms.Platform.Android.AppCompat.ButtonRenderer))]
4247
[assembly: ExportRenderer(typeof(Image), typeof(Xamarin.Forms.Platform.Android.ImageRenderer))]

‎Xamarin.Forms.ControlGallery.Android/Resources/drawable/invalidimage.jpg‎

Lines changed: 1 addition & 0 deletions
Loading

‎Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
<RestorePackages>true</RestorePackages>
2727
<NuGetPackageImportStamp>
2828
</NuGetPackageImportStamp>
29+
<AndroidTlsProvider>
30+
</AndroidTlsProvider>
31+
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
2932
</PropertyGroup>
3033
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3134
<AndroidKeyStore>True</AndroidKeyStore>
@@ -46,20 +49,27 @@
4649
<AndroidLinkMode>Full</AndroidLinkMode>
4750
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
4851
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
49-
<BundleAssemblies>False</BundleAssemblies>
5052
<CustomCommands>
5153
<CustomCommands>
52-
<Command type="AfterBuild" command="xbuild /t:SignAndroidPackage Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj" workingdir="${SolutionDir}" />
54+
<Command>
55+
<type>AfterBuild</type>
56+
<command>xbuild /t:SignAndroidPackage Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj</command>
57+
<workingdir>${SolutionDir}</workingdir>
58+
</Command>
5359
</CustomCommands>
5460
</CustomCommands>
55-
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
5661
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86</AndroidSupportedAbis>
57-
<Debugger>Xamarin</Debugger>
58-
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
62+
<Debugger>.Net (Xamarin)</Debugger>
5963
<DevInstrumentationEnabled>True</DevInstrumentationEnabled>
6064
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6165
<NoWarn>
6266
</NoWarn>
67+
<BundleAssemblies>False</BundleAssemblies>
68+
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
69+
<AotAssemblies>False</AotAssemblies>
70+
<EnableLLVM>False</EnableLLVM>
71+
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
72+
<EnableProguard>False</EnableProguard>
6373
</PropertyGroup>
6474
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
6575
<DebugType>pdbonly</DebugType>
@@ -73,8 +83,6 @@
7383
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
7484
<AndroidLinkSkip />
7585
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
76-
<BundleAssemblies>False</BundleAssemblies>
77-
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
7886
<AndroidSupportedAbis>armeabi-v7a,x86</AndroidSupportedAbis>
7987
<AndroidStoreUncompressedFileExtensions />
8088
<MandroidI18n />
@@ -97,14 +105,11 @@
97105
<AndroidLinkSkip />
98106
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
99107
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
100-
<BundleAssemblies>False</BundleAssemblies>
101-
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
102108
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
103109
<AndroidStoreUncompressedFileExtensions />
104110
<MandroidI18n />
105111
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
106112
<Debugger>Xamarin</Debugger>
107-
<AndroidEnableMultiDex>False</AndroidEnableMultiDex>
108113
<DevInstrumentationEnabled>True</DevInstrumentationEnabled>
109114
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
110115
<NoWarn>
@@ -176,6 +181,7 @@
176181
<Compile Include="CustomRenderers.cs" />
177182
<Compile Include="ColorPicker.cs" />
178183
<Compile Include="_38989CustomRenderer.cs" />
184+
<Compile Include="BrokenImageSourceHandler.cs" />
179185
</ItemGroup>
180186
<ItemGroup>
181187
<AndroidAsset Include="Assets\default.css" />
@@ -204,6 +210,7 @@
204210
<AndroidResource Include="Resources\drawable\coffee.png" />
205211
<AndroidResource Include="Resources\drawable\toolbar_close.png" />
206212
<AndroidResource Include="Resources\drawable\test.jpg" />
213+
<AndroidResource Include="Resources\drawable\invalidimage.jpg" />
207214
</ItemGroup>
208215
<ItemGroup>
209216
<AndroidResource Include="Resources\drawable\Icon.png" />

0 commit comments

Comments
 (0)