Skip to content

Commit ff3b9a3

Browse files
jonathanpeppersjonathanpeppers
committed
[tests] update everything to use Xamarin.Forms 4.3
I also improved things so it's easier to bump this going forward: * I added `KnownPackages.XamarinForms_LatestStable`, so tests won't need to change going forward. * `Xamarin.Forms.Performance.Integration` now uses `<PackageReference/>`. The netstandard library was already. I also removed some missing `Icon` files from the forms project. These did not even exist. `XamarinFormsPCL_2_3_4_231` was also unused, so I removed it. I updated APK sizes, which I think is smaller because of: xamarin/Xamarin.Forms#5941
1 parent eff77a4 commit ff3b9a3

File tree

13 files changed

+28
-350
lines changed

13 files changed

+28
-350
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ MSBUILD_FLAGS += /p:AndroidApiLevel=$(API_LEVEL) /p:AndroidFrameworkVersion=$(wo
100100
endif
101101

102102
all-tests::
103-
MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln
103+
MSBUILD="$(MSBUILD)" $(call MSBUILD_BINLOG,all-tests,tools/scripts/xabuild) $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln /restore
104104

105105
install::
106106
@if [ ! -d "bin/$(CONFIGURATION)" ]; then \

‎build-tools/automation/azure-pipelines.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ stages:
197197
displayName: xabuild Xamarin.Android-Tests
198198
inputs:
199199
filename: bin\$(XA.Build.Configuration)\bin\xabuild.exe
200-
arguments: Xamarin.Android-Tests.sln /p:Configuration=$(XA.Build.Configuration) /bl:$(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\msbuild-build-tests.binlog
200+
arguments: Xamarin.Android-Tests.sln /p:Configuration=$(XA.Build.Configuration) /bl:$(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\msbuild-build-tests.binlog /restore
201201

202202
- task: MSBuild@1
203203
displayName: nunit Java.Interop Tests

‎build-tools/timing/timing.projitems‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<DirectoryFullPath>$([System.IO.Path]::GetFullPath('$(_TopDir)tests\Xamarin.Forms-Performance-Integration'))</DirectoryFullPath>
1818
<CSharpFile>$(_TopDir)tests\Xamarin.Forms-Performance-Integration\Droid\MainActivity.cs</CSharpFile>
1919
<AndroidResourceFile>$(_TopDir)tests\Xamarin.Forms-Performance-Integration\Droid\Resources\values\styles.xml</AndroidResourceFile>
20-
<Restore>$(_TopDir)tests\Xamarin.Forms-Performance-Integration\Xamarin.Forms.Performance.Integration.csproj</Restore>
20+
<Restore>$(_TopDir)Xamarin.Android-Tests.sln</Restore>
2121
</XACaptureBuildTimingProject>
2222
</ItemGroup>
2323
</Project>

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,7 +2804,7 @@ public void BuildAfterUpgradingNuget ()
28042804

28052805
proj.PackageReferences.Clear ();
28062806
//NOTE: we can get all the other dependencies transitively, yay!
2807-
proj.PackageReferences.Add (KnownPackages.XamarinForms_4_0_0_425677);
2807+
proj.PackageReferences.Add (KnownPackages.XamarinForms_LatestStable);
28082808
b.Save (proj, doNotCleanupOnUpdate: true);
28092809
Assert.IsTrue (b.Build (proj), "second build should have succeeded.");
28102810
Assert.IsFalse (b.Output.IsTargetSkipped ("_CleanIntermediateIfNuGetsChange"), "`_CleanIntermediateIfNuGetsChange` should have run!");
@@ -2847,7 +2847,7 @@ public void CompileBeforeUpgradingNuGet ()
28472847

28482848
proj.PackageReferences.Clear ();
28492849
//NOTE: we can get all the other dependencies transitively, yay!
2850-
proj.PackageReferences.Add (KnownPackages.XamarinForms_4_0_0_425677);
2850+
proj.PackageReferences.Add (KnownPackages.XamarinForms_LatestStable);
28512851
Assert.IsTrue (b.Build (proj, saveProject: true, doNotCleanupOnUpdate: true), "second build should have succeeded.");
28522852
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, "Refreshing Xamarin.Android.Support.v7.AppCompat.dll"), "`ResolveLibraryProjectImports` should not skip `Xamarin.Android.Support.v7.AppCompat.dll`!");
28532853
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, "Deleting unknown jar: support-annotations.jar"), "`support-annotations.jar` should be deleted!");

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,6 @@ public static class KnownPackages
151151
}
152152
}
153153
};
154-
public static Package XamarinFormsPCL_2_3_4_231 = new Package {
155-
Id = "Xamarin.Forms",
156-
Version = "2.3.4.231",
157-
TargetFramework = "portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10",
158-
References = {
159-
new BuildItem.Reference ("Xamarin.Forms.Core") {
160-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.2.3.4.231\\lib\\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\\Xamarin.Forms.Core.dll"
161-
},
162-
new BuildItem.Reference ("Xamarin.Forms.Xaml") {
163-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.2.3.4.231\\lib\\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\\Xamarin.Forms.Xaml.dll"
164-
},
165-
}
166-
};
167154
public static Package XamarinForms_2_3_4_231 = new Package {
168155
Id = "Xamarin.Forms",
169156
Version = "2.3.4.231",
@@ -186,38 +173,40 @@ public static class KnownPackages
186173
},
187174
}
188175
};
189-
public static Package XamarinForms_4_0_0_425677 = new Package {
176+
public static Package XamarinForms_LatestStable => XamarinForms_4_3_0_991221;
177+
public static Package XamarinForms_4_3_0_991221 = new Package {
190178
Id = "Xamarin.Forms",
191-
Version = "4.0.0.425677",
179+
Version = "4.3.0.991221",
192180
TargetFramework = "MonoAndroid90",
193181
References = {
194182
new BuildItem.Reference ("Xamarin.Forms.Platform.Android") {
195-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.Android.dll"
183+
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.Android.dll"
196184
},
197185
new BuildItem.Reference ("FormsViewGroup") {
198-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\FormsViewGroup.dll"
186+
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\FormsViewGroup.dll"
199187
},
200188
new BuildItem.Reference ("Xamarin.Forms.Core") {
201-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Core.dll"
189+
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Core.dll"
202190
},
203191
new BuildItem.Reference ("Xamarin.Forms.Xaml") {
204-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Xaml.dll"
192+
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Xaml.dll"
205193
},
206194
new BuildItem.Reference ("Xamarin.Forms.Platform") {
207-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.dll"
195+
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Platform.dll"
208196
},
209197
}
210198
};
211-
public static Package XamarinFormsMaps_4_0_0_425677 = new Package {
199+
public static Package XamarinFormsMaps_LatestStable => XamarinFormsMaps_4_3_0_991221;
200+
public static Package XamarinFormsMaps_4_3_0_991221 = new Package {
212201
Id = "Xamarin.Forms.Maps",
213-
Version = "4.0.0.425677",
202+
Version = "4.3.0.991221",
214203
TargetFramework = "MonoAndroid90",
215204
References = {
216205
new BuildItem.Reference ("Xamarin.Forms.Maps.Android") {
217-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.Android.dll"
206+
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.Android.dll"
218207
},
219208
new BuildItem.Reference ("Xamarin.Forms.Maps") {
220-
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.0.0.425677\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.dll"
209+
MetadataValues = "HintPath=..\\packages\\Xamarin.Forms.Maps.4.3.0.991221\\lib\\MonoAndroid90\\Xamarin.Forms.Maps.dll"
221210
},
222211
}
223212
};

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsAndroidApplicationProject.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public XamarinFormsAndroidApplicationProject (string debugConfigurationName = "D
4141
: base (debugConfigurationName, releaseConfigurationName)
4242
{
4343
//NOTE: we can get all the other dependencies transitively, yay!
44-
PackageReferences.Add (KnownPackages.XamarinForms_4_0_0_425677);
44+
PackageReferences.Add (KnownPackages.XamarinForms_LatestStable);
4545

4646
AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\values\\colors.xml") {
4747
TextContent = () => colors_xml,

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinFormsMapsApplicationProject.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static XamarinFormsMapsApplicationProject ()
1515

1616
public XamarinFormsMapsApplicationProject ()
1717
{
18-
PackageReferences.Add (KnownPackages.XamarinFormsMaps_4_0_0_425677);
18+
PackageReferences.Add (KnownPackages.XamarinFormsMaps_LatestStable);
1919
MainActivity = MainActivity.Replace ("//${AFTER_FORMS_INIT}", "Xamarin.FormsMaps.Init (this, savedInstanceState);");
2020
//NOTE: API_KEY metadata just has to *exist*
2121
AndroidManifest = AndroidManifest.Replace ("</application>", "<meta-data android:name=\"com.google.android.maps.v2.API_KEY\" android:value=\"\" /></application>");

‎tests/MSBuildDeviceIntegration/Tests/PerformanceTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public void Build_XAML_Change (bool produceReferenceAssembly, bool install)
234234
}
235235
},
236236
PackageReferences = {
237-
KnownPackages.XamarinForms_4_0_0_425677
237+
KnownPackages.XamarinForms_LatestStable
238238
}
239239
};
240240
lib.SetProperty ("ProduceReferenceAssembly", produceReferenceAssembly.ToString ());

0 commit comments

Comments
 (0)