[main] Update dependencies from dotnet/installer

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) {

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
 

eng/Version.Details.xml

@@ -1,24 +1,24 @@
 <Dependencies>
  <ProductDependencies>
- <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23330.16">
+ <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23364.32">
  <Uri>https://github.com/dotnet/installer</Uri>
- <Sha>28d4a6b4bed1515bdbe491c9e0c8ef7aa3a24497</Sha>
+ <Sha>ca467d68c8f678a671984a46996d3fc37fe7f3de</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23364.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
+ <Sha>ae99bb2e7a0a5db7c2bff129322965fd3c6e820d</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23329.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23364.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>3e87528325b09f884b0a09a8c4ef79393abfd0db</Sha>
+ <Sha>ae99bb2e7a0a5db7c2bff129322965fd3c6e820d</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23326.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+ <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23361.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
  <Uri>https://github.com/dotnet/emsdk</Uri>
- <Sha>60a73f97a0ec16c25ce4d36b1bcff1fedb831716</Sha>
+ <Sha>afbff08914374ed6790324635b9346d1256680fc</Sha>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23327.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
+ <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23360.2" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
  <Uri>https://github.com/dotnet/cecil</Uri>
- <Sha>3e46711f5a933551557286d211970faa08b07b7e</Sha>
+ <Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>

eng/Versions.props

@@ -1,15 +1,15 @@
 <Project>
  <!--Package versions-->
  <PropertyGroup>
- <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23330.16</MicrosoftDotnetSdkInternalPackageVersion>
- <MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETILLinkTasksPackageVersion>
- <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23329.8</MicrosoftNETCoreAppRefPackageVersion>
+ <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23364.32</MicrosoftDotnetSdkInternalPackageVersion>
+ <MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23364.3</MicrosoftNETILLinkTasksPackageVersion>
+ <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23364.3</MicrosoftNETCoreAppRefPackageVersion>
  <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
  <MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
- <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23326.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
+ <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23361.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
  <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
  <MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
- <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23327.1</MicrosoftDotNetCecilPackageVersion>
+ <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23360.2</MicrosoftDotNetCecilPackageVersion>
  <SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
  </PropertyGroup>
  <PropertyGroup>

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 () {

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,

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 ();

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);

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
 }