diff --git a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 1443f892c48..9339042aef5 100644 --- a/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ko/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -711,6 +711,15 @@ + + + + + + + + + diff --git a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 79e14419ac6..c753eb4ab7a 100644 --- a/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -711,6 +711,15 @@ + + + + + + + + + diff --git a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 0c0b9892df9..da4a7ce0ca0 100644 --- a/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/ru/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -711,6 +711,15 @@ + + + + + + + + + diff --git a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index dfd24cad1bf..d189a40c3c1 100644 --- a/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/tr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -711,6 +711,15 @@ + + + + + + + + + diff --git a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl index 9d5d8eacbfa..7283f5b62f9 100644 --- a/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl +++ b/Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl @@ -711,6 +711,15 @@ + + + + + + + + + diff --git a/NuGet.config b/NuGet.config index 1e45ad9f6d6..5e5f9f5e6a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cde5bb99d6..d439cfbac5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,25 @@ - + https://github.com/dotnet/installer - e3ab0b5b8c29d8d882ab1bfe6a5a99a703622c7e + 632ddca23b8ec1393a1ec26607650236290276f1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 2bdc3cb8dd3500aa2b3a51b558782560b26b5973 https://github.com/dotnet/emsdk d7ff0aa47c680be543905cc1410e2f62b54dfefe + + https://github.com/dotnet/cecil + 68e0c35d0b4b6651b9a062a52e7dd694d7a43927 + https://github.com/dotnet/runtime 9529803ae29c2804880c6bd8ca710b8c037cb498 diff --git a/eng/Versions.props b/eng/Versions.props index 0a14f1f09ab..27ee25f6445 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,14 +1,15 @@ - 8.0.100-preview.2.23123.10 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 + 8.0.100-preview.3.23128.1 + 8.0.0-preview.2.23127.4 + 8.0.0-preview.2.23127.4 7.0.0-beta.22103.1 7.0.0-beta.22103.1 8.0.0-preview.2.23113.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version) 7.0.100-rc.1.22410.7 + 0.11.4-alpha.23113.1 8.0.0-alpha.1.23080.2 @@ -18,7 +19,7 @@ $(DotNetPreviewVersionBand) $(DotNetPreviewVersionBand) - $(DotNetPreviewVersionBand) - $(DotNetPreviewVersionBand) + 8.0.100-preview.2 + 8.0.100-preview.2 diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj index fcb1091f3da..aa8694c7a3c 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj +++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj @@ -7,7 +7,6 @@ $(MicrosoftAndroidSdkOutDir) - 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 6902b06169c..eb2fe1d1bbf 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 @@ -11,19 +11,19 @@ "Size": 7313 }, "assemblies/Java.Interop.dll": { - "Size": 66562 + "Size": 66563 }, "assemblies/Mono.Android.dll": { - "Size": 444972 + "Size": 445325 }, "assemblies/Mono.Android.Runtime.dll": { - "Size": 5822 + "Size": 5895 }, "assemblies/mscorlib.dll": { - "Size": 3866 + "Size": 3868 }, "assemblies/netstandard.dll": { - "Size": 5579 + "Size": 5580 }, "assemblies/rc.bin": { "Size": 1182 @@ -32,109 +32,109 @@ "Size": 11561 }, "assemblies/System.Collections.dll": { - "Size": 15271 + "Size": 15405 }, "assemblies/System.Collections.NonGeneric.dll": { - "Size": 7499 + "Size": 7501 }, "assemblies/System.ComponentModel.dll": { "Size": 1973 }, "assemblies/System.ComponentModel.Primitives.dll": { - "Size": 2595 + "Size": 2596 }, "assemblies/System.ComponentModel.TypeConverter.dll": { - "Size": 6081 + "Size": 6083 }, "assemblies/System.Console.dll": { "Size": 6623 }, "assemblies/System.Core.dll": { - "Size": 1992 + "Size": 1994 }, "assemblies/System.Diagnostics.TraceSource.dll": { - "Size": 6591 + "Size": 6590 }, "assemblies/System.dll": { - "Size": 2347 + "Size": 2349 }, "assemblies/System.Drawing.dll": { - "Size": 2032 + "Size": 2034 }, "assemblies/System.Drawing.Primitives.dll": { - "Size": 12010 + "Size": 12011 }, "assemblies/System.IO.Compression.Brotli.dll": { - "Size": 11871 + "Size": 11031 }, "assemblies/System.IO.Compression.dll": { - "Size": 16858 + "Size": 15983 }, "assemblies/System.IO.IsolatedStorage.dll": { - "Size": 10011 + "Size": 10013 }, "assemblies/System.Linq.dll": { - "Size": 19453 + "Size": 19455 }, "assemblies/System.Linq.Expressions.dll": { - "Size": 164141 + "Size": 164140 }, "assemblies/System.Net.Http.dll": { - "Size": 66153 + "Size": 65497 }, "assemblies/System.Net.Primitives.dll": { - "Size": 22487 + "Size": 22480 }, "assemblies/System.Net.Requests.dll": { - "Size": 3630 + "Size": 3632 }, "assemblies/System.ObjectModel.dll": { - "Size": 8154 + "Size": 8155 }, "assemblies/System.Private.CoreLib.dll": { - "Size": 814322 + "Size": 814504 }, "assemblies/System.Private.DataContractSerialization.dll": { - "Size": 192370 + "Size": 192382 }, "assemblies/System.Private.Uri.dll": { - "Size": 42897 + "Size": 42896 }, "assemblies/System.Private.Xml.dll": { - "Size": 216180 + "Size": 216178 }, "assemblies/System.Private.Xml.Linq.dll": { - "Size": 16673 + "Size": 16674 }, "assemblies/System.Runtime.dll": { - "Size": 2774 + "Size": 2776 }, "assemblies/System.Runtime.InteropServices.dll": { - "Size": 3760 + "Size": 3762 }, "assemblies/System.Runtime.Serialization.dll": { - "Size": 1950 + "Size": 1952 }, "assemblies/System.Runtime.Serialization.Formatters.dll": { - "Size": 2517 + "Size": 2518 }, "assemblies/System.Runtime.Serialization.Primitives.dll": { - "Size": 3802 + "Size": 3804 }, "assemblies/System.Security.Cryptography.dll": { - "Size": 7781 + "Size": 7776 }, "assemblies/System.Text.RegularExpressions.dll": { - "Size": 157123 + "Size": 157124 }, "assemblies/System.Xml.dll": { - "Size": 1839 + "Size": 1841 }, "assemblies/System.Xml.Linq.dll": { - "Size": 1864 + "Size": 1866 }, "assemblies/UnnamedProject.dll": { - "Size": 5286 + "Size": 5294 }, "assemblies/Xamarin.AndroidX.Activity.dll": { "Size": 5867 @@ -209,10 +209,10 @@ "Size": 93552 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 380656 + "Size": 380736 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3106808 + "Size": 3107296 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { "Size": 723840 @@ -224,7 +224,7 @@ "Size": 154904 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 333840 + "Size": 333880 }, "META-INF/android.support.design_material.version": { "Size": 12 diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index a1e623a434d..703469dd361 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -38,7 +38,7 @@ - +