diff --git a/Make.config b/Make.config index 80c902152e..85ce9d8560 100644 --- a/Make.config +++ b/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)) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 610b917f1b..6482a70044 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,30 +1,30 @@ - + https://github.com/dotnet/installer - 62ef57f1140e7fa71cf452542b263e7999cac168 + e1872958afdb2b42b48f213efc8a6cd509816f0c - + https://github.com/dotnet/runtime - 31106939ba524a7e6df8225cf8d0fedefba92b9f + 119667b5ef2ce65ffa45c3a3d0b175a4e95c45e8 - + https://github.com/dotnet/runtime - 31106939ba524a7e6df8225cf8d0fedefba92b9f + 119667b5ef2ce65ffa45c3a3d0b175a4e95c45e8 - + https://github.com/dotnet/aspnetcore - be566b1f4ed1ab24765a3a4a2d1751dc73e7fcfc + 1bda10b33b6cc6f3bbaceabbadb4ddd18ca6e68e - + https://github.com/dotnet/emsdk - 60a73f97a0ec16c25ce4d36b1bcff1fedb831716 + 1f68fcee45ca75a2cb780edaff1e695af4d4f787 - + https://github.com/dotnet/cecil - 3e46711f5a933551557286d211970faa08b07b7e + 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 diff --git a/eng/Versions.props b/eng/Versions.props index c7975b6ac9..7a47f2c87a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,14 +2,14 @@ - 8.0.100-preview.7.23360.1 - 8.0.0-preview.7.23359.1 + 8.0.100-rc.1.23375.3 + 8.0.0-rc.1.23374.9 6.0.0-beta.21212.6 - 8.0.0-preview.7.23359.1 - 8.0.0-preview.7.23326.1 + 8.0.0-rc.1.23374.9 + 8.0.0-rc.1.23368.3 7.0.7 7.0.100-alpha.1.21601.1 - 0.11.4-alpha.23327.1 + 0.11.4-alpha.23360.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) diff --git a/global.json b/global.json index 76a3d0eafe..76792a02c2 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.100-preview.7.23360.1" + "version": "8.0.100-rc.1.23375.3" } } diff --git a/tests/common/BinLog.cs b/tests/common/BinLog.cs index 37a70c73bd..e0869c10b7 100644 --- a/tests/common/BinLog.cs +++ b/tests/common/BinLog.cs @@ -112,6 +112,12 @@ namespace Xamarin.Tests { 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 @@ namespace Xamarin.Tests { public static IEnumerable 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 @@ namespace Xamarin.Tests { { 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; diff --git a/tests/dotnet/UnitTests/PostBuildTest.cs b/tests/dotnet/UnitTests/PostBuildTest.cs index 2ef750c470..f436c3d29c 100644 --- a/tests/dotnet/UnitTests/PostBuildTest.cs +++ b/tests/dotnet/UnitTests/PostBuildTest.cs @@ -27,12 +27,11 @@ namespace Xamarin.Tests { 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); } diff --git a/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/DetectSigningIdentityTests.cs b/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/DetectSigningIdentityTests.cs index f17a603a1a..cef3a573fb 100644 --- a/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/DetectSigningIdentityTests.cs +++ b/tests/msbuild/Xamarin.MacDev.Tests/TargetTests/DetectSigningIdentityTests.cs @@ -63,13 +63,12 @@ namespace Xamarin.MacDev.Tasks { 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"); } diff --git a/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs b/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs index 17ba0e6af7..55c1ffc597 100644 --- a/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs +++ b/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs @@ -144,14 +144,7 @@ namespace Xamarin.Tests { 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) diff --git a/tools/devops/automation/templates/windows/build.yml b/tools/devops/automation/templates/windows/build.yml index 557a2d985b..442f156403 100644 --- a/tools/devops/automation/templates/windows/build.yml +++ b/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 `