diff --git a/Make.config b/Make.config
index 0175839deaa1..ff69a3840954 100644
--- a/Make.config
+++ b/Make.config
@@ -510,10 +510,11 @@ DOTNET_FEED_DIR ?= $(DOTNET_DESTDIR)/nuget-feed
BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION:=$(shell if test -f $(TOP)/builds/BundledNETCorePlatformsPackageVersion.txt; then cat $(TOP)/builds/BundledNETCorePlatformsPackageVersion.txt; else echo "run-make-in-builds-directory-first"; fi)
-DOTNET6_VERSION=6.0.100-preview.2.21155.3
+DOTNET6_VERSION=6.0.100-preview.3.21161.23
DOTNET6_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET6_VERSION)))
-DOTNET6_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.2.21155.3/dotnet-sdk-6.0.100-preview.2.21155.3-osx-x64.pkg
-DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.2.21155.3/dotnet-sdk-6.0.100-preview.2.21155.3-osx-x64.tar.gz
+DOTNET6_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.3.21161.23/dotnet-sdk-6.0.100-preview.3.21161.23-osx-x64.pkg
+DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.3.21161.23/dotnet-sdk-6.0.100-preview.3.21161.23-osx-x64.tar.gz
+
DOTNET6_TARBALL_NAME=$(notdir $(DOTNET6_TARBALL))
DOTNET6_DIR=$(abspath $(TOP)/builds/downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))))
DOTNET6=$(DOTNET6_DIR)/dotnet
diff --git a/tests/bgen/bgen-tests.csproj b/tests/bgen/bgen-tests.csproj
index 9eebc1d90377..3bf2846ecd04 100644
--- a/tests/bgen/bgen-tests.csproj
+++ b/tests/bgen/bgen-tests.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/tests/common/BinLog.cs b/tests/common/BinLog.cs
index 179b4ec90935..81cd4c2c72c8 100644
--- a/tests/common/BinLog.cs
+++ b/tests/common/BinLog.cs
@@ -49,11 +49,49 @@ public static IEnumerable PrintToLines (string path)
if (args is ProjectStartedEventArgs psea) {
if (psea.Properties != null) {
yield return "Initial Properties";
- foreach (var prop in psea.Properties.Cast ().OrderBy (v => v.Key))
- yield return $"{prop.Key} = {prop.Value}";
+ var dict = psea.Properties as IDictionary;
+ if (dict == null) {
+ yield return $"Unknown property dictionary type: {psea.Properties.GetType ().FullName}";
+ } else {
+ foreach (var prop in dict.OrderBy (v => v.Key))
+ yield return $"{prop.Key} = {prop.Value}";
+ }
}
}
+ if (args is TaskParameterEventArgs tpea) {
+ switch (tpea.Kind) {
+ case TaskParameterMessageKind.AddItem:
+ yield return "Added Item(s)";
+ break;
+ case TaskParameterMessageKind.RemoveItem:
+ yield return "Removed Item(s)";
+ break;
+ case TaskParameterMessageKind.TaskInput:
+ yield return "Task Parameter";
+ break;
+ case TaskParameterMessageKind.TaskOutput:
+ yield return "Output Item(s)";
+ break;
+ default:
+ yield return $"Unknown Kind ({tpea.Kind})";
+ break;
+ }
+ foreach (var item in tpea.Items) {
+ var taskItem = item as ITaskItem;
+ yield return $"\t{tpea.ItemType}=";
+ if (taskItem != null) {
+ yield return $"\t\t{taskItem.ItemSpec}";
+ foreach (var metadataName in taskItem.MetadataNames) {
+ yield return $"\t\t\t{metadataName}={taskItem.GetMetadata (metadataName?.ToString ())}";
+ }
+ } else {
+ yield return $"\t{item}";
+ }
+ }
+ continue;
+ }
+
foreach (var line in args.Message.Split (eols, System.StringSplitOptions.RemoveEmptyEntries))
yield return line;
}
diff --git a/tests/dotnet/UnitTests/DotNetUnitTests.csproj b/tests/dotnet/UnitTests/DotNetUnitTests.csproj
index 2d5f0dee4e3c..63706ecac0be 100644
--- a/tests/dotnet/UnitTests/DotNetUnitTests.csproj
+++ b/tests/dotnet/UnitTests/DotNetUnitTests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/tests/generator/generator-tests.csproj b/tests/generator/generator-tests.csproj
index 33fba224b1f5..3947d9ea106c 100644
--- a/tests/generator/generator-tests.csproj
+++ b/tests/generator/generator-tests.csproj
@@ -33,7 +33,7 @@
-
+
diff --git a/tests/linker/ios/link all/Main.cs b/tests/linker/ios/link all/Main.cs
index 378d25b29ff6..10e8609d6fa3 100644
--- a/tests/linker/ios/link all/Main.cs
+++ b/tests/linker/ios/link all/Main.cs
@@ -16,4 +16,16 @@ static void Main (string[] args)
}
#endif // !__WATCHOS__
}
+
+#if NET
+ // https://github.com/mono/linker/issues/1913
+ [Foundation.Preserve (AllMembers = true)]
+ class Preserver
+ {
+ public Preserver ()
+ {
+ GC.KeepAlive (new System.Runtime.CompilerServices.InternalsVisibleToAttribute ("preserve this constructor"));
+ }
+ }
+#endif
}
diff --git a/tests/mmptest/mmptest.csproj b/tests/mmptest/mmptest.csproj
index ea27e430d5bf..1217669be7c1 100644
--- a/tests/mmptest/mmptest.csproj
+++ b/tests/mmptest/mmptest.csproj
@@ -40,9 +40,7 @@
..\..\_mac-build\Library\Frameworks\Xamarin.Mac.framework\Versions\git\lib\mmp\mmp.exe
-
- 2.1.176
-
+
diff --git a/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs b/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs
index ab24a2cc72ad..1af79a3a5191 100644
--- a/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs
+++ b/tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs
@@ -158,9 +158,9 @@ public void ParseBinLog (string log)
} else if (args is ProjectEvaluationStartedEventArgs projectEvaluationStarted) {
if (verbose)
Console.WriteLine ($"ProjectEvaluationStarted: {projectEvaluationStarted.ProjectFile}");
- } else if (args is ProjectEvaluationFinishedEventArgs projectEvaluationFinished) {
+ } else if (args.GetType ().Name == "ProjectEvaluationFinishedEventArgs") {
if (verbose)
- Console.WriteLine ($"ProjectEvaluationFinished: {projectEvaluationFinished.ProjectFile}");
+ Console.WriteLine ($"ProjectEvaluationFinished: {args}");
} else if (args is ProjectStartedEventArgs projectStarted) {
if (verbose)
Console.WriteLine ($"ProjectStarted: {projectStarted.ProjectFile}");
diff --git a/tests/msbuild/Xamarin.MacDev.Tests/Xamarin.MacDev.Tests.csproj b/tests/msbuild/Xamarin.MacDev.Tests/Xamarin.MacDev.Tests.csproj
index 25e726d0cb23..29b74f11e6ea 100644
--- a/tests/msbuild/Xamarin.MacDev.Tests/Xamarin.MacDev.Tests.csproj
+++ b/tests/msbuild/Xamarin.MacDev.Tests/Xamarin.MacDev.Tests.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/tests/mtouch/mtouch.csproj b/tests/mtouch/mtouch.csproj
index 809c71cfee66..f11c4a048468 100644
--- a/tests/mtouch/mtouch.csproj
+++ b/tests/mtouch/mtouch.csproj
@@ -28,7 +28,7 @@
-
+
diff --git a/tools/dotnet-linker/LinkerConfiguration.cs b/tools/dotnet-linker/LinkerConfiguration.cs
index b6f03d624f2d..5c818ff928ac 100644
--- a/tools/dotnet-linker/LinkerConfiguration.cs
+++ b/tools/dotnet-linker/LinkerConfiguration.cs
@@ -309,11 +309,7 @@ public void Write ()
public string GetAssemblyFileName (AssemblyDefinition assembly)
{
- // See: https://github.com/mono/linker/issues/1313
- // Call LinkContext.Resolver.GetAssemblyFileName (https://github.com/mono/linker/blob/da2cc0fcd6c3a8e8e5d1b5d4a655f3653baa8980/src/linker/Linker/AssemblyResolver.cs#L88) using reflection.
- var resolver = typeof (LinkContext).GetProperty ("Resolver").GetValue (Context);
- var filename = (string) resolver.GetType ().GetMethod ("GetAssemblyFileName", new Type [] { typeof (AssemblyDefinition) }).Invoke (resolver, new object [] { assembly });
- return filename;
+ return Context.GetAssemblyLocation (assembly);
}
public void WriteOutputForMSBuild (string itemName, List items)
diff --git a/tools/dotnet-linker/dotnet-linker.csproj b/tools/dotnet-linker/dotnet-linker.csproj
index 5dcbeed3d808..72f2d4c48b3f 100644
--- a/tools/dotnet-linker/dotnet-linker.csproj
+++ b/tools/dotnet-linker/dotnet-linker.csproj
@@ -7,7 +7,7 @@
-
+