diff --git a/NuGet.config b/NuGet.config
index e27a80ca193..1a0f14021c0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,8 +4,6 @@
-
-
diff --git a/build-tools/xaprepare/xaprepare/Application/KnownProperties.cs b/build-tools/xaprepare/xaprepare/Application/KnownProperties.cs
index 2d9fd7efcfa..bcc7fcc69c4 100644
--- a/build-tools/xaprepare/xaprepare/Application/KnownProperties.cs
+++ b/build-tools/xaprepare/xaprepare/Application/KnownProperties.cs
@@ -29,6 +29,7 @@ static class KnownProperties
public const string DotNetEmscriptenManifestVersionBand = nameof (DotNetEmscriptenManifestVersionBand);
public const string MicrosoftDotnetSdkInternalPackageVersion = "MicrosoftDotnetSdkInternalPackageVersion";
public const string MicrosoftNETCoreAppRefPackageVersion = "MicrosoftNETCoreAppRefPackageVersion";
+ public const string MicrosoftNETWorkloadMonoToolChainPackageVersion = "MicrosoftNETWorkloadMonoToolChainPackageVersion";
public const string MicrosoftNETWorkloadEmscriptenPackageVersion = "MicrosoftNETWorkloadEmscriptenPackageVersion";
public const string EmulatorVersion = "EmulatorVersion";
public const string EmulatorPkgRevision = "EmulatorPkgRevision";
diff --git a/build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in b/build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in
index 6e59af3ab6e..10eec156c59 100644
--- a/build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in
+++ b/build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in
@@ -33,6 +33,7 @@ namespace Xamarin.Android.Prepare
properties.Add (KnownProperties.DotNetEmscriptenManifestVersionBand, StripQuotes (@"@DotNetEmscriptenManifestVersionBand@"));
properties.Add (KnownProperties.MicrosoftDotnetSdkInternalPackageVersion, StripQuotes ("@MicrosoftDotnetSdkInternalPackageVersion@"));
properties.Add (KnownProperties.MicrosoftNETCoreAppRefPackageVersion, StripQuotes ("@MicrosoftNETCoreAppRefPackageVersion@"));
+ properties.Add (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion, StripQuotes ("@MicrosoftNETWorkloadMonoToolChainPackageVersion@"));
properties.Add (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion, StripQuotes ("@MicrosoftNETWorkloadEmscriptenPackageVersion@"));
properties.Add (KnownProperties.EmulatorVersion, StripQuotes ("@EmulatorVersion@"));
properties.Add (KnownProperties.EmulatorPkgRevision, StripQuotes ("@EmulatorPkgRevision@"));
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
index 9f49fb1e87b..cea77e914aa 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
@@ -206,7 +206,7 @@ public static partial class Paths
public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine (
XAPackagesDir,
$"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}",
- ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion)
+ ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion)
);
public static string MicrosoftNETWorkloadMonoToolChainDir => Path.Combine (MicrosoftNETWorkloadMonoPackageDir, "data");
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
index 36ee3c1f958..1dc2f3c5394 100644
--- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
+++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
@@ -60,7 +60,7 @@ protected override async Task Execute (Context context)
var destination = Path.Combine (sdk_manifests,
context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand),
$"microsoft.net.workload.mono.toolchain.{dotnet}",
- context.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion));
+ context.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadMonoToolChainPackageVersion));
Utilities.DeleteDirectory (destination, recurse: true);
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "*")) {
Utilities.CopyFileToDir (file, destination);
diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj
index 6f8053660df..66b31611352 100644
--- a/build-tools/xaprepare/xaprepare/package-download.proj
+++ b/build-tools/xaprepare/xaprepare/package-download.proj
@@ -22,11 +22,11 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will
-
-
-
-
-
+
+
+
+
+
diff --git a/build-tools/xaprepare/xaprepare/xaprepare.targets b/build-tools/xaprepare/xaprepare/xaprepare.targets
index 4c8e3be8906..cfec5df6b4d 100644
--- a/build-tools/xaprepare/xaprepare/xaprepare.targets
+++ b/build-tools/xaprepare/xaprepare/xaprepare.targets
@@ -67,6 +67,7 @@
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c644063fb2e..40eab1a767e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,20 +1,16 @@
-
+
https://github.com/dotnet/sdk
- a081488f32ee97b730ac15197a1b0044a89a3995
+ 6bca3a3355975b2cfa345d3e1194d9a07d78be71
-
+
https://github.com/dotnet/runtime
- 7618121e0f64098e2b81ed7c8cdf7024a1b87795
+ d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02
-
+
https://github.com/dotnet/runtime
- 7618121e0f64098e2b81ed7c8cdf7024a1b87795
-
-
- https://github.com/dotnet/emsdk
- e7ebd8aa0424ba4dc6ac03419954c3287d891faa
+ d06c2f6ec8228addc77cb7b7856c3fe07c3d1f02
https://github.com/dotnet/cecil
diff --git a/eng/Versions.props b/eng/Versions.props
index ec3f200318e..a8c1bb62144 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,14 +1,14 @@
- 10.0.100-preview.4.25211.22
+ 10.0.100-preview.4.25216.3
$(MicrosoftNETSdkPackageVersion)
- 10.0.0-preview.4.25210.5
- 10.0.0-preview.4.25210.5
+ 10.0.0-preview.4.25215.12
+ 10.0.0-preview.4.25215.12
7.0.0-beta.22103.1
10.0.0-beta.24476.2
- 10.0.0-preview.4.25176.1
- $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion)
+ $(MicrosoftNETSdkPackageVersion)
+ $(MicrosoftNETSdkPackageVersion)
9.0.201
0.11.5-alpha.25125.1
$(MicrosoftNETCoreAppRefPackageVersion)
@@ -25,7 +25,7 @@
\-(preview|rc|alpha).\d+
$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), $(VersionSuffixRegex)))
$(DotNetPreviewVersionBand)
- $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETCoreAppRefPackageVersion), $(VersionSuffixRegex)))
+ $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadMonoToolChainPackageVersion), $(VersionSuffixRegex)))
$(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftNETWorkloadEmscriptenPackageVersion), $(VersionSuffixRegex)))
$(DotNetPreviewVersionBand)
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
index 086051c3fad..cf5b327b70c 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
@@ -38,16 +38,16 @@
"Size": 96104
},
"lib/arm64-v8a/lib_Mono.Android.dll.so": {
- "Size": 562344
+ "Size": 562336
},
"lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
- "Size": 23240
+ "Size": 23224
},
"lib/arm64-v8a/lib_mscorlib.dll.so": {
- "Size": 21448
+ "Size": 21456
},
"lib/arm64-v8a/lib_netstandard.dll.so": {
- "Size": 23088
+ "Size": 23096
},
"lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": {
"Size": 29896
@@ -62,22 +62,19 @@
"Size": 23856
},
"lib/arm64-v8a/lib_System.ComponentModel.dll.so": {
- "Size": 19600
+ "Size": 19608
},
"lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": {
- "Size": 21328
+ "Size": 21336
},
"lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": {
- "Size": 42472
+ "Size": 42440
},
"lib/arm64-v8a/lib_System.Console.dll.so": {
- "Size": 24432
+ "Size": 24440
},
"lib/arm64-v8a/lib_System.Core.dll.so": {
- "Size": 19464
- },
- "lib/arm64-v8a/lib_System.Diagnostics.DiagnosticSource.dll.so": {
- "Size": 32384
+ "Size": 19472
},
"lib/arm64-v8a/lib_System.Diagnostics.TraceSource.dll.so": {
"Size": 24704
@@ -86,10 +83,10 @@
"Size": 19856
},
"lib/arm64-v8a/lib_System.Drawing.dll.so": {
- "Size": 19448
+ "Size": 19456
},
"lib/arm64-v8a/lib_System.Drawing.Primitives.dll.so": {
- "Size": 30056
+ "Size": 30064
},
"lib/arm64-v8a/lib_System.Formats.Asn1.dll.so": {
"Size": 50312
@@ -101,7 +98,7 @@
"Size": 33800
},
"lib/arm64-v8a/lib_System.IO.IsolatedStorage.dll.so": {
- "Size": 28328
+ "Size": 28336
},
"lib/arm64-v8a/lib_System.Linq.dll.so": {
"Size": 40696
@@ -110,7 +107,7 @@
"Size": 185864
},
"lib/arm64-v8a/lib_System.Net.Http.dll.so": {
- "Size": 88816
+ "Size": 85904
},
"lib/arm64-v8a/lib_System.Net.Primitives.dll.so": {
"Size": 42184
@@ -122,49 +119,49 @@
"Size": 27088
},
"lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
- "Size": 966864
+ "Size": 967200
},
"lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": {
- "Size": 216688
+ "Size": 216496
},
"lib/arm64-v8a/lib_System.Private.Uri.dll.so": {
- "Size": 62800
+ "Size": 62728
},
"lib/arm64-v8a/lib_System.Private.Xml.dll.so": {
"Size": 236920
},
"lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": {
- "Size": 35592
+ "Size": 35600
},
"lib/arm64-v8a/lib_System.Runtime.dll.so": {
- "Size": 20256
+ "Size": 20264
},
"lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
- "Size": 21480
+ "Size": 21488
},
"lib/arm64-v8a/lib_System.Runtime.Numerics.dll.so": {
- "Size": 55776
+ "Size": 55784
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.dll.so": {
- "Size": 19368
+ "Size": 19376
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": {
- "Size": 20344
+ "Size": 20352
},
"lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": {
- "Size": 21464
+ "Size": 21472
},
"lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": {
- "Size": 81280
+ "Size": 81288
},
"lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": {
- "Size": 187064
+ "Size": 187056
},
"lib/arm64-v8a/lib_System.Xml.dll.so": {
- "Size": 19264
+ "Size": 19272
},
"lib/arm64-v8a/lib_System.Xml.Linq.dll.so": {
- "Size": 19280
+ "Size": 19288
},
"lib/arm64-v8a/lib_UnnamedProject.dll.so": {
"Size": 22096
@@ -245,16 +242,16 @@
"Size": 36600
},
"lib/arm64-v8a/libmonodroid.so": {
- "Size": 1502528
+ "Size": 1516584
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
- "Size": 3110864
+ "Size": 3110944
},
"lib/arm64-v8a/libSystem.Globalization.Native.so": {
"Size": 71952
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
- "Size": 758896
+ "Size": 759304
},
"lib/arm64-v8a/libSystem.Native.so": {
"Size": 103520
@@ -263,7 +260,7 @@
"Size": 165000
},
"lib/arm64-v8a/libxamarin-app.so": {
- "Size": 353224
+ "Size": 353048
},
"META-INF/androidx.activity_activity.version": {
"Size": 6
@@ -416,10 +413,10 @@
"Size": 6
},
"META-INF/BNDLTOOL.RSA": {
- "Size": 1223
+ "Size": 1221
},
"META-INF/BNDLTOOL.SF": {
- "Size": 98577
+ "Size": 98445
},
"META-INF/com.android.tools/proguard/coroutines.pro": {
"Size": 1345
@@ -446,7 +443,7 @@
"Size": 5
},
"META-INF/MANIFEST.MF": {
- "Size": 98450
+ "Size": 98318
},
"META-INF/maven/com.google.guava/listenablefuture/pom.properties": {
"Size": 96
@@ -2486,5 +2483,5 @@
"Size": 812848
}
},
- "PackageSize": 10964235
+ "PackageSize": 10955937
}
\ No newline at end of file