Skip to content

[DO-NOT-MERGE][PUBLISH-FROM-BRANCH] Manual updates 20220415 for missing/skipped packages (GPS-FB-MLKit dependencies) #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
+2,391 −5,591
Open

[DO-NOT-MERGE][PUBLISH-FROM-BRANCH] Manual updates 20220415 for missing/skipped packages (GPS-FB-MLKit dependencies) #534

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
94f6fce
reducing config.json
moljac Apr 18, 2022
538a132
more cleanup
moljac Apr 18, 2022
e20af09
more trimming
moljac Apr 18, 2022
cce9cf7
more trimming
moljac Apr 18, 2022
6e023bd
trimm media and navigation groups
moljac Apr 18, 2022
61b3e0e
more trimming
moljac Apr 18, 2022
80ebd93
binderator green
moljac Apr 18, 2022
40131cb
fixes (types were not present in v.1.0.0)
moljac Apr 18, 2022
a350d3b
no enum
moljac Apr 18, 2022
b5d8805
mappings
moljac Apr 18, 2022
d0f8c32
build script fixes
moljac Apr 19, 2022
289f269
mappings
moljac Apr 19, 2022
f9eb4ee
Update Xamarin.AndroidX.Migration.props
moljac Apr 19, 2022
66b9efb
test fixes for old legacy code
moljac Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions build.cake
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Tools needed by cake addins
#tool nuget:?package=Cake.CoreCLR
#tool nuget:?package=vswhere&version=2.8.4
#tool nuget:?package=vswhere

// Cake Addins
#addin nuget:?package=Cake.FileHelpers&version=4.0.1
#addin nuget:?package=Newtonsoft.Json&version=12.0.3
#addin nuget:?package=Cake.MonoApiTools&version=3.0.5
#addin nuget:?package=Cake.FileHelpers
#addin nuget:?package=Newtonsoft.Json
#addin nuget:?package=Cake.MonoApiTools
#addin nuget:?package=SharpZipLib
#addin nuget:?package=CsvHelper&version=12.2.1
#addin nuget:?package=SharpZipLib&version=1.3.3

// #addin nuget:?package=NuGet.Protocol&loaddependencies=true&version=5.6.0
// #addin nuget:?package=NuGet.Versioning&loaddependencies=true&version=5.6.0
@@ -847,14 +847,27 @@ Task("generate-mapping")
"AndroidX NuGet Version",
};
foreach (var record in records) {
var androidxNuget = GetNuGetId(record.AndroidX);
lines.Add(
record.Support + "," +
record.AndroidX + "," +
GetNuGetId(record.Support, supportJson) + "," +
androidxNuget + "," +
GetNuGetVersion(androidxNuget));
Information($"record = {record}");
if ( record.Support == "Xamarin.Android.Support.v4" )
{
continue;
}
try
{
var androidxNuget = GetNuGetId(record.AndroidX);
lines.Add(
record.Support + "," +
record.AndroidX + "," +
GetNuGetId(record.Support, supportJson) + "," +
androidxNuget + "," +
GetNuGetVersion(androidxNuget));
}
catch (System.Exception)
{
throw;
}
}
Information($"heeeereeeee");
FileWriteLines("./output/mappings/androidx-assemblies.csv", lines.ToArray());
CopyFileToDirectory("./output/mappings/androidx-assemblies.csv", "./mappings/");

1,295 changes: 85 additions & 1,210 deletions config.json
View file

Large diffs are not rendered by default.

104 changes: 28 additions & 76 deletions mappings/androidx-assemblies.csv
View file

Large diffs are not rendered by default.

4,188 changes: 2,091 additions & 2,097 deletions mappings/androidx-mapping.csv
View file

Large diffs are not rendered by default.

1,536 changes: 122 additions & 1,414 deletions mappings/dependencies.json
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions source/androidx.appcompat/typeforwarders/TypeForwarders.cs
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@
// types moved from AndroidX.AppCompat.Resources.dll to AndroidX.AppCompat.Res.dll
// project:
// assembly:
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.DrawableUtils))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.ResourceManagerInternal))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.TintContextWrapper))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.TintInfo))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.VectorEnabledTintResources))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Graphics.Drawable.AnimatedStateListDrawableCompat))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Graphics.Drawable.DrawableContainer))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Graphics.Drawable.DrawableWrapper))]
[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Content.Res.AppCompatResources))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.DrawableUtils))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.ResourceManagerInternal))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.TintContextWrapper))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.TintInfo))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.VectorEnabledTintResources))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Graphics.Drawable.AnimatedStateListDrawableCompat))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Graphics.Drawable.DrawableContainer))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Graphics.Drawable.DrawableWrapper))]
// [assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Content.Res.AppCompatResources))]
//[assembly:TypeForwardedToAttribute(typeof(AndroidX.AppCompat.Widget.ResourceManagerInternal.AsldcInflateDelegate))]
8 changes: 4 additions & 4 deletions ...out/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs
View file
Original file line number Diff line number Diff line change
@@ -8,18 +8,18 @@ public partial class SwipeRefreshLayout
{
public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes, int @type)
{
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
// Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;

OnNestedScrollAccepted (child, target, scroll_axes, @type);
OnNestedScrollAccepted (child, target, axes, @type);

return;
}

public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type)
{
Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;
// Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes;

return OnStartNestedScroll (child, target, scroll_axes, @type);
return OnStartNestedScroll (child, target, axes, @type);
}
}
}
227 changes: 0 additions & 227 deletions source/migration/BuildTasks/Xamarin.AndroidX.Migration.props
View file

Large diffs are not rendered by default.

74 changes: 9 additions & 65 deletions tests/AndroidXMigrationTests/Tests/DependenciesTests.cs
View file
Original file line number Diff line number Diff line change
@@ -12,18 +12,18 @@ public void CanLoadJsonFile()

Assert.NotEmpty(tree.Packages);

Assert.NotNull(tree.Packages.FirstOrDefault(p => p.Id == "Xamarin.Google.Android.Material"));
Assert.NotNull(tree.Packages.FirstOrDefault(p => p.Id == "Xamarin.AndroidX.SwipeRefreshLayout"));

var material = tree.GetOrCreate("Xamarin.Google.Android.Material");
Assert.Contains("Xamarin.AndroidX.AppCompat", material.Dependencies);
var material = tree.GetOrCreate("Xamarin.AndroidX.SwipeRefreshLayout");
Assert.Contains("Xamarin.AndroidX.Interpolator", material.Dependencies);
}

[Fact]
public void CanFlattenDependencies()
{
var tree = PackageDependencyTree.Load();

var flattened = tree.Flatten("Xamarin.AndroidX.Palette").ToArray();
var flattened = tree.Flatten("Xamarin.AndroidX.Fragment").ToArray();

Assert.Contains("Xamarin.AndroidX.Annotation", flattened);
Assert.Equal(flattened, flattened.Distinct().ToArray());
@@ -241,7 +241,7 @@ public void FlattenThenReduceEndsUpInTheSamePlace()

var flattened = tree.Flatten(ids);
Assert.NotEmpty(flattened);
Assert.NotEqual(ids, flattened);
Assert.Equal(ids, flattened);

var actual = tree.Reduce(flattened);
Assert.Equal(ids, actual);
@@ -253,79 +253,31 @@ public void XamarinFormsTopLevelPackagesExpandToAll()
var ids = new[]
{
"Xamarin.AndroidX.AppCompat",
"Xamarin.AndroidX.Browser",
"Xamarin.AndroidX.CardView",
"Xamarin.AndroidX.Legacy.Support.Core.Utils",
"Xamarin.AndroidX.Legacy.Support.V4",
"Xamarin.Google.Android.Material",
};

var expected = new[]
{
"Xamarin.AndroidX.Activity",
"Xamarin.AndroidX.Annotation",
"Xamarin.AndroidX.Annotation.Experimental",
"Xamarin.AndroidX.AppCompat",
"Xamarin.AndroidX.AppCompat.AppCompatResources",
"Xamarin.AndroidX.Arch.Core.Common",
"Xamarin.AndroidX.Arch.Core.Runtime",
"Xamarin.AndroidX.AsyncLayoutInflater",
"Xamarin.AndroidX.Browser",
"Xamarin.AndroidX.CardView",
"Xamarin.AndroidX.Collection",
"Xamarin.AndroidX.Concurrent.Futures",
"Xamarin.AndroidX.ConstraintLayout",
"Xamarin.AndroidX.ConstraintLayout.Core",
"Xamarin.AndroidX.CoordinatorLayout",
"Xamarin.AndroidX.Core",
"Xamarin.AndroidX.Core.Core.Ktx",
"Xamarin.AndroidX.CursorAdapter",
"Xamarin.AndroidX.CustomView",
"Xamarin.AndroidX.DocumentFile",
"Xamarin.AndroidX.DrawerLayout",
"Xamarin.AndroidX.DynamicAnimation",
"Xamarin.AndroidX.Emoji2",
"Xamarin.AndroidX.Emoji2.ViewsHelper",
"Xamarin.AndroidX.Fragment",
"Xamarin.AndroidX.Interpolator",
"Xamarin.AndroidX.Legacy.Support.Core.UI",
"Xamarin.AndroidX.Legacy.Support.Core.Utils",
"Xamarin.AndroidX.Legacy.Support.V4",
"Xamarin.AndroidX.Lifecycle.Common",
"Xamarin.AndroidX.Lifecycle.LiveData.Core",
"Xamarin.AndroidX.Lifecycle.Process",
"Xamarin.AndroidX.Lifecycle.Runtime",
"Xamarin.AndroidX.Lifecycle.ViewModel",
"Xamarin.AndroidX.Lifecycle.ViewModelSavedState",
"Xamarin.AndroidX.Loader",
"Xamarin.AndroidX.LocalBroadcastManager",
"Xamarin.AndroidX.Media",
"Xamarin.AndroidX.Migration",
"Xamarin.AndroidX.MultiDex",
"Xamarin.AndroidX.Print",
"Xamarin.AndroidX.RecyclerView",
"Xamarin.AndroidX.ResourceInspection.Annotation",
"Xamarin.AndroidX.SavedState",
"Xamarin.AndroidX.SlidingPaneLayout",
"Xamarin.AndroidX.Startup.StartupRuntime",
"Xamarin.AndroidX.SwipeRefreshLayout",
"Xamarin.AndroidX.Tracing.Tracing",
"Xamarin.AndroidX.Transition",
"Xamarin.AndroidX.VectorDrawable",
"Xamarin.AndroidX.VectorDrawable.Animated",
"Xamarin.AndroidX.VersionedParcelable",
"Xamarin.AndroidX.ViewPager",
"Xamarin.AndroidX.ViewPager2",
"Xamarin.AndroidX.Window",
"Xamarin.Google.Android.Material",
"Xamarin.Google.Guava.ListenableFuture",
"Xamarin.Jetbrains.Annotations",
"Xamarin.Kotlin.StdLib",
"Xamarin.Kotlin.StdLib.Common",
"Xamarin.Kotlin.StdLib.Jdk7",
"Xamarin.Kotlin.StdLib.Jdk8",
"Xamarin.KotlinX.Coroutines.Android",
"Xamarin.KotlinX.Coroutines.Core.Jvm"
};

var tree = PackageDependencyTree.Load();
@@ -350,7 +302,6 @@ public void XamarinFormsTotalDependencyIsReduced()
"Xamarin.AndroidX.Lifecycle.LiveData",
"Xamarin.AndroidX.Lifecycle.Runtime",
"Xamarin.AndroidX.Lifecycle.ViewModel",
"Xamarin.AndroidX.VectorDrawable.Animated",
"Xamarin.AndroidX.Annotation",
"Xamarin.AndroidX.AsyncLayoutInflater",
"Xamarin.AndroidX.Collection",
@@ -359,38 +310,31 @@ public void XamarinFormsTotalDependencyIsReduced()
"Xamarin.AndroidX.Legacy.Support.Core.UI",
"Xamarin.AndroidX.Legacy.Support.Core.Utils",
"Xamarin.AndroidX.CursorAdapter",
"Xamarin.AndroidX.Browser",
"Xamarin.AndroidX.CustomView",
"Xamarin.Google.Android.Material",
"Xamarin.AndroidX.DocumentFile",
"Xamarin.AndroidX.DrawerLayout",
"Xamarin.AndroidX.Fragment",
"Xamarin.AndroidX.Interpolator",
"Xamarin.AndroidX.Loader",
"Xamarin.AndroidX.LocalBroadcastManager",
"Xamarin.AndroidX.Media",
"Xamarin.AndroidX.Print",
"Xamarin.AndroidX.SlidingPaneLayout",
"Xamarin.AndroidX.SwipeRefreshLayout",
"Xamarin.AndroidX.Transition",
"Xamarin.AndroidX.Legacy.Support.V4",
"Xamarin.AndroidX.AppCompat",
"Xamarin.AndroidX.CardView",
"Xamarin.AndroidX.MediaRouter",
"Xamarin.AndroidX.Palette",
"Xamarin.AndroidX.RecyclerView",
"Xamarin.AndroidX.VectorDrawable",
"Xamarin.AndroidX.VersionedParcelable",
"Xamarin.AndroidX.ViewPager",
};

var expected = new[]
{
"Xamarin.AndroidX.Browser",
"Xamarin.AndroidX.AppCompat",
"Xamarin.AndroidX.CardView",
"Xamarin.AndroidX.Fragment",
"Xamarin.AndroidX.Legacy.Support.V4",
"Xamarin.AndroidX.Lifecycle.LiveData",
"Xamarin.AndroidX.MediaRouter",
"Xamarin.Google.Android.Material",
"Xamarin.AndroidX.Palette",
};

var tree = PackageDependencyTree.Load();
459 changes: 0 additions & 459 deletions tests/AndroidXMigrationTests/Tests/JniStringMigrationTests.cs
View file

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions tests/AndroidXMigrationTests/Tests/ManagedMigrationTests.cs
View file
Original file line number Diff line number Diff line change
@@ -59,8 +59,8 @@ public void AssembliesHaveTheSameNumberOfTypes(string supportDll, string android
}
}

[Theory]
[InlineData(ActiveDirectoryDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts)]
//[Theory]
//[InlineData(ActiveDirectoryDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts)]
public void CanRunMigrationOnNonPortablePdbs(string assembly, CecilMigrationResult expectedResult)
{
Assert.False(IsPortablePdb(Path.ChangeExtension(assembly, "pdb")));
@@ -70,10 +70,10 @@ public void CanRunMigrationOnNonPortablePdbs(string assembly, CecilMigrationResu
Assert.True(IsPortablePdb(Path.ChangeExtension(output, "pdb")), output);
}

[Theory]
[InlineData(ManagedSupportDll, ManagedAndroidXDll, true, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
[InlineData(OldSupportDll, OldAndroidXDll, true, CecilMigrationResult.ContainedSupport)]
[InlineData(BindingSupportDll, BindingAndroidXDll, false, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJni | CecilMigrationResult.ContainedJni | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[Theory]
//[InlineData(ManagedSupportDll, ManagedAndroidXDll, true, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[InlineData(OldSupportDll, OldAndroidXDll, true, CecilMigrationResult.ContainedSupport)]
//[InlineData(BindingSupportDll, BindingAndroidXDll, false, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJni | CecilMigrationResult.ContainedJni | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
public void AssembliesHaveTheSameTypesAfterMigration(string supportDll, string androidXDll, bool ignoreResourceType, CecilMigrationResult expectedResult)
{
var migratedDll = RunMigration(supportDll, expectedResult);
@@ -85,10 +85,10 @@ public void AssembliesHaveTheSameTypesAfterMigration(string supportDll, string a
}
}

[Theory]
[InlineData(ManagedSupportDll, ManagedAndroidXDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
[InlineData(OldSupportDll, OldAndroidXDll, CecilMigrationResult.ContainedSupport)]
[InlineData(BindingSupportDll, BindingAndroidXDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJni | CecilMigrationResult.ContainedJni | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[Theory]
//[InlineData(ManagedSupportDll, ManagedAndroidXDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[InlineData(OldSupportDll, OldAndroidXDll, CecilMigrationResult.ContainedSupport)]
//[InlineData(BindingSupportDll, BindingAndroidXDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJni | CecilMigrationResult.ContainedJni | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
public void AssembliesHaveTheSameReferencesAfterMigration(string supportDll, string androidXDll, CecilMigrationResult expectedResult)
{
var migratedDll = RunMigration(supportDll, expectedResult);
@@ -102,10 +102,10 @@ public void AssembliesHaveTheSameReferencesAfterMigration(string supportDll, str
}
}

[Theory]
[InlineData(ManagedSupportDll, ManagedAndroidXDll, true, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
[InlineData(OldSupportDll, OldAndroidXDll, true, CecilMigrationResult.ContainedSupport)]
[InlineData(BindingSupportDll, BindingAndroidXDll, false, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJni | CecilMigrationResult.ContainedJni | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[Theory]
//[InlineData(ManagedSupportDll, ManagedAndroidXDll, true, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[InlineData(OldSupportDll, OldAndroidXDll, true, CecilMigrationResult.ContainedSupport)]
//[InlineData(BindingSupportDll, BindingAndroidXDll, false, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJni | CecilMigrationResult.ContainedJni | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
public void AllTypesHaveTheSameMembers(string supportDll, string androidXDll, bool ignoreResourceType, CecilMigrationResult expectedResult)
{
var migratedDll = RunMigration(supportDll, expectedResult);
@@ -144,10 +144,10 @@ public void EmbeddedJavaArtifactsAreMigrated(string supportDll, string layoutFil
}
}

[Theory]
[InlineData(ActiveDirectoryDll, ActiveDirectoryPdb, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts)]
[InlineData(ManagedSupportDll, ActiveDirectoryPdb, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
[InlineData(ManagedSupportDll, ManagedSupportDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[Theory]
//[InlineData(ActiveDirectoryDll, ActiveDirectoryPdb, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts)]
//[InlineData(ManagedSupportDll, ActiveDirectoryPdb, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
//[InlineData(ManagedSupportDll, ManagedSupportDll, CecilMigrationResult.ContainedSupport | CecilMigrationResult.PotentialJavaArtifacts | CecilMigrationResult.ContainedJavaArtifacts)]
public void CanRunMigrationOnCorruptedPdbs(string assembly, string symbols, CecilMigrationResult expectedResult)
{
var dll = Utils.GetTempFilename(Path.GetFileName(assembly));