[release/8.0.1xx-preview7] Update dependencies from dotnet/installer (x…

…amarin#18587)

Make a coherent bump with darc

 From dotnet/android#8207

---------

Co-authored-by: Filip Navara <navara@emclient.com>

Make.config

@@ -664,6 +664,11 @@ DOTNET_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET_VERSION)))
 DOTNET_VERSION_PRERELEASE_COMPONENT=$(subst $(DOTNET_VERSION_BAND),,$(DOTNET_VERSION))
 DOTNET_INSTALL_NAME=dotnet-sdk-$(DOTNET_VERSION)
 DOTNET_DIR=$(abspath $(TOP)/builds/downloads/$(DOTNET_INSTALL_NAME))
+# DOTNET_ROOT is no longer considered to find dotnet as seen here dotnet/roslyn@f454d69
+# but it seems that some tools like csc still needs it so let's export it.
+export DOTNET_ROOT=$(DOTNET_DIR)
+# dotnet now is being looked up in the PATH
+export PATH := $(DOTNET_DIR):$(PATH)
 DOTNET=$(DOTNET_DIR)/dotnet
 DOTNET_BCL_DIR:=$(abspath $(TOP)/packages/microsoft.netcore.app.ref/$(DOTNET_BCL_VERSION)/ref/$(DOTNET_TFM))
 ifneq ($(DOTNET_BCL_DIR),$(shell ls -1d $(DOTNET_BCL_DIR) 2>/dev/null))

NuGet.config

@@ -41,6 +41,9 @@
     <add key="darc-pub-dotnet-runtime-de84cf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d5edd29b-1/nuget/v3/index.json" />
     <!-- Add a 6.0.14 feed -->
     <add key="darc-pub-dotnet-runtime-2e45bc7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2e45bc7a/nuget/v3/index.json" />
+    <!-- Add a 7.0.10 feed -->
+    <add key="darc-pub-dotnet-emsdk-96ba1fe" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-96ba1fed/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-4bc0fe9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4bc0fe95/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

eng/Version.Details.xml

@@ -1,30 +1,30 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23329.2">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.7.23375.2">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>12bfecc01dfa05c84102893928ddc3840f97bb70</Sha>
+      <Sha>a9440e1a3b6aa9a378698dd9d16e8916d4696435</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23328.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.7.23374.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cfae69f62414b68e4c98dd3b294154baabf58a5a</Sha>
+      <Sha>c13b009957b489e34abed3fb292305e392bc4214</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.Dotnet.Sdk.Internal -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23328.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.7.23374.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>cfae69f62414b68e4c98dd3b294154baabf58a5a</Sha>
+      <Sha>c13b009957b489e34abed3fb292305e392bc4214</Sha>
     </Dependency>
     <!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.7.23328.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.7.23374.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>c7b4724a7d90c247ba58715862dad29a704dd619</Sha>
+      <Sha>587c9188292499af1b81709f571c7906d518c125</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.23371.9" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>60a73f97a0ec16c25ce4d36b1bcff1fedb831716</Sha>
+      <Sha>a429056d19aed777f6b50fe05c1c8ab482784007</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23327.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23360.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/cecil</Uri>
-      <Sha>3e46711f5a933551557286d211970faa08b07b7e</Sha>
+      <Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
     </Dependency>
     <!-- This is a subscription of the .NET 7 versions of our packages -->
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.7090">

eng/Versions.props

@@ -2,14 +2,14 @@
   <!--Package versions-->
   <PropertyGroup>
     <!-- Versions updated by maestro -->
-    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23329.2</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23328.9</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.7.23375.2</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.7.23374.5</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23328.9</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23326.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.7.23374.5</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23371.9</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>7.0.7</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23327.1</MicrosoftDotNetCecilPackageVersion>
+    <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23360.2</MicrosoftDotNetCecilPackageVersion>
     <!-- Manually updated versions -->
     <Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</Emscriptennet7WorkloadVersion>
     <EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</EmscriptenWorkloadVersion>

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.7.23329.2"
+    "version": "8.0.100-preview.7.23375.2"
   }
 }

tests/common/BinLog.cs

@@ -112,6 +112,12 @@ public static IEnumerable<BuildEventArgs> ReadBuildEvents (string path)
 					continue;
 
 				yield return record.Args;
+
+				if (record.Args is BuildFinishedEventArgs) {
+					// Skip over anything that follows
+					// https://github.com/xamarin/xamarin-macios/issues/18568
+					break;
+				}
 			}
 		}
 
@@ -200,15 +206,7 @@ public static IEnumerable<BuildLogEvent> GetBuildLogErrors (string path)
 
 		public static IEnumerable<BuildLogEvent> GetBuildMessages (string path)
 		{
-			var reader = new BinLogReader ();
-			var eols = new char [] { '\n', '\r' };
-			foreach (var record in reader.ReadRecords (path)) {
-				if (record is null)
-					continue;
-				var args = record.Args;
-				if (args is null)
-					continue;
-
+			foreach (var args in ReadBuildEvents (path)) {
 				if (args is BuildErrorEventArgs buildError) {
 					var ea = buildError;
 					yield return new BuildLogEvent {
@@ -259,11 +257,7 @@ public static bool TryFindPropertyValue (string binlog, string property, [NotNul
 		{
 			value = null;
 
-			var reader = new BinLogReader ();
-			foreach (var record in reader.ReadRecords (binlog)) {
-				var args = record?.Args;
-				if (args is null)
-					continue;
+			foreach (var args in ReadBuildEvents (binlog)) {
 				if (args is PropertyInitialValueSetEventArgs pivsea) {
 					if (string.Equals (property, pivsea.PropertyName, StringComparison.OrdinalIgnoreCase))
 						value = pivsea.PropertyValue;

tests/dotnet/UnitTests/PostBuildTest.cs

@@ -27,12 +27,11 @@ public void ArchiveTest (ApplePlatform platform, string runtimeIdentifiers)
 			properties ["Configuration"] = configuration;
 
 			var result = DotNet.AssertBuild (project_path, properties);
-			var reader = new BinLogReader ();
-			var records = reader.ReadRecords (result.BinLogPath).ToList ();
+			var recordArgs = BinLog.ReadBuildEvents (result.BinLogPath).ToList ();
 			var findString = "Output Property: ArchiveDir";
-			var archiveDirRecord = records.Where (v => v?.Args?.Message?.Contains (findString) == true).ToList ();
+			var archiveDirRecord = recordArgs.Where (v => v?.Message?.Contains (findString) == true).ToList ();
 			Assert.That (archiveDirRecord.Count, Is.GreaterThan (0), "ArchiveDir");
-			var archiveDir = archiveDirRecord [0].Args.Message.Substring (findString.Length + 1).Trim ();
+			var archiveDir = archiveDirRecord [0].Message.Substring (findString.Length + 1).Trim ();
 			Assert.That (archiveDir, Does.Exist, "Archive directory existence");
 			AssertDSymDirectory (appPath);
 		}

tests/msbuild/Xamarin.MacDev.Tests/TargetTests/DetectSigningIdentityTests.cs

@@ -63,13 +63,12 @@ public void BundleIdentifierInPartialAppManifest ()
 			Assert.AreEqual (0, rv.ExitCode, "Exit code");
 
 			// Find the BundleIdentifier parameter to the DetectSigningIdentity task.
-			var reader = new BinLogReader ();
-			var records = reader.ReadRecords (rv.BinLogPath).ToList ();
-			var taskIndex = records.FindIndex (v => v?.Args is TaskStartedEventArgs tsea && tsea.TaskName == "DetectSigningIdentity");
+			var recordArgs = BinLog.ReadBuildEvents (rv.BinLogPath).ToList ();
+			var taskIndex = recordArgs.FindIndex (v => v is TaskStartedEventArgs tsea && tsea.TaskName == "DetectSigningIdentity");
 			Assert.That (taskIndex, Is.GreaterThan (0), "Task index");
-			var taskParameterIndex = records.FindIndex (taskIndex + 1, v => v?.Args is BuildMessageEventArgs bmea && bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="));
+			var taskParameterIndex = recordArgs.FindIndex (taskIndex + 1, v => v is BuildMessageEventArgs bmea && bmea.Message.StartsWith ("Task Parameter:BundleIdentifier="));
 			Assert.That (taskParameterIndex, Is.GreaterThan (0), "Parameter index");
-			var taskParameter = (BuildMessageEventArgs) records [taskParameterIndex]?.Args;
+			var taskParameter = (BuildMessageEventArgs) recordArgs [taskParameterIndex];
 			var bundleIdentifier = taskParameter.Message.Substring ("Task Parameter:BundleIdentifier=".Length);
 			Assert.AreEqual ("com.xamarin.detectsigningidentitytest", bundleIdentifier, "Bundle identifier");
 		}

tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs

@@ -144,14 +144,7 @@ public void ParseBinLog (string log)
 			WarningsEvents.Clear ();
 			MessageEvents.Clear ();
 
-			var reader = new BinLogReader ();
-			foreach (var record in reader.ReadRecords (log)) {
-				if (record is null)
-					continue;
-				var args = record.Args;
-				if (args is null)
-					continue;
-
+			foreach (var args in BinLog.ReadBuildEvents (log)) {
 				bool verbose = false;
 				if (args is TaskStartedEventArgs tsea) {
 					if (verbose)

tools/devops/automation/templates/windows/build.yml

@@ -145,6 +145,7 @@ steps:
   displayName: 'Create runsettings for .NET tests'
 
 - pwsh: |
+    $Env:PATH = "$(Build.SourcesDirectory)\xamarin-macios\tests\dotnet\Windows\bin\dotnet;$env:PATH"
     $Env:DOTNET = "$(Build.SourcesDirectory)\xamarin-macios\tests\dotnet\Windows\bin\dotnet\dotnet.exe"
     & $(Build.SourcesDirectory)\xamarin-macios\tests\dotnet\Windows\bin\dotnet\dotnet.exe `
         test `