From 94113cad10a51de1f4f60b551df70ecbceb9580a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Nov 2023 09:23:26 -0600 Subject: [PATCH 1/4] [build] update $(MSBuildPackageReferenceVersion) to 17.6.3 In xamarin/xamarin-android, we need to update `MSBuild.StructuredLogger` to be able to move to .NET 9. The `.binlog` file format changed in .NET 9. It currently fails with: (Restore target) -> tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Framework from 17.5.0 to 17.3.2. Reference the package directly from the project to select a different version. tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj : error NU1605: MSBuildDeviceIntegration -> MSBuild.StructuredLogger 2.2.100 -> Microsoft.Build.Framework (>= 17.5.0) tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj : error NU1605: MSBuildDeviceIntegration -> Microsoft.Build.Framework (>= 17.3.2) tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj : error NU1605: Warning As Error: Detected package downgrade: Microsoft.Build.Utilities.Core from 17.5.0 to 17.3.2. Reference the package directly from the project to select a different version. tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj : error NU1605: MSBuildDeviceIntegration -> MSBuild.StructuredLogger 2.2.100 -> Microsoft.Build.Utilities.Core (>= 17.5.0) tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj : error NU1605: MSBuildDeviceIntegration -> Microsoft.Build.Utilities.Core (>= 17.3.2) Since a lot of other repos depend on xamarin-android-tools, I feel we should move to a new version, but not actually the newest. If we moved to 17.8.3, we could potentially break other repos. VS 2022 17.6 is an LTS release that feels "safe", is new enough to solve the issue, and hopefully won't break anyone? --- .../MSBuildReferences.projitems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems index b5976b3..ec71794 100644 --- a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems +++ b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems @@ -4,7 +4,7 @@ - 17.3.2 + 17.6.3 3.0.0 7.1.0-final.1.21458.1 From 210452820927c1c333a4d1393f6bd71db3711df1 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Nov 2023 09:31:45 -0600 Subject: [PATCH 2/4] System.Security.Cryptography.Xml 7.0.1 src\Microsoft.Android.Build.BaseTasks\Microsoft.Android.Build.BaseTasks.csproj : error NU1605: Detected package downgrade: System.Security.Cryptography.Xml from 7.0.1 to 6.0.1. Reference the package directly from the project to select a different version. src\Microsoft.Android.Build.BaseTasks\Microsoft.Android.Build.BaseTasks.csproj : error NU1605: Microsoft.Android.Build.BaseTasks -> Microsoft.Build.Tasks.Core 17.6.3 -> System.Security.Cryptography.Xml (>= 7.0.1) src\Microsoft.Android.Build.BaseTasks\Microsoft.Android.Build.BaseTasks.csproj : error NU1605: Microsoft.Android.Build.BaseTasks -> System.Security.Cryptography.Xml (>= 6.0.1) tests\Microsoft.Android.Build.BaseTasks-Tests\Microsoft.Android.Build.BaseTasks-Tests.csproj : error NU1605: Detected package downgrade: System.Security.Cryptography.Xml from 7.0.1 to 6.0.1. Reference the package directly from the project to select a different version. tests\Microsoft.Android.Build.BaseTasks-Tests\Microsoft.Android.Build.BaseTasks-Tests.csproj : error NU1605: Microsoft.Android.Build.BaseTasks-Tests -> Microsoft.Build.Tasks.Core 17.6.3 -> System.Security.Cryptography.Xml (>= 7.0.1) tests\Microsoft.Android.Build.BaseTasks-Tests\Microsoft.Android.Build.BaseTasks-Tests.csproj : error NU1605: Microsoft.Android.Build.BaseTasks-Tests -> System.Security.Cryptography.Xml (>= 6.0.1) --- .../MSBuildReferences.projitems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems index ec71794..2e4b997 100644 --- a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems +++ b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems @@ -14,7 +14,7 @@ - + From 988120d37dd26bfcace2ef69ad6c271a8531d703 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Nov 2023 09:43:43 -0600 Subject: [PATCH 3/4] Ok let's go latest but allow $(MSBuildPackageReferenceVersion) to be overridden --- .../MSBuildReferences.projitems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems index 2e4b997..f0cd1e8 100644 --- a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems +++ b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems @@ -4,7 +4,7 @@ - 17.6.3 + 17.8.3 3.0.0 7.1.0-final.1.21458.1 From 8bad03d732c5989bc6a0515569e0f52fcaa2a4e9 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 30 Nov 2023 09:54:32 -0600 Subject: [PATCH 4/4] $(SystemSecurityCryptographyXmlVersion) --- .../MSBuildReferences.projitems | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems index f0cd1e8..4c6a97c 100644 --- a/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems +++ b/src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems @@ -5,6 +5,7 @@ 17.8.3 + 7.0.1 3.0.0 7.1.0-final.1.21458.1 @@ -14,7 +15,7 @@ - +