Skip to content
This repository was archived by the owner on Sep 22, 2023. It is now read-only.

Commit cfd9ef6

Browse files
galongagalonga
authored
Merge pull request #6 from galonga/development_v_2_0
v2.0 update to forms 3.x and target to ios64 + android 8.1
2 parents 07faa8a + d98f08b commit cfd9ef6

22 files changed

+14724
-6848
lines changed

‎AnalyticsSample.Droid/AnalyticsSample.Droid.csproj

+91-37
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<AndroidResgenClass>Resource</AndroidResgenClass>
1313
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1414
<AndroidApplication>True</AndroidApplication>
15-
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
15+
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
1616
<AssemblyName>AnalyticsSample.Droid</AssemblyName>
1717
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
18-
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
1919
<AndroidLinkMode>None</AndroidLinkMode>
20-
<ReleaseVersion>0.1.1</ReleaseVersion>
20+
<ReleaseVersion>0.2.0</ReleaseVersion>
2121
</PropertyGroup>
2222
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2323
<DebugSymbols>true</DebugSymbols>
@@ -45,58 +45,115 @@
4545
<Reference Include="System.Xml" />
4646
<Reference Include="System.Core" />
4747
<Reference Include="Mono.Android" />
48+
<Reference Include="FormsViewGroup">
49+
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
50+
<Private>False</Private>
51+
</Reference>
52+
<Reference Include="Xamarin.Forms.Core">
53+
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
54+
<Private>False</Private>
55+
</Reference>
56+
<Reference Include="Xamarin.Forms.Platform.Android">
57+
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
58+
<Private>False</Private>
59+
</Reference>
60+
<Reference Include="Xamarin.Forms.Platform">
61+
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
62+
<Private>False</Private>
63+
</Reference>
64+
<Reference Include="Xamarin.Forms.Xaml">
65+
<HintPath>..\packages\Xamarin.Forms.3.0.0.482510\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
66+
<Private>False</Private>
67+
</Reference>
68+
<Reference Include="Xamarin.Android.Support.Annotations">
69+
<HintPath>..\packages\Xamarin.Android.Support.Annotations.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Annotations.dll</HintPath>
70+
</Reference>
71+
<Reference Include="Xamarin.Android.Arch.Core.Common">
72+
<HintPath>..\packages\Xamarin.Android.Arch.Core.Common.1.0.0.1\lib\MonoAndroid80\Xamarin.Android.Arch.Core.Common.dll</HintPath>
73+
</Reference>
74+
<Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
75+
<HintPath>..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.3.1\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
76+
</Reference>
77+
<Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
78+
<HintPath>..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.3.1\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
79+
</Reference>
80+
<Reference Include="Xamarin.Android.Support.Compat">
81+
<HintPath>..\packages\Xamarin.Android.Support.Compat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Compat.dll</HintPath>
82+
</Reference>
83+
<Reference Include="Xamarin.Android.Support.Core.UI">
84+
<HintPath>..\packages\Xamarin.Android.Support.Core.UI.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Core.UI.dll</HintPath>
85+
</Reference>
86+
<Reference Include="Xamarin.Android.Support.Core.Utils">
87+
<HintPath>..\packages\Xamarin.Android.Support.Core.Utils.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Core.Utils.dll</HintPath>
88+
</Reference>
89+
<Reference Include="Xamarin.Android.Support.Fragment">
90+
<HintPath>..\packages\Xamarin.Android.Support.Fragment.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Fragment.dll</HintPath>
91+
</Reference>
92+
<Reference Include="Xamarin.Android.Support.Media.Compat">
93+
<HintPath>..\packages\Xamarin.Android.Support.Media.Compat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Media.Compat.dll</HintPath>
94+
</Reference>
95+
<Reference Include="Xamarin.Android.Support.Transition">
96+
<HintPath>..\packages\Xamarin.Android.Support.Transition.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Transition.dll</HintPath>
97+
</Reference>
4898
<Reference Include="Xamarin.Android.Support.v13">
49-
<HintPath>..\packages\Xamarin.Android.Support.v13.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v13.dll</HintPath>
99+
<HintPath>..\packages\Xamarin.Android.Support.v13.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v13.dll</HintPath>
50100
</Reference>
51101
<Reference Include="Xamarin.Android.Support.v4">
52-
<HintPath>..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
102+
<HintPath>..\packages\Xamarin.Android.Support.v4.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v4.dll</HintPath>
103+
</Reference>
104+
<Reference Include="Xamarin.Android.Support.v7.CardView">
105+
<HintPath>..\packages\Xamarin.Android.Support.v7.CardView.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.CardView.dll</HintPath>
106+
</Reference>
107+
<Reference Include="Xamarin.Android.Support.v7.Palette">
108+
<HintPath>..\packages\Xamarin.Android.Support.v7.Palette.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.Palette.dll</HintPath>
109+
</Reference>
110+
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
111+
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
53112
</Reference>
54113
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
55-
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
114+
<HintPath>..\packages\Xamarin.Android.Support.Vector.Drawable.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
56115
</Reference>
57116
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
58-
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
117+
<HintPath>..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
59118
</Reference>
60119
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
61-
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
62-
</Reference>
63-
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
64-
<HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
120+
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
65121
</Reference>
66122
<Reference Include="Xamarin.Android.Support.Design">
67-
<HintPath>..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
68-
</Reference>
69-
<Reference Include="Xamarin.Android.Support.v7.CardView">
70-
<HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
123+
<HintPath>..\packages\Xamarin.Android.Support.Design.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.Design.dll</HintPath>
71124
</Reference>
72125
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
73-
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
126+
<HintPath>..\packages\Xamarin.Android.Support.v7.MediaRouter.27.0.2.1\lib\MonoAndroid81\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
74127
</Reference>
75-
<Reference Include="FormsViewGroup">
76-
<HintPath>..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
77-
<Private>False</Private>
128+
<Reference Include="Xamarin.GooglePlayServices.Basement">
129+
<HintPath>..\packages\Xamarin.GooglePlayServices.Basement.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Basement.dll</HintPath>
78130
</Reference>
79-
<Reference Include="Xamarin.Forms.Core">
80-
<HintPath>..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
81-
<Private>False</Private>
131+
<Reference Include="Xamarin.GooglePlayServices.Tasks">
132+
<HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
82133
</Reference>
83-
<Reference Include="Xamarin.Forms.Platform.Android">
84-
<HintPath>..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
85-
<Private>False</Private>
134+
<Reference Include="Xamarin.Firebase.Common">
135+
<HintPath>..\packages\Xamarin.Firebase.Common.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Common.dll</HintPath>
86136
</Reference>
87-
<Reference Include="Xamarin.Forms.Platform">
88-
<HintPath>..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
89-
<Private>False</Private>
137+
<Reference Include="Xamarin.Firebase.Iid">
138+
<HintPath>..\packages\Xamarin.Firebase.Iid.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Iid.dll</HintPath>
90139
</Reference>
91-
<Reference Include="Xamarin.Forms.Xaml">
92-
<HintPath>..\packages\Xamarin.Forms.2.3.3.168\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
93-
<Private>False</Private>
140+
<Reference Include="Xamarin.Firebase.Analytics.Impl">
141+
<HintPath>..\packages\Xamarin.Firebase.Analytics.Impl.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Analytics.Impl.dll</HintPath>
94142
</Reference>
95-
<Reference Include="Xamarin.GooglePlayServices.Basement">
96-
<HintPath>..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
143+
<Reference Include="Xamarin.Firebase.Analytics">
144+
<HintPath>..\packages\Xamarin.Firebase.Analytics.60.1142.1\lib\MonoAndroid80\Xamarin.Firebase.Analytics.dll</HintPath>
145+
</Reference>
146+
<Reference Include="Xamarin.GooglePlayServices.Base">
147+
<HintPath>..\packages\Xamarin.GooglePlayServices.Base.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Base.dll</HintPath>
148+
</Reference>
149+
<Reference Include="Xamarin.GooglePlayServices.Analytics.Impl">
150+
<HintPath>..\packages\Xamarin.GooglePlayServices.Analytics.Impl.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Analytics.Impl.dll</HintPath>
151+
</Reference>
152+
<Reference Include="Xamarin.GooglePlayServices.TagManager.V4.Impl">
153+
<HintPath>..\packages\Xamarin.GooglePlayServices.TagManager.V4.Impl.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.TagManager.V4.Impl.dll</HintPath>
97154
</Reference>
98155
<Reference Include="Xamarin.GooglePlayServices.Analytics">
99-
<HintPath>..\packages\Xamarin.GooglePlayServices.Analytics.29.0.0.1\lib\MonoAndroid41\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
156+
<HintPath>..\packages\Xamarin.GooglePlayServices.Analytics.60.1142.1\lib\MonoAndroid80\Xamarin.GooglePlayServices.Analytics.dll</HintPath>
100157
</Reference>
101158
</ItemGroup>
102159
<ItemGroup>
@@ -121,7 +178,6 @@
121178
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
122179
</ItemGroup>
123180
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
124-
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
125181
<Import Project="..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.1\build\Xamarin.GooglePlayServices.Basement.targets')" />
126182
<ItemGroup>
127183
<ProjectReference Include="..\AnalyticsSample\AnalyticsSample.csproj">
@@ -137,6 +193,4 @@
137193
<Name>XamarinFormsAnalyticsWrapper.Droid</Name>
138194
</ProjectReference>
139195
</ItemGroup>
140-
<Import Project="..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
141-
<Import Project="..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.3.168\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
142196
</Project>

0 commit comments

Comments
 (0)