From 21f89a003bb9db72c42145f30c0488c16b92efea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 14:59:59 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/sdk build 20250130.2 Microsoft.NET.Sdk From Version 10.0.100-alpha.1.25069.2 -> To Version 10.0.100-preview.2.25080.2 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.2.25078.10 (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..33ab81fb5a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/sdk - aca4b810e2be4b6b8aed3bcaf9e36bf3d1962a47 + 128068cd2b069e341cdebb0e9a0b532bc0a2b187 - + https://github.com/dotnet/runtime - 6c58f7992cfd628a53d9b90f258ac123cb803644 + a9d67ec265ed4078265d70d155d06316acadf6fe - + https://github.com/dotnet/runtime - 6c58f7992cfd628a53d9b90f258ac123cb803644 + a9d67ec265ed4078265d70d155d06316acadf6fe https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index fe49c0c8a3a..94004b660ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,10 +1,10 @@ - 10.0.100-alpha.1.25069.2 + 10.0.100-preview.2.25080.2 $(MicrosoftNETSdkPackageVersion) - 10.0.0-alpha.1.25067.10 - 10.0.0-alpha.1.25067.10 + 10.0.0-preview.2.25078.10 + 10.0.0-preview.2.25078.10 7.0.0-beta.22103.1 10.0.0-beta.24476.2 10.0.0-alpha.1.25059.1 From 8103fe5d911d9ab336607ada70efdd3be89231d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 17:14:59 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/sdk build 20250130.3 Microsoft.NET.Sdk From Version 10.0.100-alpha.1.25069.2 -> To Version 10.0.100-preview.2.25080.3 --- 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 33ab81fb5a7..4f370a732dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/sdk - 128068cd2b069e341cdebb0e9a0b532bc0a2b187 + 0a336b340d7bb71f3bf99dc35f0e9064127ca087 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 94004b660ef..9ac02d40f06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.100-preview.2.25080.2 + 10.0.100-preview.2.25080.3 $(MicrosoftNETSdkPackageVersion) 10.0.0-preview.2.25078.10 10.0.0-preview.2.25078.10 From 281aabee22d52e9eadfefb511418335ed9f99efb Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Jan 2025 15:55:48 -0600 Subject: [PATCH 3/6] 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 2ee267f5fa8ef9dd1bb77da93c315f94741676cd Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 31 Jan 2025 09:51:14 -0600 Subject: [PATCH 4/6] 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 From 7133f9b8a783305d79b23bf2d263a53d015e6d19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2025 20:43:09 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/sdk build 20250131.9 Microsoft.NET.Sdk From Version 10.0.100-alpha.1.25069.2 -> To Version 10.0.100-preview.2.25081.9 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 10.0.0-alpha.1.25067.10 -> To Version 10.0.0-preview.2.25080.11 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f370a732dd..0cc03c59aa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/sdk - 0a336b340d7bb71f3bf99dc35f0e9064127ca087 + dfd6a8432dc30613731089e265712c27f3b1e8b3 - + https://github.com/dotnet/runtime - a9d67ec265ed4078265d70d155d06316acadf6fe + 62528e7271721691e6aa47846d1270286d0ba37a - + https://github.com/dotnet/runtime - a9d67ec265ed4078265d70d155d06316acadf6fe + 62528e7271721691e6aa47846d1270286d0ba37a https://github.com/dotnet/emsdk 0de3165cb0d56323b6caaf8e9916d4d9e72da32d - + https://github.com/dotnet/cecil - 9e8bd520939ddfee686261267a1646c1b113d9e1 + 2d5c8fb9aa8bd4c7fc085a73520061075c601655 diff --git a/eng/Versions.props b/eng/Versions.props index 9ac02d40f06..a15518f2847 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,16 +1,16 @@ - 10.0.100-preview.2.25080.3 + 10.0.100-preview.2.25081.9 $(MicrosoftNETSdkPackageVersion) - 10.0.0-preview.2.25078.10 - 10.0.0-preview.2.25078.10 + 10.0.0-preview.2.25080.11 + 10.0.0-preview.2.25080.11 7.0.0-beta.22103.1 10.0.0-beta.24476.2 10.0.0-alpha.1.25059.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24627.1 + 0.11.5-alpha.25069.2 $(MicrosoftNETCoreAppRefPackageVersion) 35.0.24 From 62bf745d7a8b7daba6c74482c1c82c024d630584 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Feb 2025 05:03:17 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/sdk build 20250202.3 Microsoft.NET.Sdk From Version 10.0.100-alpha.1.25069.2 -> To Version 10.0.100-preview.2.25102.3 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.2.25101.4 (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 0cc03c59aa4..beb0e85b169 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/sdk - dfd6a8432dc30613731089e265712c27f3b1e8b3 + d6bc7918c0be5005426fbbff43dfb622fc295142 - + https://github.com/dotnet/runtime - 62528e7271721691e6aa47846d1270286d0ba37a + e51af404d1ea26be4a3d8e51fe21cf2f09ad34dd - + https://github.com/dotnet/runtime - 62528e7271721691e6aa47846d1270286d0ba37a + e51af404d1ea26be4a3d8e51fe21cf2f09ad34dd https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index a15518f2847..d2294fc794a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,10 +1,10 @@ - 10.0.100-preview.2.25081.9 + 10.0.100-preview.2.25102.3 $(MicrosoftNETSdkPackageVersion) - 10.0.0-preview.2.25080.11 - 10.0.0-preview.2.25080.11 + 10.0.0-preview.2.25101.4 + 10.0.0-preview.2.25101.4 7.0.0-beta.22103.1 10.0.0-beta.24476.2 10.0.0-alpha.1.25059.1