From a832dd8d2ad834361ee8b0708a81547edbad797a Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 25 Jan 2024 13:30:00 -0800 Subject: [PATCH 1/4] [ci] Use NuGetAuthenticate@1 (#8676) The `NuGetAuthenticate@0` task is deprecated and will soon be removed: Task 'NuGet authenticate' version 0 (NuGetAuthenticate@0) is deprecated. This task will be removed. From January 31, 2024, onwards it may no longer be available. Use the updated `NuGetAuthenticate@1` task instead. --- build-tools/automation/azure-pipelines-apidocs.yaml | 2 +- build-tools/automation/azure-pipelines.yaml | 2 +- build-tools/automation/yaml-templates/build-linux.yaml | 2 +- build-tools/automation/yaml-templates/commercial-build.yaml | 2 +- .../automation/yaml-templates/install-microbuild-tooling.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-tools/automation/azure-pipelines-apidocs.yaml b/build-tools/automation/azure-pipelines-apidocs.yaml index bb7ac1dcd93..a7cbed9eff6 100644 --- a/build-tools/automation/azure-pipelines-apidocs.yaml +++ b/build-tools/automation/azure-pipelines-apidocs.yaml @@ -93,7 +93,7 @@ stages: - template: yaml-templates/use-dot-net.yaml - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: authenticate with azure artifacts inputs: forceReinstallCredentialProvider: true diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 0d47a83d950..f4e0cf2750a 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -344,7 +344,7 @@ stages: updateMono: false androidSdkPlatforms: 23,24,25,26,27,28,29,30,31,32,33,$(DefaultTestSdkPlatforms) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: authenticate with azure artifacts inputs: forceReinstallCredentialProvider: true diff --git a/build-tools/automation/yaml-templates/build-linux.yaml b/build-tools/automation/yaml-templates/build-linux.yaml index b091206be67..ba399bdfd3b 100644 --- a/build-tools/automation/yaml-templates/build-linux.yaml +++ b/build-tools/automation/yaml-templates/build-linux.yaml @@ -61,7 +61,7 @@ stages: workingDirectory: $(System.DefaultWorkingDirectory)/xamarin-android displayName: make prepare-external-git-dependencies - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: authenticate with azure artifacts inputs: forceReinstallCredentialProvider: true diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml index 84421581edf..b2713654661 100644 --- a/build-tools/automation/yaml-templates/commercial-build.yaml +++ b/build-tools/automation/yaml-templates/commercial-build.yaml @@ -14,7 +14,7 @@ steps: parameters: remove_dotnet: true -- task: NuGetAuthenticate@0 +- task: NuGetAuthenticate@1 displayName: authenticate with azure artifacts inputs: forceReinstallCredentialProvider: true diff --git a/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml b/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml index 54fc4e6d6a0..f64b2bc346d 100644 --- a/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml +++ b/build-tools/automation/yaml-templates/install-microbuild-tooling.yaml @@ -3,7 +3,7 @@ parameters: condition: succeeded() steps: -- task: NuGetAuthenticate@0 +- task: NuGetAuthenticate@1 displayName: authenticate with azure artifacts inputs: forceReinstallCredentialProvider: true From cf1418d01dd1dbf765adb0aab48d7079178571b4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 25 Jan 2024 15:56:04 -0600 Subject: [PATCH 2/4] [Xamarin.Android.Build.Tasks] fix net7.0 "out of support" message (#8660) Context: a48a9c564c3ad5e18f1076c7521379fbfe6d669d When .NET 9 ships, the .NET 7 Android workload will be out of support. We already have this behavior setup, but unfortunately the error message is wrong: Microsoft.NET.EolTargetFrameworks.targets(38,5): error NETSDK1202: The workload 'net6.0-android' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/maui-support-policy for more information about the support policy. [MauiTest.csproj::TargetFramework=net7.0-android] It says `net6.0-android`! In a48a9c56, we hardcoded `net6.0` to align with the iOS team, but we can use the `$(TargetFrameworkVersion)` property (removing `v`) so we don't have to update this line every year. I updated a test for this scenario. --- .../Microsoft.Android.Sdk/Sdk/Eol.targets | 2 +- .../Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/Eol.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/Eol.targets index 3789466a1a0..33eeae23a77 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/Eol.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/Sdk/Eol.targets @@ -28,7 +28,7 @@ Things to note: - + 34.99.0 - preview.1 + preview.2 From 6d33103049389763afc61b94c1202e920a6fd373 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 20:31:20 -0600 Subject: [PATCH 4/4] Bump to dotnet/installer/main@5680e93cb2 9.0.100-preview.2.24073.12 (#8666) Changes: https://github.com/dotnet/installer/compare/f91d4ca399...5680e93cb2 Changes: https://github.com/dotnet/runtime/compare/dbb335c6ba...e3547f1d3a Changes: https://github.com/dotnet/emsdk/compare/5cda86493a...fd99e59a43 Changes: https://github.com/dotnet/cecil/compare/81facb3f60...b8c2293cd1 Updates: * Microsoft.Dotnet.Sdk.Internal: from 9.0.100-alpha.1.24070.3 to 9.0.100-preview.2.24073.12 * Microsoft.NETCore.App.Ref: from 9.0.0-alpha.1.24066.33 to 9.0.0-preview.2.24072.10 * Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-alpha.1.24053.1 to 9.0.0-alpha.1.24068.1 * Microsoft.NET.ILLink.Tasks: from 9.0.0-alpha.1.24066.33 to 9.0.0-preview.2.24072.10 * Microsoft.DotNet.Cecil: from 0.11.4-alpha.24052.1 to 0.11.4-alpha.24065.1 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f0f6ddf6c4..a614f1db0b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - f91d4ca399ea4389d04b4700965d207f3a8d5c3b + 5680e93cb251d7741e19f2d759f04141e9d95a93 - + https://github.com/dotnet/runtime - dbb335c6ba14b38400b2d8c3a5876698021ec089 + e3547f1d3ac768a14a0598abf7868641ecf0c9d7 - + https://github.com/dotnet/runtime - dbb335c6ba14b38400b2d8c3a5876698021ec089 + e3547f1d3ac768a14a0598abf7868641ecf0c9d7 - + https://github.com/dotnet/emsdk - 5cda86493ac07dce11dcb04323d2b57eecff00b7 + fd99e59a43cfd6fe323c98ff267b620a67e71e67 - + https://github.com/dotnet/cecil - 81facb3f6009be2cdce70df30452bb75e9a8f993 + b8c2293cd1cbd9d0fe6f32d7b5befbd526b5a175 diff --git a/eng/Versions.props b/eng/Versions.props index ac0415292b9..317b30d8725 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 9.0.100-alpha.1.24070.3 - 9.0.0-alpha.1.24066.33 - 9.0.0-alpha.1.24066.33 + 9.0.100-preview.2.24073.12 + 9.0.0-preview.2.24072.10 + 9.0.0-preview.2.24072.10 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 9.0.0-alpha.1.24053.1 + 9.0.0-alpha.1.24068.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.24052.1 + 0.11.4-alpha.24065.1 $(MicrosoftNETCoreAppRefPackageVersion)