diff --git a/Makefile b/Makefile index 952d405a564..b283f85ba6e 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,9 @@ endif export NO_SUDO ?= false +# Workaround: https://github.com/dotnet/sdk/issues/26965 +export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER = true + ifneq ($(NO_SUDO),false) _PREPARE_ARGS += --auto-provisioning-uses-sudo=false endif diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index 558930e11db..6a9356215d6 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -35,3 +35,6 @@ variables: value: net7.0 - name: DotNetStableTargetFramework value: net6.0 +# Workaround: https://github.com/dotnet/sdk/issues/26965 +- name: DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER + value: true diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 475aa701618..e5306172f5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 53587f98e132f3c5bc6d2a77d779d6872710d53e + 8f639696e6d57fb09e03e89c6397d913de1231ed - + https://github.com/dotnet/linker - 31a57b5762d8aceb4a61cc1e6cf96605cce417f1 + f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/runtime - aafa91036e1efd3d4dcb67eeb261cb6d8f774685 + 26a71c61fbda229f151afb14e274604b4926df5c - + https://github.com/dotnet/emsdk - 11a9acf5ab6fe5a20f0a7d4326c785bd51e9859c + 7b2cd1ee7169143248a7da9fd749caf22affa624 diff --git a/eng/Versions.props b/eng/Versions.props index d2afd1ddd87..58de13775d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,12 +1,12 @@ - 7.0.100-rc.1.22374.1 - 7.0.100-1.22368.1 - 7.0.0-rc.1.22367.4 + 7.0.100-rc.1.22407.1 + 7.0.100-1.22377.1 + 7.0.0-rc.1.22403.8 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 7.0.0-rc.1.22362.2 + 7.0.0-rc.1.22368.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) diff --git a/src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs b/src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs index 7eb45e8752e..c6d5a52bd34 100644 --- a/src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs +++ b/src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs @@ -43,6 +43,9 @@ public class BinarySerializableConstraint : Constraint /// The value to be tested /// True for success, false for failure [System.Diagnostics.CodeAnalysis.SuppressMessage ("Security", "CA2302: Ensure BinaryFormatter.Binder is set before calling BinaryFormatter.Deserialize", Justification = "Data to be deserialized is trusted, as we create it in this same method.")] +#if NET + [Obsolete("BinaryFormatter serialization is obsolete and should not be used. See https://aka.ms/binaryformatter for more information.", DiagnosticId = "SYSLIB0011", UrlFormat = "https://aka.ms/dotnet-warnings/{0}")] +#endif public override bool Matches(object actual) { this.actual = actual; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs index 193bbcaebed..5f3d93bce01 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs @@ -233,21 +233,21 @@ protected bool BuildInternal (string projectOrSolution, string target, string [] args.Append ($" @\"{responseFile}\""); using (var sw = new StreamWriter (responseFile, append: false, encoding: Encoding.UTF8)) { sw.WriteLine ("/p:_DisableParallelAot=true"); - sw.WriteLine ($" /p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}"); + sw.WriteLine ($"/p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}"); if (BuildingInsideVisualStudio) { - sw.WriteLine (" /p:BuildingOutOfProcess=true"); + sw.WriteLine ("/p:BuildingOutOfProcess=true"); } string sdkPath = AndroidSdkResolver.GetAndroidSdkPath (); if (Directory.Exists (sdkPath)) { - sw.WriteLine (" /p:AndroidSdkDirectory=\"{0}\" ", sdkPath); + sw.WriteLine ("/p:AndroidSdkDirectory=\"{0}\"", sdkPath); } string jdkPath = AndroidSdkResolver.GetJavaSdkPath (); if (Directory.Exists (jdkPath)) { - sw.WriteLine (" /p:JavaSdkDirectory=\"{0}\" ", jdkPath); + sw.WriteLine ("/p:JavaSdkDirectory=\"{0}\"", jdkPath); } if (parameters != null) { foreach (var param in parameters) { - sw.WriteLine (" /p:{0}", param); + sw.WriteLine ("/p:{0}", param); } } var msbuildArgs = Environment.GetEnvironmentVariable ("NUNIT_MSBUILD_ARGS"); @@ -256,7 +256,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string [] } psi.SetEnvironmentVariable ("MSBUILD", "msbuild"); - sw.WriteLine ($" /bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\""); + sw.WriteLine ($"/bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\""); if (environmentVariables != null) { foreach (var kvp in environmentVariables) { diff --git a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs index 09accd1d528..c6680b2b081 100644 --- a/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs +++ b/tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs @@ -492,6 +492,8 @@ public void JsonDeserializationCreatesJavaHandle ([Values (false, true)] bool is proj = new XamarinAndroidApplicationProject () { IsRelease = isRelease, }; + // error SYSLIB0011: 'BinaryFormatter.Serialize(Stream, object)' is obsolete: 'BinaryFormatter serialization is obsolete and should not be used. See https://aka.ms/binaryformatter for more information.' + proj.SetProperty ("NoWarn", "SYSLIB0011"); if (isRelease || !CommercialBuildAvailable) { proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64");