Bump dependencies (#1840)v6.0.100-preview.2.21118.1

15 files changed, 31 insertions, 49 deletions

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 1a4cf9dd8..5709726d3 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-format": {
-      "version": "4.1.131201",
+      "version": "5.0.211103",
       "commands": [
         "dotnet-format"
       ]
diff --git a/eng/Analyzers.props b/eng/Analyzers.props
index cf407bcfc..18e658e00 100644
--- a/eng/Analyzers.props
+++ b/eng/Analyzers.props
@@ -1,7 +1,7 @@
 <Project>
   <ItemGroup Condition="'$(RunAnalyzers)' == 'true'">
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0-4.20469.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisCSharpCodeStyleVersion)" PrivateAssets="all" />
     <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205" PrivateAssets="all" /> -->
   </ItemGroup>
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7e1d507ab..232ecb04c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -4,9 +4,9 @@
     <!-- File version numbers -->
     <MajorVersion>6</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <PatchVersion>0</PatchVersion>
-    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PatchVersion>100</PatchVersion>
+    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
   </PropertyGroup>
@@ -17,11 +17,12 @@
     <!-- see https://github.com/dotnet/runtime/issues/1338 -->
     <MicrosoftNETCoreILAsmVersion>$(MicrosoftNETSdkILPackageVersion)</MicrosoftNETCoreILAsmVersion>
     <!-- These should match the SDK version at https://github.com/dotnet/sdk/blob/master/eng/Versions.props -->
-    <SystemReflectionMetadataVersion>1.8.0</SystemReflectionMetadataVersion>
-    <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
+    <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
+    <MicrosoftBuildFrameworkVersion>16.10.0-preview-21112-04</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>16.10.0-preview-21112-04</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftDotNetApiCompatVersion>6.0.0-beta.21105.12</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20471.1</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21105.12</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.9.0-4.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
     <MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.7.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
     <MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion>1.0.1-beta1.*</MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion>
     <!-- This controls the version of the cecil package, or the version of cecil in the project graph
diff --git a/src/ILLink.RoslynAnalyzer/OperationExtensions.cs b/src/ILLink.RoslynAnalyzer/OperationExtensions.cs
index 6498e5682..329f4eb07 100644
--- a/src/ILLink.RoslynAnalyzer/OperationExtensions.cs
+++ b/src/ILLink.RoslynAnalyzer/OperationExtensions.cs
@@ -141,8 +141,7 @@ namespace ILLink.RoslynAnalyzer
 					return ValueUsageInfo.Read;
 				}
 			} else if (operation.Parent is IReturnOperation returnOperation) {
-				return returnOperation.GetRefKind (containingSymbol) switch
-				{
+				return returnOperation.GetRefKind (containingSymbol) switch {
 					RefKind.RefReadOnly => ValueUsageInfo.ReadableReference,
 					RefKind.Ref => ValueUsageInfo.ReadableWritableReference,
 					_ => ValueUsageInfo.Read,
diff --git a/src/linker/Linker.Dataflow/ReflectionMethodBodyScanner.cs b/src/linker/Linker.Dataflow/ReflectionMethodBodyScanner.cs
index 9ffeb6af5..ef8193f0a 100644
--- a/src/linker/Linker.Dataflow/ReflectionMethodBodyScanner.cs
+++ b/src/linker/Linker.Dataflow/ReflectionMethodBodyScanner.cs
@@ -261,8 +261,7 @@ namespace Mono.Linker.Dataflow
 
 		static IntrinsicId GetIntrinsicIdForMethod (MethodDefinition calledMethod)
 		{
-			return calledMethod.Name switch
-			{
+			return calledMethod.Name switch {
 				// static System.Reflection.IntrospectionExtensions.GetTypeInfo (Type type)
 				"GetTypeInfo" when calledMethod.IsDeclaredOnType ("System.Reflection", "IntrospectionExtensions") => IntrinsicId.IntrospectionExtensions_GetTypeInfo,
 
@@ -634,8 +633,7 @@ namespace Mono.Linker.Dataflow
 
 						reflectionContext.AnalyzingPattern ();
 						BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public;
-						DynamicallyAccessedMemberTypes requiredMemberTypes = getRuntimeMember switch
-						{
+						DynamicallyAccessedMemberTypes requiredMemberTypes = getRuntimeMember switch {
 							IntrinsicId.RuntimeReflectionExtensions_GetRuntimeEvent => DynamicallyAccessedMemberTypes.PublicEvents,
 							IntrinsicId.RuntimeReflectionExtensions_GetRuntimeField => DynamicallyAccessedMemberTypes.PublicFields,
 							IntrinsicId.RuntimeReflectionExtensions_GetRuntimeMethod => DynamicallyAccessedMemberTypes.PublicMethods,
@@ -871,8 +869,7 @@ namespace Mono.Linker.Dataflow
 							// Assume a default value for BindingFlags for methods that don't use BindingFlags as a parameter
 							bindingFlags = BindingFlags.Public | BindingFlags.Instance;
 
-						int? ctorParameterCount = parameters.Count switch
-						{
+						int? ctorParameterCount = parameters.Count switch {
 							1 => (methodParams[1] as ArrayValue)?.Size.AsConstInt (),
 							4 => (methodParams[3] as ArrayValue)?.Size.AsConstInt (),
 							5 => (methodParams[4] as ArrayValue)?.Size.AsConstInt (),
@@ -1069,8 +1066,7 @@ namespace Mono.Linker.Dataflow
 							// Assume a default value for BindingFlags for methods that don't use BindingFlags as a parameter
 							bindingFlags = BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public;
 
-						DynamicallyAccessedMemberTypes memberTypes = fieldPropertyOrEvent switch
-						{
+						DynamicallyAccessedMemberTypes memberTypes = fieldPropertyOrEvent switch {
 							IntrinsicId.Type_GetEvent => GetDynamicallyAccessedMemberTypesFromBindingFlagsForEvents (bindingFlags),
 							IntrinsicId.Type_GetField => GetDynamicallyAccessedMemberTypesFromBindingFlagsForFields (bindingFlags),
 							IntrinsicId.Type_GetProperty => GetDynamicallyAccessedMemberTypesFromBindingFlagsForProperties (bindingFlags),
@@ -1176,7 +1172,7 @@ namespace Mono.Linker.Dataflow
 							if (value is SystemTypeValue systemTypeValue) {
 								// Special case known type values as we can do better by applying exact binding flags and parameter count.
 								MarkConstructorsOnType (ref reflectionContext, systemTypeValue.TypeRepresented,
-									ctorParameterCount == null ? (Func<MethodDefinition, bool>) null : m => m.Parameters.Count == ctorParameterCount, bindingFlags);
+									ctorParameterCount == null ? null : m => m.Parameters.Count == ctorParameterCount, bindingFlags);
 								reflectionContext.RecordHandledPattern ();
 							} else {
 								// Otherwise fall back to the bitfield requirements
@@ -1414,7 +1410,7 @@ namespace Mono.Linker.Dataflow
 								continue;
 							}
 
-							MarkConstructorsOnType (ref reflectionContext, resolvedType, parameterlessConstructor ? m => m.Parameters.Count == 0 : (Func<MethodDefinition, bool>) null, bindingFlags);
+							MarkConstructorsOnType (ref reflectionContext, resolvedType, parameterlessConstructor ? m => m.Parameters.Count == 0 : null, bindingFlags);
 						} else {
 							reflectionContext.RecordUnrecognizedPattern (2032, $"Unrecognized value passed to the parameter '{calledMethod.Parameters[1].Name}' of method '{calledMethod.GetDisplayName ()}'. It's not possible to guarantee the availability of the target type.");
 						}
diff --git a/src/linker/Linker.Steps/MarkStep.cs b/src/linker/Linker.Steps/MarkStep.cs
index cc32af906..6d0ba0279 100644
--- a/src/linker/Linker.Steps/MarkStep.cs
+++ b/src/linker/Linker.Steps/MarkStep.cs
@@ -1504,8 +1504,7 @@ namespace Mono.Linker.Steps
 
 			var parent = field.DeclaringType;
 			if (!Annotations.HasPreservedStaticCtor (parent)) {
-				var cctorReason = reason.Kind switch
-				{
+				var cctorReason = reason.Kind switch {
 					// Report an edge directly from the method accessing the field to the static ctor it triggers
 					DependencyKind.FieldAccess => new DependencyInfo (DependencyKind.TriggersCctorThroughFieldAccess, reason.Source),
 					_ => new DependencyInfo (DependencyKind.CctorForField, field)
@@ -3142,8 +3141,7 @@ namespace Mono.Linker.Steps
 				break;
 
 			case OperandType.InlineMethod: {
-					DependencyKind dependencyKind = instruction.OpCode.Code switch
-					{
+					DependencyKind dependencyKind = instruction.OpCode.Code switch {
 						Code.Jmp => DependencyKind.DirectCall,
 						Code.Call => DependencyKind.DirectCall,
 						Code.Callvirt => DependencyKind.VirtualCall,
diff --git a/src/linker/Linker.Steps/SweepStep.cs b/src/linker/Linker.Steps/SweepStep.cs
index cf25b20db..209e8c17b 100644
--- a/src/linker/Linker.Steps/SweepStep.cs
+++ b/src/linker/Linker.Steps/SweepStep.cs
@@ -402,8 +402,7 @@ namespace Mono.Linker.Steps
 				return false;
 
 			if (definition.Namespace == "System.Security") {
-				return definition.FullName switch
-				{
+				return definition.FullName switch {
 					// This seems to be one attribute in the System.Security namespace that doesn't count
 					// as an attribute that requires HasSecurity to be true
 					"System.Security.SecurityCriticalAttribute" => false,
diff --git a/src/linker/Linker/CustomAttributeSource.cs b/src/linker/Linker/CustomAttributeSource.cs
index 06dab04f6..d0fc3f633 100644
--- a/src/linker/Linker/CustomAttributeSource.cs
+++ b/src/linker/Linker/CustomAttributeSource.cs
@@ -23,8 +23,7 @@ namespace Mono.Linker
 
 		public static AssemblyDefinition GetAssemblyFromCustomAttributeProvider (ICustomAttributeProvider provider)
 		{
-			return provider switch
-			{
+			return provider switch {
 				MemberReference mr => mr.Module.Assembly,
 				AssemblyDefinition ad => ad,
 				ModuleDefinition md => md.Assembly,
diff --git a/src/linker/Linker/DynamicDependency.cs b/src/linker/Linker/DynamicDependency.cs
index 33ef0b8ba..8b9549777 100644
--- a/src/linker/Linker/DynamicDependency.cs
+++ b/src/linker/Linker/DynamicDependency.cs
@@ -86,17 +86,14 @@ namespace Mono.Linker
 			if (args.Count < 1 || args.Count > 3)
 				return null;
 
-			DynamicDependency? result = args[0].Value switch
-			{
-				string stringMemberSignature => args.Count switch
-				{
+			DynamicDependency? result = args[0].Value switch {
+				string stringMemberSignature => args.Count switch {
 					1 => new DynamicDependency (stringMemberSignature),
 					2 when args[1].Value is TypeReference type => new DynamicDependency (stringMemberSignature, type),
 					3 when args[1].Value is string typeName && args[2].Value is string assemblyName => new DynamicDependency (stringMemberSignature, typeName, assemblyName),
 					_ => null,
 				},
-				int memberTypes => args.Count switch
-				{
+				int memberTypes => args.Count switch {
 					2 when args[1].Value is TypeReference type => new DynamicDependency ((DynamicallyAccessedMemberTypes) memberTypes, type),
 					3 when args[1].Value is string typeName && args[2].Value is string assemblyName => new DynamicDependency ((DynamicallyAccessedMemberTypes) memberTypes, typeName, assemblyName),
 					_ => null,
diff --git a/src/linker/Linker/LinkContext.cs b/src/linker/Linker/LinkContext.cs
index 52931311b..b9f805a0a 100644
--- a/src/linker/Linker/LinkContext.cs
+++ b/src/linker/Linker/LinkContext.cs
@@ -642,8 +642,7 @@ namespace Mono.Linker
 				return _targetRuntime.Value;
 
 			TypeDefinition objectType = BCL.FindPredefinedType ("System", "Object", this);
-			_targetRuntime = objectType?.Module.Assembly.Name.Version.Major switch
-			{
+			_targetRuntime = objectType?.Module.Assembly.Name.Version.Major switch {
 				6 => TargetRuntimeVersion.NET6,
 				5 => TargetRuntimeVersion.NET5,
 				_ => TargetRuntimeVersion.Unknown,
diff --git a/src/linker/Linker/TypeNameResolver.cs b/src/linker/Linker/TypeNameResolver.cs
index e0965197e..3eaa5556b 100644
--- a/src/linker/Linker/TypeNameResolver.cs
+++ b/src/linker/Linker/TypeNameResolver.cs
@@ -77,8 +77,7 @@ namespace Mono.Linker
 				if (elementType == null)
 					return null;
 
-				return typeName switch
-				{
+				return typeName switch {
 					ArrayTypeName _ => new ArrayType (elementType),
 					MultiDimArrayTypeName multiDimArrayTypeName => new ArrayType (elementType, multiDimArrayTypeName.Rank),
 					ByRefTypeName _ => new ByReferenceType (elementType),
diff --git a/src/linker/Linker/TypeReferenceExtensions.cs b/src/linker/Linker/TypeReferenceExtensions.cs
index 777c1cd21..d35139680 100644
--- a/src/linker/Linker/TypeReferenceExtensions.cs
+++ b/src/linker/Linker/TypeReferenceExtensions.cs
@@ -381,8 +381,7 @@ namespace Mono.Linker
 		// element type should be marked.
 		public static TypeDefinition ResolveToMainTypeDefinition (this TypeReference type)
 		{
-			return type switch
-			{
+			return type switch {
 				ArrayType _ => type.Module.ImportReference (typeof (Array))?.Resolve (),
 				_ => type?.Resolve ()
 			};
diff --git a/test/ILLink.RoslynAnalyzer.Tests/Verifiers/CSharpAnalyzerVerifier`1.cs b/test/ILLink.RoslynAnalyzer.Tests/Verifiers/CSharpAnalyzerVerifier`1.cs
index 4d96f37d8..0b8346fcb 100644
--- a/test/ILLink.RoslynAnalyzer.Tests/Verifiers/CSharpAnalyzerVerifier`1.cs
+++ b/test/ILLink.RoslynAnalyzer.Tests/Verifiers/CSharpAnalyzerVerifier`1.cs
@@ -244,8 +244,7 @@ namespace ILLink.RoslynAnalyzer.Tests
 					}
 				} else {
 					builder.Append (
-						diagnostics[i].Severity switch
-						{
+						diagnostics[i].Severity switch {
 							DiagnosticSeverity.Error => $"{nameof (DiagnosticResult)}.{nameof (DiagnosticResult.CompilerError)}(\"{diagnostics[i].Id}\")",
 							DiagnosticSeverity.Warning => $"{nameof (DiagnosticResult)}.{nameof (DiagnosticResult.CompilerWarning)}(\"{diagnostics[i].Id}\")",
 							var severity => $"new {nameof (DiagnosticResult)}(\"{diagnostics[i].Id}\", {nameof (DiagnosticSeverity)}.{severity})",
@@ -320,8 +319,7 @@ namespace ILLink.RoslynAnalyzer.Tests
 					}
 				} else {
 					builder.Append (
-						diagnostics[i].Severity switch
-						{
+						diagnostics[i].Severity switch {
 							DiagnosticSeverity.Error => $"{nameof (DiagnosticResult)}.{nameof (DiagnosticResult.CompilerError)}(\"{diagnostics[i].Id}\")",
 							DiagnosticSeverity.Warning => $"{nameof (DiagnosticResult)}.{nameof (DiagnosticResult.CompilerWarning)}(\"{diagnostics[i].Id}\")",
 							var severity => $"new {nameof (DiagnosticResult)}(\"{diagnostics[i].Id}\", {nameof (DiagnosticSeverity)}.{severity})",
diff --git a/test/Mono.Linker.Tests.Cases/DataFlow/GetNestedTypeOnAllAnnotatedType.cs b/test/Mono.Linker.Tests.Cases/DataFlow/GetNestedTypeOnAllAnnotatedType.cs
index 6cd6d5dc5..2d41517ba 100644
--- a/test/Mono.Linker.Tests.Cases/DataFlow/GetNestedTypeOnAllAnnotatedType.cs
+++ b/test/Mono.Linker.Tests.Cases/DataFlow/GetNestedTypeOnAllAnnotatedType.cs
@@ -90,8 +90,7 @@ namespace Mono.Linker.Tests.Cases.DataFlow
 		[RecognizedReflectionAccessPattern]
 		static void TestSwitchAllValid (int number, [DynamicallyAccessedMembers (DynamicallyAccessedMemberTypes.All)] Type parentWithAll)
 		{
-			Type typeOfParent = number switch
-			{
+			Type typeOfParent = number switch {
 				1 => parentWithAll,
 				2 => null,
 				3 => typeof (GetNestedTypeOnAllAnnotatedType)
diff --git a/test/Mono.Linker.Tests/Extensions/NiceIO.cs b/test/Mono.Linker.Tests/Extensions/NiceIO.cs
index 8b61f67c0..8cbf9c5a5 100644
--- a/test/Mono.Linker.Tests/Extensions/NiceIO.cs
+++ b/test/Mono.Linker.Tests/Extensions/NiceIO.cs
@@ -293,8 +293,7 @@ namespace Mono.Linker.Tests.Extensions
 
 		static char Slash (SlashMode slashMode)
 		{
-			return slashMode switch
-			{
+			return slashMode switch {
 				SlashMode.Backward => '\\',
 				SlashMode.Forward => '/',
 				_ => Path.DirectorySeparatorChar,