diff --git a/build-tools/automation/yaml-templates/run-dotnet-preview.yaml b/build-tools/automation/yaml-templates/run-dotnet-preview.yaml index f0b62b4eb1d..0f66892f3f9 100644 --- a/build-tools/automation/yaml-templates/run-dotnet-preview.yaml +++ b/build-tools/automation/yaml-templates/run-dotnet-preview.yaml @@ -13,9 +13,11 @@ parameters: steps: - powershell: | if ([Environment]::OSVersion.Platform -eq "Unix") { - $dotnetPath = "${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet" + $env:DOTNET_ROOT = "${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet" + $dotnetPath = "$env:DOTNET_ROOT/dotnet" } else { - $dotnetPath = "${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet\dotnet.exe" + $env:DOTNET_ROOT = "${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet" + $dotnetPath = "$env:DOTNET_ROOT\dotnet.exe" } & $dotnetPath ${{ parameters.command }} ${{ parameters.project }} ${{ parameters.arguments }} if ([System.Convert]::ToBoolean("${{ parameters.useExitCodeForErrors }}") -and $LASTEXITCODE -ne 0) { diff --git a/build-tools/scripts/msbuild.mk b/build-tools/scripts/msbuild.mk index 3416f3b7c30..ce587b3f06f 100644 --- a/build-tools/scripts/msbuild.mk +++ b/build-tools/scripts/msbuild.mk @@ -23,7 +23,8 @@ # $(MSBUILD_FLAGS): Additional MSBuild flags; contains $(CONFIGURATION), $(V), $(MSBUILD_ARGS). MSBUILD = msbuild -DOTNET_TOOL = $(topdir)/bin/$(CONFIGURATION)/dotnet/dotnet +DOTNET_ROOT = $(topdir)/bin/$(CONFIGURATION)/dotnet/ +DOTNET_TOOL = $(DOTNET_ROOT)dotnet DOTNET_VERB = build MSBUILD_FLAGS = /p:Configuration=$(CONFIGURATION) $(MSBUILD_ARGS) @@ -51,7 +52,7 @@ endef # $(call DOTNET_BINLOG,name,build=$(DOTNET_VERB),dotnet=$(DOTNET_TOOL)) define DOTNET_BINLOG - $(if $(3),$(3),$(DOTNET_TOOL)) $(if $(2),$(2),$(DOTNET_VERB)) -c $(CONFIGURATION) -v:n $(MSBUILD_ARGS) \ + $(if $(3),,DOTNET_ROOT='$(DOTNET_ROOT)') $(if $(3),$(3),$(DOTNET_TOOL)) $(if $(2),$(2),$(DOTNET_VERB)) -c $(CONFIGURATION) -v:n $(MSBUILD_ARGS) \ -bl:"$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/bin/Build$(CONFIGURATION)/msbuild-`date +%Y%m%dT%H%M%S`-$(1).binlog" endef diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf060270d0a..322c4f479a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/installer - 28d4a6b4bed1515bdbe491c9e0c8ef7aa3a24497 + ca467d68c8f678a671984a46996d3fc37fe7f3de - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + ae99bb2e7a0a5db7c2bff129322965fd3c6e820d - + https://github.com/dotnet/runtime - 3e87528325b09f884b0a09a8c4ef79393abfd0db + ae99bb2e7a0a5db7c2bff129322965fd3c6e820d - + https://github.com/dotnet/emsdk - 60a73f97a0ec16c25ce4d36b1bcff1fedb831716 + afbff08914374ed6790324635b9346d1256680fc - + https://github.com/dotnet/cecil - 3e46711f5a933551557286d211970faa08b07b7e + 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 diff --git a/eng/Versions.props b/eng/Versions.props index c060c201fb3..fddefd8c31e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 8.0.100-preview.7.23330.16 - 8.0.0-preview.7.23329.8 - 8.0.0-preview.7.23329.8 + 8.0.100-preview.7.23364.32 + 8.0.0-preview.7.23364.3 + 8.0.0-preview.7.23364.3 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-preview.7.23326.1 + 8.0.0-preview.7.23361.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.4-alpha.23327.1 + 0.11.4-alpha.23360.2 $(MicrosoftNETCoreAppRefPackageVersion) diff --git a/external/Java.Interop b/external/Java.Interop index 151b03ee1ee..62efc09806d 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 151b03ee1eefa62e3d29b034b2aaf05ea73d99ed +Subproject commit 62efc09806d6d2ed1cac34611acb070856d53f02 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs index db875ef9278..37f0fcfcf8b 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AotTests.cs @@ -137,6 +137,9 @@ public void BuildBasicApplicationReleaseProfiledAotWithoutDefaultProfile () [TestCaseSource (nameof (AotChecks))] public void BuildAotApplicationWithNdkAndBundleAndÜmläüts (string supportedAbis, bool enableLLVM, bool usesAssemblyBlobs) { + if (IsWindows) + Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625"); + var abisSanitized = supportedAbis.Replace (";", "").Replace ("-", "").Replace ("_", ""); var path = Path.Combine ("temp", string.Format ("BuildAotNdk AndÜmläüts_{0}_{1}_{2}", abisSanitized, enableLLVM, usesAssemblyBlobs)); var proj = new XamarinAndroidApplicationProject () { @@ -213,6 +216,9 @@ public void BuildAotApplicationWithNdkAndBundleAndÜmläüts (string supportedAb [TestCaseSource (nameof (AotChecks))] public void BuildAotApplicationAndÜmläüts (string supportedAbis, bool enableLLVM, bool usesAssemblyBlobs) { + if (IsWindows) + Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625"); + var abisSanitized = supportedAbis.Replace (";", "").Replace ("-", "").Replace ("_", ""); var path = Path.Combine ("temp", string.Format ("BuildAot AndÜmläüts_{0}_{1}_{2}", abisSanitized, enableLLVM, usesAssemblyBlobs)); var proj = new XamarinAndroidApplicationProject () { @@ -411,6 +417,9 @@ public static void Foo () { [Category ("LLVM")] public void NoSymbolsArgShouldReduceAppSize ([Values ("", "Hybrid")] string androidAotMode, [Values (false, true)] bool skipDebugSymbols) { + if (IsWindows) + Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625"); + AssertAotModeSupported (androidAotMode); var proj = new XamarinAndroidApplicationProject () { diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index e748cc8155f..14b4fc9ec62 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -85,6 +85,9 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b [Test] public void CheckWhetherLibcAndLibmAreReferencedInAOTLibraries () { + if (IsWindows) + Assert.Ignore ("https://github.com/dotnet/runtime/issues/88625"); + var proj = new XamarinAndroidApplicationProject { IsRelease = true, EmbedAssembliesIntoApk = true, diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs index 334aa28ddfb..134fff471ef 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs @@ -279,6 +279,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string [] } if (Builder.UseDotNet) { psi.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0"); + psi.SetEnvironmentVariable ("DOTNET_ROOT", TestEnvironment.DotNetPreviewDirectory); } psi.Arguments = args.ToString (); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs index 7c0477ceb8c..d3da05577a1 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetCLI.cs @@ -47,6 +47,7 @@ protected bool Execute (params string [] args) p.StartInfo.RedirectStandardOutput = true; p.StartInfo.RedirectStandardError = true; p.StartInfo.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0"); + p.StartInfo.SetEnvironmentVariable ("DOTNET_ROOT", TestEnvironment.DotNetPreviewDirectory); if (TestEnvironment.UseLocalBuildOutput) { p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_MANIFEST_ROOTS", TestEnvironment.WorkloadManifestOverridePath); p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_PACK_ROOTS", TestEnvironment.WorkloadPackOverridePath); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc index 4c814f7c391..e5d2975877c 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc @@ -8,58 +8,58 @@ "Size": 1024 }, "assemblies/Java.Interop.dll": { - "Size": 58990 + "Size": 58895 }, "assemblies/Mono.Android.dll": { - "Size": 88074 + "Size": 88112 }, "assemblies/Mono.Android.Runtime.dll": { - "Size": 5819 + "Size": 5575 }, "assemblies/rc.bin": { - "Size": 1235 + "Size": 1302 }, "assemblies/System.Console.dll": { - "Size": 6448 + "Size": 6418 }, "assemblies/System.Linq.dll": { - "Size": 9135 + "Size": 9212 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 537441 + "Size": 548643 }, "assemblies/System.Runtime.dll": { - "Size": 2629 + "Size": 2633 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3768 + "Size": 3733 }, "assemblies/UnnamedProject.dll": { - "Size": 3222 + "Size": 2931 }, "classes.dex": { "Size": 377064 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { - "Size": 97392 + "Size": 97096 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 380704 + "Size": 381088 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3177168 + "Size": 3184096 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723560 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 94424 + "Size": 93856 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { "Size": 154904 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 11080 + "Size": 11608 }, "META-INF/BNDLTOOL.RSA": { "Size": 1213 @@ -95,5 +95,5 @@ "Size": 1904 } }, - "PackageSize": 2771274 + "PackageSize": 2787658 } \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc index 69c4b5976c5..7c32c7305d2 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc @@ -11,130 +11,133 @@ "Size": 7112 }, "assemblies/Java.Interop.dll": { - "Size": 66908 + "Size": 66808 }, "assemblies/Mono.Android.dll": { - "Size": 469884 + "Size": 469914 }, "assemblies/Mono.Android.Runtime.dll": { - "Size": 5819 + "Size": 5575 }, "assemblies/mscorlib.dll": { - "Size": 3865 + "Size": 3870 }, "assemblies/netstandard.dll": { - "Size": 5581 + "Size": 5585 }, "assemblies/rc.bin": { - "Size": 1235 + "Size": 1302 }, "assemblies/System.Collections.Concurrent.dll": { - "Size": 11557 + "Size": 11524 }, "assemblies/System.Collections.dll": { - "Size": 15444 + "Size": 15415 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7501 + "Size": 7461 }, "assemblies/System.ComponentModel.dll": { - "Size": 1976 + "Size": 1946 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2598 + "Size": 2560 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6085 + "Size": 6044 }, "assemblies/System.Console.dll": { - "Size": 6614 + "Size": 6588 }, "assemblies/System.Core.dll": { - "Size": 1991 + "Size": 1996 + }, + "assemblies/System.Diagnostics.DiagnosticSource.dll": { + "Size": 12529 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6590 + "Size": 6562 }, "assemblies/System.dll": { - "Size": 2348 + "Size": 2350 }, "assemblies/System.Drawing.dll": { - "Size": 1940 + "Size": 1944 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 12010 + "Size": 11987 }, "assemblies/System.IO.Compression.Brotli.dll": { - "Size": 11223 + "Size": 11196 }, "assemblies/System.IO.Compression.dll": { - "Size": 15904 + "Size": 15877 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 9912 + "Size": 9887 }, "assemblies/System.Linq.dll": { - "Size": 19495 + "Size": 19570 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 164340 + "Size": 164694 }, "assemblies/System.Net.Http.dll": { - "Size": 65673 + "Size": 69096 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22474 + "Size": 22443 }, "assemblies/System.Net.Requests.dll": { - "Size": 3632 + "Size": 3609 }, "assemblies/System.ObjectModel.dll": { - "Size": 8157 + "Size": 8124 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 834482 + "Size": 843541 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 192929 + "Size": 192912 }, "assemblies/System.Private.Uri.dll": { - "Size": 43458 + "Size": 43487 }, "assemblies/System.Private.Xml.dll": { - "Size": 215826 + "Size": 215780 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16684 + "Size": 16647 }, "assemblies/System.Runtime.dll": { - "Size": 2776 + "Size": 2759 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3768 + "Size": 3733 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1868 + "Size": 1872 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2520 + "Size": 2490 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3805 + "Size": 3769 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 8133 + "Size": 8111 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 159004 + "Size": 158602 }, "assemblies/System.Xml.dll": { - "Size": 1761 + "Size": 1765 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1778 + "Size": 1782 }, "assemblies/UnnamedProject.dll": { - "Size": 5300 + "Size": 4987 }, "assemblies/Xamarin.AndroidX.Activity.dll": { "Size": 5942 @@ -206,25 +209,25 @@ "Size": 3514720 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { - "Size": 97392 + "Size": 97096 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 380704 + "Size": 381088 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3177168 + "Size": 3184096 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723560 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 94424 + "Size": 93856 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { "Size": 154904 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 102136 + "Size": 102800 }, "META-INF/android.support.design_material.version": { "Size": 12 @@ -338,13 +341,13 @@ "Size": 1213 }, "META-INF/BNDLTOOL.SF": { - "Size": 76902 + "Size": 77024 }, "META-INF/com.google.android.material_material.version": { "Size": 10 }, "META-INF/MANIFEST.MF": { - "Size": 76775 + "Size": 76897 }, "META-INF/proguard/androidx-annotations.pro": { "Size": 339 @@ -1913,5 +1916,5 @@ "Size": 325240 } }, - "PackageSize": 7953326 + "PackageSize": 7982094 } \ No newline at end of file diff --git a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj index 40c61020b59..f21c94de80f 100644 --- a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj +++ b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj @@ -29,6 +29,8 @@ NetworkInterfaces excluded: https://github.com/dotnet/runtime/issues/75155 --> DotNetIgnore + + $(ExcludeCategories):LLVMIgnore $(ExcludeCategories):InetAccess:NetworkInterfaces