Skip to content
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

Jump to bottom

Weekly stable updates 20240503 #887

Closed
wants to merge 7 commits into from
Closed

Weekly stable updates 20240503 #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b42d0d7
build.cake fixed to allow r8.jar customizations
moljac May 30, 2024
5c4565a
re-added Xamarin.AndroidX.Core.Animation and Xamarin.AndroidX.VectorD…
moljac May 30, 2024
c7751ce
automatic files
moljac May 30, 2024
c6af9b6
temporarily downgraded artifacts that have issues with old r8.jar
moljac Jun 3, 2024
cc6f034
typo fixed
moljac Jun 3, 2024
f885426
output added
moljac Jun 3, 2024
67fdc4a
Merge branch 'main' into wsu-20240503
moljac Jun 3, 2024
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
52 changes: 39 additions & 13 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,8 @@ Task ("binderate")
var configFile = MakeAbsolute(new FilePath("./config.json")).FullPath;
var basePath = MakeAbsolute(new DirectoryPath ("./")).FullPath;

Information("xamarin-android-binderator" +
$"--config=\"{configFile}\" --basepath=\"{basePath}\"");
// Run the dotnet tool for binderator
RunProcess("xamarin-android-binderator",
$"--config=\"{configFile}\" --basepath=\"{basePath}\"");
Expand Down Expand Up @@ -770,31 +772,55 @@ Task("samples-only-dotnet")
EnsureDirectoryExists(packagesPath);
CleanDirectories(packagesPath);

var settings = new DotNetMSBuildSettings()
.SetConfiguration("Debug") // We don't need to run linking
.WithProperty("Verbosity", VERBOSITY.ToString())
.WithProperty("RestorePackagesPath", packagesPath)
.WithProperty("AndroidSdkBuildToolsVersion", $"{AndroidSdkBuildTools}");

if (!string.IsNullOrEmpty(ANDROID_HOME))
settings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");

string[] solutions = new string[]
{
"./samples/dotnet/BuildAllDotNet.sln",
"./samples/dotnet/BuildAllMauiApp.sln",
};

string url_r8 = "https://maven.google.com/com/android/tools/r8/8.3.37/r8-8.3.37.jar";
DownloadFile(url_r8, "./externals/r8.jar");

foreach(string solution in solutions)
{
var settings = new DotNetMSBuildSettings()
.SetConfiguration("Debug") // We don't need to run linking
.WithProperty("Verbosity", VERBOSITY.ToString())
.WithProperty("RestorePackagesPath", packagesPath)
.WithProperty("AndroidSdkBuildToolsVersion", $"{AndroidSdkBuildTools}");

if (!string.IsNullOrEmpty(ANDROID_HOME))
settings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");
FilePath fp_solution = new FilePath(solution);
string filename = fp_solution.GetFilenameWithoutExtension().ToString();
Information($"=====================================================================================================");
Information($"DotNetBuild {solution} / {filename}");
DotNetBuild(solution, new DotNetBuildSettings
Information($"DotNetBuild {solution} / {filename}");

DotNetBuildSettings dbs = null;
string path;

if (solution == "./samples/dotnet/BuildAllDotNet.sln")
{
path = "../../../externals/r8.jar";
dbs = new DotNetBuildSettings
{
MSBuildSettings = settings
.EnableBinaryLogger($"./output/samples-dotnet-dotnet-msbuild-{filename}.binlog")
.WithProperty("AndroidR8JarPath", path)
};
}
else if (solution == "./samples/dotnet/BuildAllMauiApp.sln")
{
MSBuildSettings = settings.EnableBinaryLogger($"./output/samples-dotnet-dotnet-msbuild-{filename}.binlog")
});
path = "../../../externals/r8.jar";
dbs = new DotNetBuildSettings
{
MSBuildSettings = settings
.EnableBinaryLogger($"./output/samples-dotnet-dotnet-msbuild-{filename}.binlog")
.WithProperty("AndroidR8JarPath", path)
};
}

DotNetBuild(solution, dbs);
}
});

Expand Down
8 changes: 4 additions & 4 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,9 +1125,9 @@
"maven": {
"artifactId": "core-animation",
"groupId": "androidx.core",
"version": "1.0.0-alpha02",
"version": "1.0.0",
"nuGetId": "Xamarin.AndroidX.Core.Animation",
"nuGetVersion": "1.0.0.22-alpha02"
"nuGetVersion": "1.0.0"
}
},
"license": "The Apache Software License, Version 2.0"
Expand Down Expand Up @@ -2724,9 +2724,9 @@
"maven": {
"artifactId": "vectordrawable",
"groupId": "androidx.vectordrawable",
"version": "1.1.0",
"version": "1.2.0",
"nuGetId": "Xamarin.AndroidX.VectorDrawable",
"nuGetVersion": "1.1.0.24"
"nuGetVersion": "1.2.0"
}
},
"license": "The Apache Software License, Version 2.0"
Expand Down
4 changes: 2 additions & 2 deletions docs/artifact-list-with-versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
| 84|androidx.contentpager:contentpager |1.0.0 |Xamarin.AndroidX.ContentPager |1.0.0.24 |
| 85|androidx.coordinatorlayout:coordinatorlayout |1.2.0 |Xamarin.AndroidX.CoordinatorLayout |1.2.0.12 |
| 86|androidx.core:core |1.13.1 |Xamarin.AndroidX.Core |1.13.1 |
| 87|androidx.core:core-animation |1.0.0-alpha02 |Xamarin.AndroidX.Core.Animation |1.0.0.22-alpha02 |
| 87|androidx.core:core-animation |1.0.0 |Xamarin.AndroidX.Core.Animation |1.0.0 |
| 88|androidx.core:core-google-shortcuts |1.1.0 |Xamarin.AndroidX.Core.GoogleShortcuts |1.1.0.9 |
| 89|androidx.core:core-ktx |1.13.1 |Xamarin.AndroidX.Core.Core.Ktx |1.13.1 |
| 90|androidx.core:core-role |1.0.0 |Xamarin.AndroidX.Core.Role |1.0.0.22 |
Expand Down Expand Up @@ -214,7 +214,7 @@
| 207|androidx.tracing:tracing |1.2.0 |Xamarin.AndroidX.Tracing.Tracing |1.2.0.2 |
| 208|androidx.transition:transition |1.5.0 |Xamarin.AndroidX.Transition |1.5.0 |
| 209|androidx.tvprovider:tvprovider |1.0.0 |Xamarin.AndroidX.TvProvider |1.0.0.26 |
| 210|androidx.vectordrawable:vectordrawable |1.1.0 |Xamarin.AndroidX.VectorDrawable |1.1.0.24 |
| 210|androidx.vectordrawable:vectordrawable |1.2.0 |Xamarin.AndroidX.VectorDrawable |1.2.0 |
| 211|androidx.vectordrawable:vectordrawable-animated |1.1.0 |Xamarin.AndroidX.VectorDrawable.Animated |1.1.0.24 |
| 212|androidx.versionedparcelable:versionedparcelable |1.2.0 |Xamarin.AndroidX.VersionedParcelable |1.2.0.2 |
| 213|androidx.viewpager:viewpager |1.0.0 |Xamarin.AndroidX.ViewPager |1.0.0.24 |
Expand Down