From 4aa4efdbc9441b6da93f2d3f59ddf8a764011249 Mon Sep 17 00:00:00 2001 From: Jacob Viau Date: Tue, 14 Nov 2023 11:29:53 -0800 Subject: [PATCH] Update to .net8 sdk (#242) --- Directory.Build.props | 2 +- global.json | 6 ++--- .../AzureFunctions/SyntaxNodeUtility.cs | 25 +++++++++++-------- src/Worker/Grpc/GrpcOrchestrationRunner.cs | 6 +---- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2729e728..71460bae 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 10.0 + latest enable enable diff --git a/global.json b/global.json index 832e48b0..4ac08fda 100644 --- 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 index ef66707a..25d98de5 100644 --- 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 parameters = method.ParameterList.Parameters; - foreach (var parameterSyntax in parameters) + foreach (ParameterSyntax parameterSyntax in parameters) { - IEnumerable parameterAttributes = parameterSyntax.AttributeLists.SelectMany(a => a.Attributes); - - foreach (var attribute in parameterAttributes) + IEnumerable 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 types, out HashSet? requiredNamespaces) + public static bool TryGetRequiredNamespaces( + List types, out HashSet? requiredNamespaces) { requiredNamespaces = new HashSet(); var remaining = new Queue(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 index 7f39f0ff..a89cb46f 100644 --- a/src/Worker/Grpc/GrpcOrchestrationRunner.cs +++ b/src/Worker/Grpc/GrpcOrchestrationRunner.cs @@ -52,11 +52,7 @@ public static string LoadAndRun( Func> orchestratorFunc, IServiceProvider? services = null) { - if (orchestratorFunc == null) - { - throw new ArgumentNullException(nameof(orchestratorFunc)); - } - + Check.NotNull(orchestratorFunc); return LoadAndRun(encodedOrchestratorRequest, FuncTaskOrchestrator.Create(orchestratorFunc), services); }