Skip to content

Weekly stable updates #589

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

Merged
merged 5 commits into from
Jul 28, 2022
Merged

Weekly stable updates #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1efe174
Weekly stable updates
jpobst Jul 25, 2022
c0f56a9
samples rewritten
moljac Jul 26, 2022
9a371dc
XamarinDotNetWorkloadSource updated
moljac Jul 26, 2022
6455980
Create workloads.json
moljac Jul 26, 2022
ad418b9
Merge branch 'main' into create-pull-request/patch-1658729135
moljac Jul 27, 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
77 changes: 40 additions & 37 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,21 +753,25 @@ Task("samples")
if (!string.IsNullOrEmpty(MSBUILD_PATH))
settings_msbuild.ToolPath = MSBUILD_PATH;

Information($"=====================================================================================================");
Information("MSBuild ./samples/BuildAll/BuildAll.sln");
MSBuild("./samples/BuildAll/BuildAll.sln", settings_msbuild);
Information($"=====================================================================================================");
Information("MSBuild ./samples/BuildXamarinFormsApp/BuildXamarinFormsApp.sln");
// MSBuild("./samples/BuildXamarinFormsApp/BuildXamarinFormsApp.sln", settings_msbuild);
Information($"=====================================================================================================");
Information("MSBuild ./samples/BuildMinimalMaterial/BuildMinimalMaterial.sln");
MSBuild("./samples/BuildMinimalMaterial/BuildMinimalMaterial.sln", settings_msbuild);
Information($"=====================================================================================================");
// Information("MSBuild ./samples/BuildMinimalMaterialAppCompat/BuildMinimalMaterialAppCompat.sln ");
// MSBuild("./samples/BuildMinimalMaterialAppCompat/BuildMinimalMaterialAppCompat.sln ", settings_msbuild);
Information($"=====================================================================================================");
// Information("MSBuild ./samples/dotnet/BuildAllDotNet.sln");
// MSBuild("./samples/dotnet/BuildAllDotNet.sln", settings_msbuild);
string[] solutions = new string[]
{
"./samples/BuildAll/BuildAll.sln",
"./samples/BuildXamarinFormsApp/BuildXamarinFormsApp.sln",
"./samples/BuildMinimalMaterial/BuildMinimalMaterial.sln",
//"./samples/BuildMinimalMaterialAppCompat/BuildMinimalMaterialAppCompat.sln",
//"./samples/dotnet/BuildAllDotNet.sln", //MSBuild cannot handle net6 projects
};

foreach(string solution in solutions)
{
FilePath fp_solution = new FilePath(solution);
string filename = fp_solution.GetFilenameWithoutExtension().ToString();
Information($"=====================================================================================================");
Information($"MSBuild {solution} / {filename}");
MSBuild(solution, settings_msbuild.EnableBinaryLogger($"./output/samples.{filename}.{CONFIGURATION}.msbuild.{DateTime.Now.ToString("yyyyMMddHHmmss")}.binlog"));
}

RunTarget("samples-dotnet");

return;
});
Expand All @@ -793,29 +797,28 @@ Task("samples-dotnet")
if (!string.IsNullOrEmpty(ANDROID_HOME))
settings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");

Information($"=====================================================================================================");
Information("DotNetBuild ./samples/dotnet/BuildAllDotNet.sln");
DotNetRestore("./samples/dotnet/BuildAllDotNet.sln", new DotNetRestoreSettings
string[] solutions = new string[]
{
MSBuildSettings = settings.EnableBinaryLogger("./output/samples-dotnet-restore.binlog")
});
DotNetMSBuild("./samples/dotnet/BuildAllDotNet.sln", settings);
"./samples/dotnet/BuildAllDotNet.sln", //MSBuild cannot handle net6 projects
"./samples/dotnet/BuildAllMauiApp.sln",
"./samples/dotnet/BuildAllXamarinForms.sln",
};

Information($"=====================================================================================================");
Information("DotNetBuild ./samples/dotnet/BuildAllMauiApp.sln");
DotNetRestore("./samples/dotnet/BuildAllMauiApp.sln", new DotNetRestoreSettings
{
MSBuildSettings = settings.EnableBinaryLogger("./output/samples-dotnet-restore.binlog")
});
DotNetMSBuild("./samples/dotnet/BuildAllMauiApp.sln", settings);
Information($"=====================================================================================================");
Information("DotNetBuild ./samples/dotnet/BuildAllXamarinForms.sln");
DotNetRestore("./samples/dotnet/BuildAllXamarinForms.sln", new DotNetRestoreSettings
foreach(string solution in solutions)
{
MSBuildSettings = settings.EnableBinaryLogger("./output/samples-dotnet-restore.binlog")
});
DotNetMSBuild("./samples/dotnet/BuildAllXamarinForms.sln", settings);

FilePath fp_solution = new FilePath(solution);
string filename = fp_solution.GetFilenameWithoutExtension().ToString();
Information($"=====================================================================================================");
Information($"DotNetMSBuild {solution} / {filename}");
DotNetRestore(solution, new DotNetRestoreSettings
{
MSBuildSettings = settings.EnableBinaryLogger($"./output/samples-dotnet-restore-{filename}.binlog")
});
DotNetBuild(solution, new DotNetBuildSettings
{
MSBuildSettings = settings.EnableBinaryLogger($"./output/samples-dotnet-dotnet-msbuild-{filename}.binlog")
});
}
});

Task("api-diff")
Expand Down Expand Up @@ -971,15 +974,15 @@ Task ("full-run")
.IsDependentOn ("binderate")
.IsDependentOn ("nuget")
.IsDependentOn ("samples")
.IsDependentOn ("samples-dotnet");
;

Task ("ci")
.IsDependentOn ("check-tools")
.IsDependentOn ("inject-variables")
.IsDependentOn ("binderate")
.IsDependentOn ("nuget")
.IsDependentOn ("samples")
.IsDependentOn ("samples-dotnet");
;

// for local builds, conditionally do the first binderate
if (FileExists ("./generated/AndroidX.sln")) {
Expand Down
32 changes: 16 additions & 16 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,8 +1454,8 @@
{
"groupId": "org.checkerframework",
"artifactId": "checker-qual",
"version": "3.22.2",
"nugetVersion": "3.22.2",
"version": "3.23.0",
"nugetVersion": "3.23.0",
"nugetId": "Xamarin.CheckerFramework.CheckerQual",
"dependencyOnly": false,
"templateSet": "no-bindings"
Expand Down Expand Up @@ -1529,62 +1529,62 @@
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-android",
"version": "1.6.3",
"nugetVersion": "1.6.3",
"version": "1.6.4",
"nugetVersion": "1.6.4",
"nugetId": "Xamarin.KotlinX.Coroutines.Android",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-core",
"version": "1.6.3",
"nugetVersion": "1.6.3",
"version": "1.6.4",
"nugetVersion": "1.6.4",
"nugetId": "Xamarin.KotlinX.Coroutines.Core",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-core-jvm",
"version": "1.6.3",
"nugetVersion": "1.6.3",
"version": "1.6.4",
"nugetVersion": "1.6.4",
"nugetId": "Xamarin.KotlinX.Coroutines.Core.Jvm",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-guava",
"version": "1.6.3",
"nugetVersion": "1.6.3",
"version": "1.6.4",
"nugetVersion": "1.6.4",
"nugetId": "Xamarin.KotlinX.Coroutines.Guava",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-jdk8",
"version": "1.6.3",
"nugetVersion": "1.6.3",
"version": "1.6.4",
"nugetVersion": "1.6.4",
"nugetId": "Xamarin.KotlinX.Coroutines.Jdk8",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-reactive",
"version": "1.6.3",
"nugetVersion": "1.6.3",
"version": "1.6.4",
"nugetVersion": "1.6.4",
"nugetId": "Xamarin.KotlinX.Coroutines.Reactive",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-rx2",
"version": "1.6.3",
"nugetVersion": "1.6.3",
"version": "1.6.4",
"nugetVersion": "1.6.4",
"nugetId": "Xamarin.KotlinX.Coroutines.Rx2",
"dependencyOnly": false,
"templateSet": "kotlinx"
Expand Down