Skip to content

Commit 1be9113

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/sdk@ee4ea82428 10.0.100-preview.1.25080.14 (#9732)
Changes: dotnet/sdk@aca4b81...ee4ea82 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: dotnet/runtime#112017 * Update `<GitBranch/>` 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 <[email protected]>
1 parent 51c73e6 commit 1be9113

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

‎build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public override bool Execute ()
3232
if (!string.IsNullOrEmpty (build_sourcebranchname) && build_sourcebranchname.IndexOf ("merge", StringComparison.OrdinalIgnoreCase) == -1) {
3333
Branch = build_sourcebranchname.Replace ("refs/heads/", string.Empty);
3434
Log.LogMessage ($"Using BUILD_SOURCEBRANCH value: {Branch}");
35-
return true;
35+
goto done;
3636
}
3737

3838
string gitHeadFile = Path.Combine (WorkingDirectory.ItemSpec, ".git", "HEAD");
@@ -48,15 +48,27 @@ public override bool Execute ()
4848
base.Execute ();
4949
}
5050

51+
done:
52+
CheckBranchLength ();
53+
Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}");
54+
return !Log.HasLoggedErrors;
55+
}
56+
57+
void CheckBranchLength ()
58+
{
5159
// Trim generated dependabot branch names that are too long to produce useful package names
60+
const int maxBranchLength = 32;
5261
var lastSlashIndex = Branch.LastIndexOf ('/');
53-
if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > 60) {
62+
if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > maxBranchLength) {
63+
Log.LogMessage ($"Trimming characters from the branch name at index {lastSlashIndex}: {Branch}");
5464
Branch = Branch.Substring (lastSlashIndex + 1);
5565
}
5666

57-
Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}");
58-
59-
return !Log.HasLoggedErrors;
67+
// Trim darc/Maestro branch names that are too long
68+
if (Branch.StartsWith ("darc-") && Branch.Length > maxBranchLength) {
69+
Log.LogMessage ($"Trimming to {maxBranchLength} characters from the branch name: {Branch}");
70+
Branch = Branch.Substring (0, maxBranchLength);
71+
}
6072
}
6173

6274
protected override string GenerateCommandLineCommands ()

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.25069.2">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.1.25080.14">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>aca4b810e2be4b6b8aed3bcaf9e36bf3d1962a47</Sha>
5+
<Sha>ee4ea824289fa0d32a3829d09703eb61b4b4b665</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.25067.10" CoherentParentDependency="Microsoft.NET.Sdk">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.1.25078.5" CoherentParentDependency="Microsoft.NET.Sdk">
88
<Uri>https://github.com/dotnet/runtime</Uri>
9-
<Sha>6c58f7992cfd628a53d9b90f258ac123cb803644</Sha>
9+
<Sha>1da2ea4983bb5cc3d17a3806eebc435df4cd27dd</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25067.10" CoherentParentDependency="Microsoft.NET.Sdk">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.1.25078.5" CoherentParentDependency="Microsoft.NET.Sdk">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>6c58f7992cfd628a53d9b90f258ac123cb803644</Sha>
13+
<Sha>1da2ea4983bb5cc3d17a3806eebc435df4cd27dd</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.25059.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.25069.2</MicrosoftNETSdkPackageVersion>
4+
<MicrosoftNETSdkPackageVersion>10.0.100-preview.1.25080.14</MicrosoftNETSdkPackageVersion>
55
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.25067.10</MicrosoftNETILLinkTasksPackageVersion>
7-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.25067.10</MicrosoftNETCoreAppRefPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.1.25078.5</MicrosoftNETILLinkTasksPackageVersion>
7+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.1.25078.5</MicrosoftNETCoreAppRefPackageVersion>
88
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
99
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
1010
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>10.0.0-alpha.1.25059.1</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion>

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@
138138

139139
<!-- profiler won't work without internet permission, we must thus force it -->
140140
<AndroidNeedsInternetPermission Condition=" '$(AndroidEnableProfiler)' == 'true' ">True</AndroidNeedsInternetPermission>
141+
142+
<!-- FIXME: error ANDZA0000: 01-30 21:38:27.669 38611 159726 W zip : WARNING: header mismatch -->
143+
<_AndroidUseLibZipSharp Condition=" '$(_AndroidUseLibZipSharp)' == '' ">true</_AndroidUseLibZipSharp>
141144
</PropertyGroup>
142145
<PropertyGroup Condition=" '$(AndroidApplication)' == 'true' and '$(GenerateApplicationManifest)' == 'true' ">
143146
<!-- Default to 1, if blank -->

0 commit comments

Comments
 (0)