Skip to content

Commit ae178fa

Browse files
dotnet-maestro[bot]jonathanpeppers
dotnet-maestro[bot]
and
jonathanpeppers
authored
Bump to dotnet/installer@8f63969 7.0.100-rc.1.22407.1 (#7217)
Changes: dotnet/installer@53587f9...8f63969 Changes: dotnet/linker@31a57b5...f09bacf Changes: dotnet/runtime@aafa910...26a71c6 Changes: dotnet/emsdk@11a9acf...7b2cd1e Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-rc.1.22374.1 to 7.0.100-rc.1.22407.1 * Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22368.1 to 7.0.100-1.22377.1 * Microsoft.NETCore.App.Ref: from 7.0.0-rc.1.22367.4 to 7.0.0-rc.1.22403.8 * Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-rc.1.22362.2 to 7.0.0-rc.1.22368.1 ~~ Other Changes ~~ * Remove leading/trailing spaces from response file Context: dotnet/sdk#26627 This is triggering a bug in the dotnet/sdk. We should probably just leave these this way, as it is weird to have leading/trailing spaces. * export `DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=true` in both `Makefile` and AzDO `.yaml`. Context: dotnet/sdk#26965 We should be able to remove this in a future .NET SDK bump. * Pass along BinaryFormatter warning to BinarySerializableConstraint Context: https://github.com/dotnet/runtime/blob/197ae4c596553f7e6acb327ca2e31cc00c794c4d/src/libraries/System.Runtime.Serialization.Formatters/src/System/Runtime/Serialization/Formatters/Binary/BinaryFormatter.Core.cs#L11 Our build was failing with: src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs(57,17): 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.' src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs(61,32): error SYSLIB0011: 'BinaryFormatter.Deserialize(Stream)' is obsolete: 'BinaryFormatter serialization is obsolete and should not be used. See https://aka.ms/binaryformatter for more information.' I can add the same `[Obsolete]` messages on `NUnit.Framework.Constraints.BinarySerializableConstraint` to solve this error. * [tests] add one `$(NoWarn)` for `SYSLIB0011` Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 51acc43 commit ae178fa

File tree

7 files changed

+29
-18
lines changed

7 files changed

+29
-18
lines changed

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ endif
3838

3939
export NO_SUDO ?= false
4040

41+
# Workaround: https://github.com/dotnet/sdk/issues/26965
42+
export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER = true
43+
4144
ifneq ($(NO_SUDO),false)
4245
_PREPARE_ARGS += --auto-provisioning-uses-sudo=false
4346
endif

‎build-tools/automation/yaml-templates/variables.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ variables:
3535
value: net7.0
3636
- name: DotNetStableTargetFramework
3737
value: net6.0
38+
# Workaround: https://github.com/dotnet/sdk/issues/26965
39+
- name: DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER
40+
value: true

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22374.1">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22407.1">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>53587f98e132f3c5bc6d2a77d779d6872710d53e</Sha>
5+
<Sha>8f639696e6d57fb09e03e89c6397d913de1231ed</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22368.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22377.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>31a57b5762d8aceb4a61cc1e6cf96605cce417f1</Sha>
9+
<Sha>f09bacf09ef10b61cf9f19825f8782171a816dab</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22367.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>aafa91036e1efd3d4dcb67eeb261cb6d8f774685</Sha>
13+
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22362.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22368.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>11a9acf5ab6fe5a20f0a7d4326c785bd51e9859c</Sha>
17+
<Sha>7b2cd1ee7169143248a7da9fd749caf22affa624</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22374.1</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22368.1</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22367.4</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22407.1</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22377.1</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22362.2</MicrosoftNETWorkloadEmscriptenManifest70100Version>
9+
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22368.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>

‎src-ThirdParty/NUnitLite/Constraints/BinarySerializableConstraint.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ public class BinarySerializableConstraint : Constraint
4343
/// <param name="actual">The value to be tested</param>
4444
/// <returns>True for success, false for failure</returns>
4545
[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.")]
46+
#if NET
47+
[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}")]
48+
#endif
4649
public override bool Matches(object actual)
4750
{
4851
this.actual = actual;

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,21 +233,21 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
233233
args.Append ($" @\"{responseFile}\"");
234234
using (var sw = new StreamWriter (responseFile, append: false, encoding: Encoding.UTF8)) {
235235
sw.WriteLine ("/p:_DisableParallelAot=true");
236-
sw.WriteLine ($" /p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
236+
sw.WriteLine ($"/p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
237237
if (BuildingInsideVisualStudio) {
238-
sw.WriteLine (" /p:BuildingOutOfProcess=true");
238+
sw.WriteLine ("/p:BuildingOutOfProcess=true");
239239
}
240240
string sdkPath = AndroidSdkResolver.GetAndroidSdkPath ();
241241
if (Directory.Exists (sdkPath)) {
242-
sw.WriteLine (" /p:AndroidSdkDirectory=\"{0}\" ", sdkPath);
242+
sw.WriteLine ("/p:AndroidSdkDirectory=\"{0}\"", sdkPath);
243243
}
244244
string jdkPath = AndroidSdkResolver.GetJavaSdkPath ();
245245
if (Directory.Exists (jdkPath)) {
246-
sw.WriteLine (" /p:JavaSdkDirectory=\"{0}\" ", jdkPath);
246+
sw.WriteLine ("/p:JavaSdkDirectory=\"{0}\"", jdkPath);
247247
}
248248
if (parameters != null) {
249249
foreach (var param in parameters) {
250-
sw.WriteLine (" /p:{0}", param);
250+
sw.WriteLine ("/p:{0}", param);
251251
}
252252
}
253253
var msbuildArgs = Environment.GetEnvironmentVariable ("NUNIT_MSBUILD_ARGS");
@@ -256,7 +256,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
256256
}
257257

258258
psi.SetEnvironmentVariable ("MSBUILD", "msbuild");
259-
sw.WriteLine ($" /bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");
259+
sw.WriteLine ($"/bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");
260260

261261
if (environmentVariables != null) {
262262
foreach (var kvp in environmentVariables) {

‎tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,8 @@ public void JsonDeserializationCreatesJavaHandle ([Values (false, true)] bool is
492492
proj = new XamarinAndroidApplicationProject () {
493493
IsRelease = isRelease,
494494
};
495+
// 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.'
496+
proj.SetProperty ("NoWarn", "SYSLIB0011");
495497

496498
if (isRelease || !CommercialBuildAvailable) {
497499
proj.SetAndroidSupportedAbis ("armeabi-v7a", "arm64-v8a", "x86", "x86_64");

0 commit comments

Comments
 (0)