fix return type for FirstOrDefault (#8071)

dotnet · Jun 10, 2024 · d829fc2 · d829fc2
1 parent cbe1b52
commit d829fc2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/Microsoft.TemplateEngine.Core/Operations/PhasedOperation.cs b/src/Microsoft.TemplateEngine.Core/Operations/PhasedOperation.cs
@@ -110,7 +110,7 @@ public Implementation(PhasedOperation definition, IReadOnlyList<IToken> config,
             public int HandleMatch(IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token)
             {
                 IReadOnlyList<SpecializedPhase> nextPhases = _currentPhase?.Next ?? _entryPoints;
-                SpecializedPhase match = nextPhases.FirstOrDefault(x => x.Match == token);
+                SpecializedPhase? match = nextPhases.FirstOrDefault(x => x.Match == token);
 
                 if (match != null)
                 {

diff --git a/src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NugetApiPackageManager.cs b/src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NugetApiPackageManager.cs
@@ -332,7 +332,7 @@ internal IEnumerable<PackageSource> RemoveInsecurePackages(IEnumerable<PackageSo
                     continue;
                 }
                 atLeastOneSourceValid = true;
-                NugetPackageMetadata matchedVersion = foundPackages.FirstOrDefault(package => package.Identity.Version == packageVersion);
+                NugetPackageMetadata? matchedVersion = foundPackages.FirstOrDefault(package => package.Identity.Version == packageVersion);
                 if (matchedVersion != null)
                 {
                     _nugetLogger.LogDebug($"{packageIdentifier}::{packageVersion} was found in {foundSource.Source}.");

diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/MacroProcessor.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/MacroProcessor.cs
@@ -103,7 +103,7 @@ private static HashSet<IMacroConfig> GetDependentMacros(IMacroConfig config, IRe
 
             foreach (string dependent in macroWithDep.Dependencies)
             {
-                IMacroConfig macro = allMacroConfigs.FirstOrDefault(mc => mc.VariableName == dependent);
+                IMacroConfig? macro = allMacroConfigs.FirstOrDefault(mc => mc.VariableName == dependent);
                 if (macro != null)
                 {
                     dependents.Add(macro);

diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/RunnableProjectConfig.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/RunnableProjectConfig.cs
@@ -124,7 +124,7 @@ public GlobalRunConfig GlobalOperationConfig
                         if (customGlobModel.ConditionResult)
                         {
                             // only add the special if the condition is true
-                            OperationConfigDefault defaultParams = defaultSpecials.FirstOrDefault(x => x.Glob == customGlobModel.Glob);
+                            OperationConfigDefault? defaultParams = defaultSpecials.FirstOrDefault(x => x.Glob == customGlobModel.Glob);
 
                             defaultParams ??= OperationConfigDefault.Default;
 

diff --git a/test/Microsoft.TemplateEngine.Mocks/MockMountPoint.cs b/test/Microsoft.TemplateEngine.Mocks/MockMountPoint.cs
@@ -31,7 +31,7 @@ public IFileSystemInfo FileSystemInfo(string fullPath)
 
             for (int i = 0; i < parts.Length; ++i)
             {
-                IFileSystemInfo info = current.EnumerateFileSystemInfos(parts[i], SearchOption.TopDirectoryOnly).FirstOrDefault();
+                IFileSystemInfo? info = current.EnumerateFileSystemInfos(parts[i], SearchOption.TopDirectoryOnly).FirstOrDefault();
 
                 if (info == null)
                 {