Update to .net8 sdk (#242)

microsoft · Nov 14, 2023 · 4aa4efd · 4aa4efd
1 parent eb18611
commit 4aa4efd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <!-- Common build settings -->
   <PropertyGroup>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/global.json b/global.json
@@ -1,10 +1,10 @@
 {
   "sdk": {
-    "version": "6.0.401",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.NoTargets": "3.5.6",
-    "Microsoft.Build.Traversal": "3.2.0"
+    "Microsoft.Build.NoTargets": "3.7.0",
+    "Microsoft.Build.Traversal": "4.1.0"
   }
 }
diff --git a/src/Generators/AzureFunctions/SyntaxNodeUtility.cs b/src/Generators/AzureFunctions/SyntaxNodeUtility.cs
@@ -9,9 +9,11 @@ namespace Microsoft.DurableTask.Generators.AzureFunctions
 {
     static class SyntaxNodeUtility
     {
-        public static bool TryGetFunctionName(SemanticModel model, MethodDeclarationSyntax method, out string? functionName)
+        public static bool TryGetFunctionName(
+            SemanticModel model, MethodDeclarationSyntax method, out string? functionName)
         {
-            if (TryGetAttributeByName(method, "Function", out AttributeSyntax? functionNameAttribute) && functionNameAttribute != null)
+            if (TryGetAttributeByName(
+                method, "Function", out AttributeSyntax? functionNameAttribute) && functionNameAttribute != null)
             {
                 if (functionNameAttribute.ArgumentList?.Arguments.Count == 1)
                 {
@@ -42,11 +44,11 @@ public static bool TryGetFunctionKind(MethodDeclarationSyntax method, out Durabl
         {
             SeparatedSyntaxList<ParameterSyntax> parameters = method.ParameterList.Parameters;
 
-            foreach (var parameterSyntax in parameters)
+            foreach (ParameterSyntax parameterSyntax in parameters)
             {
-                IEnumerable<AttributeSyntax> parameterAttributes = parameterSyntax.AttributeLists.SelectMany(a => a.Attributes);
-
-                foreach (var attribute in parameterAttributes)
+                IEnumerable<AttributeSyntax> parameterAttributes = parameterSyntax.AttributeLists
+                    .SelectMany(a => a.Attributes);
+                foreach (AttributeSyntax attribute in parameterAttributes)
                 {
                     if (attribute.ToString().Equals("OrchestrationTrigger", StringComparison.Ordinal))
                     {
@@ -66,13 +68,14 @@ public static bool TryGetFunctionKind(MethodDeclarationSyntax method, out Durabl
             return false;
         }
 
-        public static bool TryGetRequiredNamespaces(List<INamedTypeSymbol> types, out HashSet<string>? requiredNamespaces)
+        public static bool TryGetRequiredNamespaces(
+            List<INamedTypeSymbol> types, out HashSet<string>? requiredNamespaces)
         {
             requiredNamespaces = new HashSet<string>();
 
             var remaining = new Queue<INamedTypeSymbol>(types);
 
-            while (remaining.Any())
+            while (remaining.Count > 0)
             {
                 INamedTypeSymbol typeInfo = remaining.Dequeue();
                 if (typeInfo is null)
@@ -139,7 +142,8 @@ public static bool TryGetParameter(
             return false;
         }
 
-        public static bool TryGetQualifiedTypeName(SemanticModel model, MethodDeclarationSyntax method, out string? fullTypeName)
+        public static bool TryGetQualifiedTypeName(
+            SemanticModel model, MethodDeclarationSyntax method, out string? fullTypeName)
         {
             ISymbol? symbol = model.GetEnclosingSymbol(method.SpanStart);
             if (symbol == null)
@@ -175,7 +179,8 @@ public static string GetRenderedTypeExpression(ITypeSymbol? symbol, bool support
             return expression;
         }
 
-        static bool TryGetAttributeByName(MethodDeclarationSyntax method, string attributeName, out AttributeSyntax? attribute)
+        static bool TryGetAttributeByName(
+            MethodDeclarationSyntax method, string attributeName, out AttributeSyntax? attribute)
         {
             attribute = method.AttributeLists.SelectMany(a => a.Attributes).FirstOrDefault(
                 a => a.Name.NormalizeWhitespace().ToFullString().Equals(attributeName, StringComparison.Ordinal));

diff --git a/src/Worker/Grpc/GrpcOrchestrationRunner.cs b/src/Worker/Grpc/GrpcOrchestrationRunner.cs
@@ -52,11 +52,7 @@ public static string LoadAndRun<TInput, TOutput>(
         Func<TaskOrchestrationContext, TInput?, Task<TOutput?>> orchestratorFunc,
         IServiceProvider? services = null)
     {
-        if (orchestratorFunc == null)
-        {
-            throw new ArgumentNullException(nameof(orchestratorFunc));
-        }
-
+        Check.NotNull(orchestratorFunc);
         return LoadAndRun(encodedOrchestratorRequest, FuncTaskOrchestrator.Create(orchestratorFunc), services);
     }