From 7f846945dc042e0e81cabc1ccae3cfadca0e1291 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 17:09:12 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/sdk build 20250129.13 Microsoft.NET.Sdk From Version 10.0.100-alpha.1.25069.2 -> To Version 10.0.100-preview.1.25079.13 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks From Version 10.0.0-alpha.1.25067.10 -> To Version 10.0.0-preview.1.25078.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0e2c593990..f5a41aa7c08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/sdk - aca4b810e2be4b6b8aed3bcaf9e36bf3d1962a47 + 494c452f67991aec0038bcfae9044fb3ff3ce419 - + 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..9890d07676b 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.25079.13 $(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 From e34159d2e14a0fb7c39093bbfece8847ab66e814 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Jan 2025 11:34:18 -0600 Subject: [PATCH 2/9] Update GitBranch.cs --- .../Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..dac98a7bf23 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 @@ -50,7 +50,8 @@ public override bool Execute () // Trim generated dependabot branch names that are too long to produce useful package names var lastSlashIndex = Branch.LastIndexOf ('/'); - if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > 60) { + if ((Branch.StartsWith ("dependabot") || Branch.StartsWith ("darc-release/")) && + lastSlashIndex != -1 && Branch.Length > 60) { Branch = Branch.Substring (lastSlashIndex + 1); } From e2ccd5f9c93a6b04506d79737f37ecae094219ee Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Jan 2025 12:03:15 -0600 Subject: [PATCH 3/9] Update GitBranch.cs --- .../Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 dac98a7bf23..308edffbf00 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 @@ -49,12 +49,17 @@ public override bool Execute () } // Trim generated dependabot branch names that are too long to produce useful package names + const int maxBranchLength = 60; var lastSlashIndex = Branch.LastIndexOf ('/'); - if ((Branch.StartsWith ("dependabot") || Branch.StartsWith ("darc-release/")) && - lastSlashIndex != -1 && Branch.Length > 60) { + if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > maxBranchLength) { Branch = Branch.Substring (lastSlashIndex + 1); } + // Trim darc/Maestro branch names that are too long + if (Branch.StartsWith ("darc-") && Branch.Length > maxBranchLength) { + Branch = Branch.Substring (0, maxBranchLength); + } + Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}"); return !Log.HasLoggedErrors; From 7a97cbc08eaf90846e75b79731a4e664a08f8b64 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Jan 2025 13:45:31 -0600 Subject: [PATCH 4/9] Update GitBranch.cs --- .../GitBranch.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 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 308edffbf00..96decc4fb20 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,21 +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 = 60; var lastSlashIndex = Branch.LastIndexOf ('/'); 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); } // 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); } - - Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}"); - - return !Log.HasLoggedErrors; } protected override string GenerateCommandLineCommands () From ef058b1a27fda04cb69cc68482b460c048449ced Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Jan 2025 14:12:51 -0600 Subject: [PATCH 5/9] Update GitBranch.cs --- .../Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 96decc4fb20..db8a0367775 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 @@ -57,7 +57,7 @@ public override bool Execute () void CheckBranchLength () { // Trim generated dependabot branch names that are too long to produce useful package names - const int maxBranchLength = 60; + const int maxBranchLength = 50; var lastSlashIndex = Branch.LastIndexOf ('/'); if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > maxBranchLength) { Log.LogMessage ($"Trimming characters from the branch name at index {lastSlashIndex}: {Branch}"); From 046a4187db52d5d410fbb13b911255e7ec42cf9b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Jan 2025 14:52:27 -0600 Subject: [PATCH 6/9] Update GitBranch.cs --- .../Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 db8a0367775..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 @@ -57,7 +57,7 @@ public override bool Execute () void CheckBranchLength () { // Trim generated dependabot branch names that are too long to produce useful package names - const int maxBranchLength = 50; + const int maxBranchLength = 32; var lastSlashIndex = Branch.LastIndexOf ('/'); if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > maxBranchLength) { Log.LogMessage ($"Trimming characters from the branch name at index {lastSlashIndex}: {Branch}"); From 230f8ea63468667a999522a763b5fc164d9e5125 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Jan 2025 15:55:48 -0600 Subject: [PATCH 7/9] Set `$(_AndroidUseLibZipSharp)=true` --- .../targets/Microsoft.Android.Sdk.DefaultProperties.targets | 3 +++ 1 file changed, 3 insertions(+) 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 From a041ae590e338ff4b0101cf14273ab079358548f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2025 05:02:18 +0000 Subject: [PATCH 8/9] Update dependencies from https://github.com/dotnet/sdk build 20250130.14 Microsoft.NET.Sdk From Version 10.0.100-alpha.1.25069.2 -> To Version 10.0.100-preview.1.25080.14 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5a41aa7c08..31c90432d65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 494c452f67991aec0038bcfae9044fb3ff3ce419 + ee4ea824289fa0d32a3829d09703eb61b4b4b665 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9890d07676b..343aed669f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.1.25079.13 + 10.0.100-preview.1.25080.14 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.1.25078.5 10.0.0-preview.1.25078.5 From 3b020e36c1aab804ab2b6f3a3ecdcef9fef20f0a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 31 Jan 2025 09:51:14 -0600 Subject: [PATCH 9/9] Fixes warnings as errors Errors D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(39,32): error CA1416: This call site is reachable on all platforms. 'Instrumentation.Context' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(70,4): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(73,4): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(67,4): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(64,4): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(76,4): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(104,5): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(94,6): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(110,5): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestInstrumentation.cs(117,5): error CA1416: This call site is reachable on all platforms. 'Log.Info(string?, string)' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestRunner.cs(43,35): error CA1416: This call site is reachable on all platforms. 'Context.PackageName' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] D:\src\xamarin-android\tests\TestRunner.NUnit\NUnitTestRunner.cs(43,35): error CA1416: This call site is reachable on all platforms. 'Application.Context' is only supported on: 'Android' 21.0 and later. (https://learn.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1416) [D:\src\xamarin-android\tests\TestRunner.NUnit\TestRunner.NUnit.NET.csproj] --- .../Properties/AssemblyInfo.cs | 26 ------------------- .../TestRunner.NUnit.NET.csproj | 1 - 2 files changed, 27 deletions(-) delete mode 100644 tests/TestRunner.NUnit/Properties/AssemblyInfo.cs diff --git a/tests/TestRunner.NUnit/Properties/AssemblyInfo.cs b/tests/TestRunner.NUnit/Properties/AssemblyInfo.cs deleted file mode 100644 index 8b2e16fa71a..00000000000 --- a/tests/TestRunner.NUnit/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("TestRunner.NUnit")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Microsoft, Inc")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] diff --git a/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj b/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj index ff395a25370..a89367dfe38 100644 --- a/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj +++ b/tests/TestRunner.NUnit/TestRunner.NUnit.NET.csproj @@ -6,7 +6,6 @@ Library Xamarin.Android.UnitTests.NUnit TestRunner.NUnit.NET - false