Skip to content

[main] Update dependencies from dotnet/installer #8828

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
jonathanpeppers merged 7 commits into from
Mar 28, 2024
Merged

[main] Update dependencies from dotnet/installer #8828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93e5417
Update dependencies from https://github.com/dotnet/installer build
dotnet-maestro[bot] Mar 25, 2024
1e2a84e
[tests] set $(TrimmerSingleWarn) to false
jonathanpeppers Mar 25, 2024
0e86a47
Default $(_AndroidIncludeSystemGlobalizationNative) to true
jonathanpeppers Mar 25, 2024
21ed696
`.apkdesc` files
jonathanpeppers Mar 26, 2024
663249b
FIXME: https://github.com/dotnet/runtime/issues/100256
jonathanpeppers Mar 27, 2024
7db3d32
Adjust assertions
jonathanpeppers Mar 28, 2024
7e036a9
Adjust assertions again
jonathanpeppers Mar 28, 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
Prev Previous commit
Next Next commit
Adjust assertions
  • Loading branch information
@jonathanpeppers
jonathanpeppers committed Mar 28, 2024
commit 7db3d321c355d1dcb7c801848ce18f5c132fdc07
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
// FIXME: https://github.com/dotnet/runtime/issues/100256
if (isRelease) {
if (proj.TrimModeRelease == TrimMode.Full) {
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 1 Warning(s)"), $"{b.BuildLogFile} should have 1 MSBuild warning.");
} else {
b.AssertHasNoWarnings ();
Expand Down
7 changes: 5 additions & 2 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ public void DotNetNew ([Values ("android", "androidlib", "android-bindinglib", "
// Release build
Assert.IsTrue (dotnet.Build (parameters: new [] { "Configuration=Release", "TrimmerSingleWarn=false" }), "`dotnet build` should succeed");
// FIXME: https://github.com/dotnet/runtime/issues/100256
//dotnet.AssertHasNoWarnings ();
Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, " 1 Warning(s)"), $"{dotnet.BuildLogFile} should have 1 MSBuild warning.");
if (template.Contains ("lib")) {
dotnet.AssertHasNoWarnings ();
} else {
Assert.IsTrue (StringAssertEx.ContainsText (dotnet.LastBuildOutput, " 1 Warning(s)"), $"{dotnet.BuildLogFile} should have 1 MSBuild warning.");
}
}

static readonly object[] DotNetPackTargetFrameworks = new object[] {
Expand Down