diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 839d79883c43..3e84c919e070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,9 +64,9 @@ https://github.com/xamarin/xamarin-macios 06fea905cf900ab5296b08d7b67dadddc733dd65 - + https://github.com/dotnet/runtime - cf47d9ff6827a3e1d6f2acbf925cd618418f20dd + 9bff9c5017d8444fdf76959c112dd9fed2da9317 diff --git a/eng/Versions.props b/eng/Versions.props index 9277ec600a4e..f365089db8cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 8.0.0-beta.24413.2 9.0.0-rc.2.24462.10 8.0.0-rtm.23511.3 - 9.0.0-alpha.1.23556.4 + 9.0.0-rc.2.24462.10 7.0.100-alpha.1.21601.1 0.11.5-alpha.24419.1 10.0.0-prerelease.24466.1 diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/ILStrip.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/ILStrip.cs index 2ef39b53d69e..77c58c6d2c87 100644 --- a/msbuild/Xamarin.MacDev.Tasks/Tasks/ILStrip.cs +++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/ILStrip.cs @@ -23,17 +23,15 @@ public override bool Execute () if (this.ShouldExecuteRemotely (SessionId)) return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result; - var stripedItems = new List (); foreach (var item in Assemblies) { var outputPath = item.GetMetadata ("OutputPath"); - stripedItems.Add (new TaskItem (outputPath, item.CloneCustomMetadata ())); Directory.CreateDirectory (Path.GetDirectoryName (outputPath)); } var result = base.Execute (); - if (result) - StrippedAssemblies = stripedItems.ToArray (); + if (result && UpdatedAssemblies is not null) + StrippedAssemblies = UpdatedAssemblies; return result; } diff --git a/tests/monotouch-test/NativeLibrary.dll b/tests/monotouch-test/NativeLibrary.dll new file mode 100755 index 000000000000..9593a3972e40 Binary files /dev/null and b/tests/monotouch-test/NativeLibrary.dll differ diff --git a/tests/monotouch-test/dotnet/shared.csproj b/tests/monotouch-test/dotnet/shared.csproj index e72462bc7823..59339e82e4b7 100644 --- a/tests/monotouch-test/dotnet/shared.csproj +++ b/tests/monotouch-test/dotnet/shared.csproj @@ -64,6 +64,12 @@ + + + PreserveNewest + + +