From 1be91136898e3c1f3a3cba03f09971233bd2d054 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 31 Jan 2025 13:45:06 -0600
Subject: [PATCH] Bump to dotnet/sdk/release/10.0.1xx-preview1@ee4ea82428
10.0.100-preview.1.25080.14 (#9732)
Changes: https://github.com/dotnet/sdk/compare/aca4b810e2...ee4ea82428
Updates:
* Microsoft.NET.Sdk: from 10.0.100-alpha.1.25069.2 to 10.0.100-preview.1.25080.14
* Microsoft.NETCore.App.Ref: from 10.0.0-alpha.1.25067.10 to 10.0.0-preview.1.25078.5 (parent: Microsoft.NET.Sdk)
* Microsoft.NET.ILLink.Tasks: from 10.0.0-alpha.1.25067.10 to 10.0.0-preview.1.25078.5 (parent: Microsoft.NET.Sdk)
Other changes:
* Default app project builds to `$(_AndroidUseLibZipSharp)=true` to avoid:
error ANDZA0000: 01-30 21:38:27.669 38611 159726 W zip : WARNING: header mismatch
Reported: https://github.com/dotnet/runtime/issues/112017
* Update `` MSBuild task to substring long `darc-` branch names to avoid:
NuGet.Build.Tasks.Pack.targets(221,5): error NU5123: Warning As Error: The file 'package/services/metadata/core-properties/027a96e260344b159133798c830dab61.psmdcp' path, name, or both are too long. Your package might not work without long file path support. Please shorten the file path or file name.
Co-authored-by: Jonathan Peppers
---
.../GitBranch.cs | 22 ++++++++++++++-----
eng/Version.Details.xml | 12 +++++-----
eng/Versions.props | 6 ++---
...soft.Android.Sdk.DefaultProperties.targets | 3 +++
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs
index 73f386038df..eb1e28954b4 100644
--- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs
+++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs
@@ -32,7 +32,7 @@ public override bool Execute ()
if (!string.IsNullOrEmpty (build_sourcebranchname) && build_sourcebranchname.IndexOf ("merge", StringComparison.OrdinalIgnoreCase) == -1) {
Branch = build_sourcebranchname.Replace ("refs/heads/", string.Empty);
Log.LogMessage ($"Using BUILD_SOURCEBRANCH value: {Branch}");
- return true;
+ goto done;
}
string gitHeadFile = Path.Combine (WorkingDirectory.ItemSpec, ".git", "HEAD");
@@ -48,15 +48,27 @@ public override bool Execute ()
base.Execute ();
}
+done:
+ CheckBranchLength ();
+ Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}");
+ return !Log.HasLoggedErrors;
+ }
+
+ void CheckBranchLength ()
+ {
// Trim generated dependabot branch names that are too long to produce useful package names
+ const int maxBranchLength = 32;
var lastSlashIndex = Branch.LastIndexOf ('/');
- if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > 60) {
+ if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > maxBranchLength) {
+ Log.LogMessage ($"Trimming characters from the branch name at index {lastSlashIndex}: {Branch}");
Branch = Branch.Substring (lastSlashIndex + 1);
}
- Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}");
-
- return !Log.HasLoggedErrors;
+ // Trim darc/Maestro branch names that are too long
+ if (Branch.StartsWith ("darc-") && Branch.Length > maxBranchLength) {
+ Log.LogMessage ($"Trimming to {maxBranchLength} characters from the branch name: {Branch}");
+ Branch = Branch.Substring (0, maxBranchLength);
+ }
}
protected override string GenerateCommandLineCommands ()
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a0e2c593990..31c90432d65 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
-
+
https://github.com/dotnet/sdk
- aca4b810e2be4b6b8aed3bcaf9e36bf3d1962a47
+ ee4ea824289fa0d32a3829d09703eb61b4b4b665
-
+
https://github.com/dotnet/runtime
- 6c58f7992cfd628a53d9b90f258ac123cb803644
+ 1da2ea4983bb5cc3d17a3806eebc435df4cd27dd
-
+
https://github.com/dotnet/runtime
- 6c58f7992cfd628a53d9b90f258ac123cb803644
+ 1da2ea4983bb5cc3d17a3806eebc435df4cd27dd
https://github.com/dotnet/emsdk
diff --git a/eng/Versions.props b/eng/Versions.props
index fe49c0c8a3a..343aed669f3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,10 +1,10 @@
- 10.0.100-alpha.1.25069.2
+ 10.0.100-preview.1.25080.14
$(MicrosoftNETSdkPackageVersion)
- 10.0.0-alpha.1.25067.10
- 10.0.0-alpha.1.25067.10
+ 10.0.0-preview.1.25078.5
+ 10.0.0-preview.1.25078.5
7.0.0-beta.22103.1
10.0.0-beta.24476.2
10.0.0-alpha.1.25059.1
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
index 1433d3efd6e..c6cc7b24ef3 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets
@@ -138,6 +138,9 @@
True
+
+
+ <_AndroidUseLibZipSharp Condition=" '$(_AndroidUseLibZipSharp)' == '' ">true