From 37a66e7e42a5a12fe5057e1e067aa798842d651e Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 21 Feb 2024 20:57:53 +0100 Subject: [PATCH 01/32] net9.0 --- Directory.Build.props | 8 ++++---- global.json | 2 +- utilities.cake | 2 +- workloads.json | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e9052769c..53b889069 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,7 @@ $(BUILD_SOURCEVERSION) - <_DefaultTargetFrameworks>net8.0-android + <_DefaultTargetFrameworks>net9.0-android @@ -48,13 +48,13 @@ - - + + - + diff --git a/global.json b/global.json index 54d24c2d2..21fabf6fd 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "8.0.101", + "version": "9.0.100-preview.1", "rollForward": "patch" }, "msbuild-sdks": diff --git a/utilities.cake b/utilities.cake index 066aa7c38..6eba861d5 100644 --- a/utilities.cake +++ b/utilities.cake @@ -1719,7 +1719,7 @@ Task("java-resolution-analysis") string dir = "output/java-resolution-analysis"; EnsureDirectoryExists(dir); - EnsureDirectoryExists($"{dir}/net8.0-android"); + EnsureDirectoryExists($"{dir}/net9.0-android"); ConcurrentDictionary < diff --git a/workloads.json b/workloads.json index ef07f22ec..4ad26f11a 100644 --- a/workloads.json +++ b/workloads.json @@ -1,10 +1,10 @@ { - "microsoft.net.sdk.android": "34.0.0-rc.2.468/8.0.100-rc.2", - "microsoft.net.sdk.ios": "16.4.8968-net8-rc2/8.0.100-rc.2", - "microsoft.net.sdk.maccatalyst": "16.4.8968-net8-rc2/8.0.100-rc.2", - "microsoft.net.sdk.macos": "13.3.8968-net8-rc2/8.0.100-rc.2", - "microsoft.net.sdk.maui": "8.0.0-rc.2.9373/8.0.100-rc.2", - "microsoft.net.sdk.tvos": "16.4.8968-net8-rc2/8.0.100-rc.2", - "microsoft.net.workload.mono.toolchain.current": "8.0.0-rc.2.23479.6/8.0.100-rc.2", - "microsoft.net.workload.emscripten.current": "8.0.0-rc.2.23473.3/8.0.100-rc.2" + "microsoft.net.sdk.android": "34.99.0-preview.1.151/9.0.100-preview.1", + "microsoft.net.sdk.ios": "17.2.9088-net9-p1/9.0.100-preview.1", + "microsoft.net.sdk.maccatalyst": "17.2.9088-net9-p1/9.0.100-preview.1", + "microsoft.net.sdk.macos": "14.2.9088-net9-p1/9.0.100-preview.1", + "microsoft.net.sdk.maui": "9.0.0-preview.1.9973/9.0.100-preview.1", + "microsoft.net.sdk.tvos": "17.2.9088-net9-p1/9.0.100-preview.1", + "microsoft.net.workload.mono.toolchain.current": "9.0.0-preview.1.24080.9/9.0.100-preview.1", + "microsoft.net.workload.emscripten.current": "9.0.0-preview.1.24072.2/9.0.100-preview.1" } From f2ed288fcc5ade69e4ab6a91c4b5be412c4c2528 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 21 Feb 2024 20:58:30 +0100 Subject: [PATCH 02/32] net9.0 fixes --- samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj | 2 +- samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj | 2 +- .../BuildAllXamarinForms.XamarinAndroid.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj b/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj index 86c3d5b07..fb5c1ae9d 100644 --- a/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj +++ b/samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj @@ -1,7 +1,7 @@ - net8.0-android + $(_DefaultTargetFrameworks) 28 diff --git a/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj b/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj index c28182399..6a2e364fe 100644 --- a/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj +++ b/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj @@ -1,7 +1,7 @@  - net8.0-android + $(_DefaultTargetFrameworks) Exe BuildAllMauiApp true diff --git a/samples/dotnet/BuildAllXamarinForms/BuildAllXamarinForms.XamarinAndroid/BuildAllXamarinForms.XamarinAndroid.csproj b/samples/dotnet/BuildAllXamarinForms/BuildAllXamarinForms.XamarinAndroid/BuildAllXamarinForms.XamarinAndroid.csproj index 288b591a1..cb4712e54 100644 --- a/samples/dotnet/BuildAllXamarinForms/BuildAllXamarinForms.XamarinAndroid/BuildAllXamarinForms.XamarinAndroid.csproj +++ b/samples/dotnet/BuildAllXamarinForms/BuildAllXamarinForms.XamarinAndroid/BuildAllXamarinForms.XamarinAndroid.csproj @@ -1,6 +1,6 @@ - net8.0-android + $(_DefaultTargetFrameworks) From daa9660b11cd9a12923357b70191d016cd8158e9 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 21 Feb 2024 21:10:02 +0100 Subject: [PATCH 03/32] agent dotnet version --- build/ci/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/build.yml b/build/ci/build.yml index 3345f32de..ef839f90c 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -10,7 +10,7 @@ parameters: windowsImage: 'windows-latest' # the name of the Windows VM image # Tool Parameters - dotnetVersion: '8.0.101' # the version of .NET to use + dotnetVersion: '9.0.100-preview.1' # the version of .NET to use dotnetWorkloadRollbackFile: 'workloads.json' dotnetWorkloadSource: 'https://api.nuget.org/v3/index.json' dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' From 363a5e0ca3b1d9967c37066efe88911c5e4791d9 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 21 Feb 2024 22:29:00 +0100 Subject: [PATCH 04/32] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 21fabf6fd..892a8fbe0 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "9.0.100-preview.1", + "version": "9.0.100-preview.1.24101.2", "rollForward": "patch" }, "msbuild-sdks": From 524815e84cca407a7eb5c8fd55a09e9d1a0f905b Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 21 Feb 2024 22:29:41 +0100 Subject: [PATCH 05/32] Update build.yml --- build/ci/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/build.yml b/build/ci/build.yml index ef839f90c..f48e3ea47 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -10,7 +10,7 @@ parameters: windowsImage: 'windows-latest' # the name of the Windows VM image # Tool Parameters - dotnetVersion: '9.0.100-preview.1' # the version of .NET to use + dotnetVersion: '9.0.100-preview.1.24101.2' # the version of .NET to use dotnetWorkloadRollbackFile: 'workloads.json' dotnetWorkloadSource: 'https://api.nuget.org/v3/index.json' dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' From fbb35bc48c48db2f0242fdde57fd2e28e6521e1b Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 22 Feb 2024 14:41:29 +0100 Subject: [PATCH 06/32] file renamed for net9.0 --- .../{Metadata.net8.0-android.xml => Metadata.net9.0-android.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename source/com.google.crypto.tink/tink-android/Transforms/{Metadata.net8.0-android.xml => Metadata.net9.0-android.xml} (100%) diff --git a/source/com.google.crypto.tink/tink-android/Transforms/Metadata.net8.0-android.xml b/source/com.google.crypto.tink/tink-android/Transforms/Metadata.net9.0-android.xml similarity index 100% rename from source/com.google.crypto.tink/tink-android/Transforms/Metadata.net8.0-android.xml rename to source/com.google.crypto.tink/tink-android/Transforms/Metadata.net9.0-android.xml From b4c8f57c94f9e338c80832d49e512904499e579e Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 22 Feb 2024 15:38:41 +0100 Subject: [PATCH 07/32] metadatq fixes --- .../protolayout-expression/Transforms/Metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/androidx.wear.protolayout/protolayout-expression/Transforms/Metadata.xml b/source/androidx.wear.protolayout/protolayout-expression/Transforms/Metadata.xml index 5fc164e97..b9abd3250 100644 --- a/source/androidx.wear.protolayout/protolayout-expression/Transforms/Metadata.xml +++ b/source/androidx.wear.protolayout/protolayout-expression/Transforms/Metadata.xml @@ -18,5 +18,8 @@ > Java.Lang.Object + From 934b8fa9c7747e80ef77915e29360d0be3c376dd Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 22 Feb 2024 16:10:14 +0100 Subject: [PATCH 08/32] nuget fixes --- utilities.cake | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/utilities.cake b/utilities.cake index b2ecb1d46..4d67f7e47 100644 --- a/utilities.cake +++ b/utilities.cake @@ -1518,22 +1518,29 @@ Task("tools-executive-oreder-csv-and-markdown") Arguments = process_args, RedirectStandardOutput = true, }; - exitCodeWithoutArguments = StartProcess(process, process_settings, out redirectedStandardOutput); - foreach (string line in redirectedStandardOutput.ToList()) + try { - string tool = null; - string version = null; - - if - ( - line.Contains("NuGet Version: ") - ) + exitCodeWithoutArguments = StartProcess(process, process_settings, out redirectedStandardOutput); + foreach (string line in redirectedStandardOutput.ToList()) { - tool = line.Replace("NuGet Version: ", ""); - version = tool; - sb.AppendLine($"nuget, {version}"); + string tool = null; + string version = null; + + if + ( + line.Contains("NuGet Version: ") + ) + { + tool = line.Replace("NuGet Version: ", ""); + version = tool; + sb.AppendLine($"nuget, {version}"); + } } } + catch + { + sb.AppendLine($"NuGet, Not installed"); + } /* xamarin-android-binderator --help @@ -1761,7 +1768,7 @@ Task("java-resolution-analysis") java_resolution_analysis.TryAdd ( - "net8.0-android", + "net9.0-android", new ConcurrentDictionary < string, From 300418d7e7d424f25d93a40858fdd0783f639ac8 Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 22 Feb 2024 19:57:06 +0100 Subject: [PATCH 09/32] Update build.cake --- build.cake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cake b/build.cake index ed4822b7e..894994647 100755 --- a/build.cake +++ b/build.cake @@ -779,8 +779,8 @@ Task("samples-only") string[] solutions = new string[] { - "./samples/BuildXamarinFormsApp/BuildXamarinFormsApp.sln", - "./samples/BuildMinimalMaterial/BuildMinimalMaterial.sln", + // "./samples/BuildXamarinFormsApp/BuildXamarinFormsApp.sln", + //"./samples/BuildMinimalMaterial/BuildMinimalMaterial.sln", // "./samples/BuildMinimalMaterialAppCompat/BuildMinimalMaterialAppCompat.sln", // "./samples/dotnet/BuildAllDotNet.sln", //MSBuild cannot handle net6 projects }; From d1cc416b5f484ab657b5c4a5ef2c5384edc1baa9 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 23 Feb 2024 09:06:13 +0100 Subject: [PATCH 10/32] Update build.cake --- build.cake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.cake b/build.cake index 894994647..92b2e0396 100755 --- a/build.cake +++ b/build.cake @@ -733,7 +733,7 @@ Task("samples-generate-all-targets") continue; } - itemGroup.Add(new XElement(xmlns + "PackageReference", + itemGroup.Add(new XElement(xmlns + "PackageVersion", new XAttribute("Include", match.Groups[1]), new XAttribute("Version", match.Groups[2]))); From c644a411ab5ead6d2c176fd14857befa6f4224b2 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 25 Feb 2024 19:16:25 +0100 Subject: [PATCH 11/32] added AndroidManifest.xml to the root of the project to fix errors --- samples/dotnet/BuildAllMauiApp/AndroidManifest.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 samples/dotnet/BuildAllMauiApp/AndroidManifest.xml diff --git a/samples/dotnet/BuildAllMauiApp/AndroidManifest.xml b/samples/dotnet/BuildAllMauiApp/AndroidManifest.xml new file mode 100644 index 000000000..11269e5ea --- /dev/null +++ b/samples/dotnet/BuildAllMauiApp/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file From 06507078ce655b5fc009db55404338d1e0255aa0 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 25 Feb 2024 19:47:57 +0100 Subject: [PATCH 12/32] renamed AndroidManifest.xml --- .../Android/{AndroidManifest.xml => ___AndroidManifest.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename samples/dotnet/BuildAllMauiApp/Platforms/Android/{AndroidManifest.xml => ___AndroidManifest.xml} (100%) diff --git a/samples/dotnet/BuildAllMauiApp/Platforms/Android/AndroidManifest.xml b/samples/dotnet/BuildAllMauiApp/Platforms/Android/___AndroidManifest.xml similarity index 100% rename from samples/dotnet/BuildAllMauiApp/Platforms/Android/AndroidManifest.xml rename to samples/dotnet/BuildAllMauiApp/Platforms/Android/___AndroidManifest.xml From dec3a46ed158adc11efc65ea9ea8d3d0617518e2 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 7 May 2024 17:15:33 +0200 Subject: [PATCH 13/32] samples fixed --- .../v1/pids/39781_133595665255799770/values.xml | 3 +++ .../dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj | 8 +++++++- .../BuildAllXamarinForms.XamarinAndroid.csproj | 8 ++++---- .../Properties/AndroidManifest.xml | 2 +- .../BuildAllXamarinForms.XamarinIOS.csproj | 4 ++-- .../BuildAllXamarinForms.csproj | 4 ++-- samples/dotnet/Directory.Packages.props | 14 +++++++++++++- 7 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 samples/.mono/registry/CurrentUser/software/microsoft/csdevkit/v1/pids/39781_133595665255799770/values.xml diff --git a/samples/.mono/registry/CurrentUser/software/microsoft/csdevkit/v1/pids/39781_133595665255799770/values.xml b/samples/.mono/registry/CurrentUser/software/microsoft/csdevkit/v1/pids/39781_133595665255799770/values.xml new file mode 100644 index 000000000..626fa6ecb --- /dev/null +++ b/samples/.mono/registry/CurrentUser/software/microsoft/csdevkit/v1/pids/39781_133595665255799770/values.xml @@ -0,0 +1,3 @@ + + 133595683463017070 + \ No newline at end of file diff --git a/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj b/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj index 6a2e364fe..a3b4f537f 100644 --- a/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj +++ b/samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj @@ -56,7 +56,13 @@ Project="..\..\..\output\AllPackages.targets" /> - androidx/media3/common/Player.setMediaItems(LSystem/Collections/Generic/IList`1;)V androidx/media3/common/Player.setMediaItems(LSystem/Collections/Generic/IList`1;Z)V androidx/media3/common/Player.setMediaItems(LSystem/Collections/Generic/IList`1;IJ)V diff --git a/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/InterfacesFixups.cs b/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/InterfacesFixups.cs index 125a942ce..387004457 100644 --- a/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/InterfacesFixups.cs +++ b/source/org.jetbrains.kotlin/kotlin-stdlib/Additions/InterfacesFixups.cs @@ -10,9 +10,13 @@ partial class AbstractSetInvoker : Java.Util.ISet { } + /* + AbstractList was removed. + partial class AbstractListInvoker : Java.Util.IList { } + */ } #if NET8_0_OR_GREATER diff --git a/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml b/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml index 6afe1d17d..3cd833185 100644 --- a/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml +++ b/source/org.jetbrains.kotlin/kotlin-stdlib/Transforms/Metadata.xml @@ -445,4 +445,11 @@ + + + From 439714da381f2b2d6a9fd00d8720af4cc787afe7 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 23 Oct 2024 06:06:49 +0200 Subject: [PATCH 32/32] grpc fixes --- config.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config.json b/config.json index 6db26ad05..583fe9386 100644 --- a/config.json +++ b/config.json @@ -1021,7 +1021,7 @@ "nugetVersion": "1.5.0.1", "nugetId": "Xamarin.AndroidX.Emoji2.EmojiPicker", "excludedRuntimeDependencies": "androidx.emoji2.emoji2", - "dependencyOnly": false + "dependencyOnly": false, "skipExtendedTests": true, "comments": "Skip tests due to explicit dependency version request causes conflicts" }, @@ -4972,7 +4972,7 @@ "groupId": "io.grpc", "artifactId": "grpc-android", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.Android", "dependencyOnly": false, "type": "androidlibrary", @@ -4982,7 +4982,7 @@ "groupId": "io.grpc", "artifactId": "grpc-api", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.Api", "dependencyOnly": false, "type": "androidlibrary", @@ -4992,7 +4992,7 @@ "groupId": "io.grpc", "artifactId": "grpc-context", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.Context", "dependencyOnly": false, "type": "androidlibrary", @@ -5002,7 +5002,7 @@ "groupId": "io.grpc", "artifactId": "grpc-core", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.Core", "dependencyOnly": false, "type": "androidlibrary", @@ -5012,7 +5012,7 @@ "groupId": "io.grpc", "artifactId": "grpc-okhttp", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.OkHttp", "dependencyOnly": false, "type": "androidlibrary", @@ -5022,7 +5022,7 @@ "groupId": "io.grpc", "artifactId": "grpc-protobuf-lite", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.Protobuf.Lite", "dependencyOnly": false, "type": "androidlibrary", @@ -5032,7 +5032,7 @@ "groupId": "io.grpc", "artifactId": "grpc-stub", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.Stub", "dependencyOnly": false, "type": "androidlibrary", @@ -5042,7 +5042,7 @@ "groupId": "io.grpc", "artifactId": "grpc-util", "version": "1.63.2", - "nugetVersion": "1.64.2.1", + "nugetVersion": "1.63.2.1", "nugetId": "Xamarin.Grpc.Util", "dependencyOnly": false, "excludedRuntimeDependencies": "io.grpc.grpc-core,junit.junit,io.grpc.grpc-testing,org.mockito.mockito-core",