Skip to content

Commit 906af7d

Browse files
committed
Dependency fixes
1 parent abf3c4c commit 906af7d

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

samples/FirebasePushSample.Android/FirebasePushSample.Android.csproj

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
<AndroidLinkMode>None</AndroidLinkMode>
3737
<AndroidSupportedAbis>armeabi-v7a;x86</AndroidSupportedAbis>
3838
<EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
39-
<AotAssemblies>false</AotAssemblies>
40-
<EnableLLVM>false</EnableLLVM>
41-
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
42-
<BundleAssemblies>false</BundleAssemblies>
4339
<AndroidUseAapt2>true</AndroidUseAapt2>
4440
<AndroidDexTool>d8</AndroidDexTool>
4541
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
@@ -54,15 +50,10 @@
5450
<WarningLevel>4</WarningLevel>
5551
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
5652
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
57-
<AotAssemblies>false</AotAssemblies>
58-
<EnableLLVM>false</EnableLLVM>
59-
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
60-
<BundleAssemblies>false</BundleAssemblies>
6153
<AndroidUseAapt2>true</AndroidUseAapt2>
6254
<AndroidDexTool>d8</AndroidDexTool>
6355
<AndroidLinkTool>r8</AndroidLinkTool>
6456
<AndroidPackageFormat>aab</AndroidPackageFormat>
65-
<AndroidCreatePackagePerAbi>false</AndroidCreatePackagePerAbi>
6657
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
6758
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
6859
</PropertyGroup>
@@ -137,6 +128,12 @@
137128
<PackageReference Include="Xamarin.Forms">
138129
<Version>4.5.0.617</Version>
139130
</PackageReference>
131+
<PackageReference Include="Plugin.CurrentActivity">
132+
<Version>2.1.0.4</Version>
133+
</PackageReference>
134+
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
135+
<Version>28.0.0.3</Version>
136+
</PackageReference>
140137
</ItemGroup>
141138
<ItemGroup>
142139
<ProjectReference Include="..\..\Plugin.FirebasePushNotification\Plugin.FirebasePushNotification.csproj">

samples/FirebasePushSample.UWP/FirebasePushSample.UWP.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
<AppxManifest Include="Package.appxmanifest">
102102
<SubType>Designer</SubType>
103103
</AppxManifest>
104-
<None Include="FirebasePushSample.UWP_TemporaryKey.pfx" />
105104
</ItemGroup>
106105
<ItemGroup>
107106
<Content Include="Properties\Default.rd.xml" />

samples/FirebasePushSample.iOS/FirebasePushSample.iOS.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
2525
<ConsolePause>false</ConsolePause>
26-
<MtouchArch>i386, x86_64</MtouchArch>
26+
<MtouchArch>x86_64</MtouchArch>
2727
<MtouchLink>None</MtouchLink>
2828
<MtouchDebug>true</MtouchDebug>
2929
<MtouchExtraArgs>--registrar:static</MtouchExtraArgs>
30+
<CodesignKey>iPhone Developer</CodesignKey>
3031
</PropertyGroup>
3132
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
3233
<DebugType>none</DebugType>
@@ -48,7 +49,7 @@
4849
<ErrorReport>prompt</ErrorReport>
4950
<WarningLevel>4</WarningLevel>
5051
<ConsolePause>false</ConsolePause>
51-
<MtouchArch>ARMv7, ARM64</MtouchArch>
52+
<MtouchArch>ARM64</MtouchArch>
5253
<CodesignKey>iPhone Developer</CodesignKey>
5354
<MtouchDebug>true</MtouchDebug>
5455
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>

0 commit comments

Comments
 (0)