diff --git a/NuGet.config b/NuGet.config index 3ca36dd6405..f15dda0b1b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ac0f4a734f..e5cddbc503d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 https://github.com/dotnet/dotnet @@ -40,13 +40,13 @@ - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 - + https://github.com/dotnet/dotnet - 93970af2dae989c795efb703be9a25ff95079f25 + 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 diff --git a/eng/Versions.props b/eng/Versions.props index e70eddeaa1b..697de196f75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,18 +1,18 @@ - 10.0.101-servicing.25563.104 + 10.0.100-rc.3.25578.104 $(MicrosoftNETSdkPackageVersion) - 10.0.1-servicing.25563.104 - 10.0.1 + 10.0.0-rc.3.25578.104 + 10.0.0-rc.3.25578.104 7.0.0-beta.22103.1 - 10.0.0-beta.25563.104 + 11.0.0-beta.25578.104 10.0.101 10.0.101 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion) - 10.0.101 - 0.11.5-alpha.25563.104 + 11.0.100-alpha.25578.104 + 0.11.5-alpha.25578.104 9.0.4 35.0.105 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs index 9306c1cf4af..b0dcc115436 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs @@ -148,7 +148,6 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto "Humanizer.dll", "es/Humanizer.resources.dll", "System.Collections.dll", - "System.Collections.Concurrent.dll", "System.Text.RegularExpressions.dll", }; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc index f9b95651b1b..fbcf02706d9 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.CoreCLR.apkdesc @@ -8,40 +8,40 @@ "Size": 397616 }, "lib/arm64-v8a/libassemblies.arm64-v8a.blob.so": { - "Size": 3031896 + "Size": 3124664 }, "lib/arm64-v8a/libclrjit.so": { - "Size": 3191312 + "Size": 3180136 }, "lib/arm64-v8a/libcoreclr.so": { - "Size": 6213712 + "Size": 5835752 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 1369248 + "Size": 1375432 }, "lib/arm64-v8a/libmscordaccore.so": { - "Size": 2632624 + "Size": 2534624 }, "lib/arm64-v8a/libmscordbi.so": { - "Size": 1942040 + "Size": 1909056 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { - "Size": 71952 + "Size": 71936 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { - "Size": 759304 + "Size": 758968 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 104112 + "Size": 105408 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 165568 + "Size": 165536 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 20088 + "Size": 20128 }, "META-INF/BNDLTOOL.RSA": { - "Size": 1211 + "Size": 1221 }, "META-INF/BNDLTOOL.SF": { "Size": 2306 @@ -74,5 +74,5 @@ "Size": 1904 } }, - "PackageSize": 9107237 + "PackageSize": 9049893 } \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc index 2f2c9239740..b10cb1360d2 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.CoreCLR.apkdesc @@ -5,7 +5,7 @@ "Size": 6652 }, "classes.dex": { - "Size": 9449132 + "Size": 9448760 }, "classes2.dex": { "Size": 156448 @@ -32,37 +32,37 @@ "Size": 2396 }, "lib/arm64-v8a/libassemblies.arm64-v8a.blob.so": { - "Size": 13826528 + "Size": 14221080 }, "lib/arm64-v8a/libclrjit.so": { - "Size": 3191312 + "Size": 3180136 }, "lib/arm64-v8a/libcoreclr.so": { - "Size": 6213712 + "Size": 5835752 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 1369248 + "Size": 1375432 }, "lib/arm64-v8a/libmscordaccore.so": { - "Size": 2632624 + "Size": 2534624 }, "lib/arm64-v8a/libmscordbi.so": { - "Size": 1942040 + "Size": 1909056 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { - "Size": 71952 + "Size": 71936 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { - "Size": 759304 + "Size": 758968 }, "lib/arm64-v8a/libSystem.Native.so": { - "Size": 104112 + "Size": 105408 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 165568 + "Size": 165536 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 147176 + "Size": 147200 }, "META-INF/androidx.activity_activity.version": { "Size": 6 @@ -215,7 +215,7 @@ "Size": 6 }, "META-INF/BNDLTOOL.RSA": { - "Size": 1211 + "Size": 1221 }, "META-INF/BNDLTOOL.SF": { "Size": 90357 @@ -2285,5 +2285,5 @@ "Size": 812848 } }, - "PackageSize": 22578118 + "PackageSize": 22619078 } \ No newline at end of file