Merge pull request #8698 from dotnet/darc-main-bebb6d9a-f111-4f8f-979a-09f35ead07ba

MiYanni · web-flow · commit eeb882f03210 · 2025-02-03T14:56:09.000-08:00
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -19,14 +19,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25074.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25080.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e89f8b1239360cafca490aa3bfee89e84df72186</Sha>
+      <Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25074.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25080.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e89f8b1239360cafca490aa3bfee89e84df72186</Sha>
+      <Sha>bbea86c614fcf4380c58c80eacd279a0b8305a79</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <!-- Dependencies required for source build. We'll still update manually -->
diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh
@@ -24,13 +24,13 @@ case "$os" in
             apt update
 
             apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
-                libssl-dev libkrb5-dev zlib1g-dev pigz cpio
+                libssl-dev libkrb5-dev pigz cpio
 
             localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
         elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ]; then
-            dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
+            dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio
         elif [ "$ID" = "alpine" ]; then
-            apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
+            apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio
         else
             echo "Unsupported distro. distro: $ID"
             exit 1
diff --git a/global.json b/global.json
@@ -1,8 +1,8 @@
 {
   "tools": {
-    "dotnet": "10.0.100-alpha.1.25064.3"
+    "dotnet": "10.0.100-alpha.1.25077.2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25074.4"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7"
   }
 }
diff --git a/src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NuGetManagedTemplatePackage.cs b/src/Microsoft.TemplateEngine.Edge/Installers/NuGet/NuGetManagedTemplatePackage.cs
@@ -113,19 +113,19 @@ public DateTime LastChangeTime
         public string? Reserved
         {
             get => Details.TryGetValue(ReservedKey, out string reserved) ? reserved : false.ToString();
-            set => UpdateOrRemoveValue(Details, ReservedKey, value, (string entry) => !string.IsNullOrEmpty(entry));
+            set => UpdateOrRemoveValue(Details, ReservedKey, value, (entry) => !string.IsNullOrEmpty(entry));
         }
 
         public string? Author
         {
             get => Details.TryGetValue(AuthorKey, out string author) ? author : null;
-            set => UpdateOrRemoveValue(Details, AuthorKey, value, (string entry) => !string.IsNullOrEmpty(entry));
+            set => UpdateOrRemoveValue(Details, AuthorKey, value, (entry) => !string.IsNullOrEmpty(entry));
         }
 
         public string? Owners
         {
             get => Details.TryGetValue(OwnersKey, out string owners) ? owners : null;
-            set => UpdateOrRemoveValue(Details, OwnersKey, value, (string entry) => !string.IsNullOrEmpty(entry));
+            set => UpdateOrRemoveValue(Details, OwnersKey, value, (entry) => !string.IsNullOrEmpty(entry));
         }
 
         public bool IsLocalPackage
@@ -138,19 +138,19 @@ public bool IsLocalPackage
                 }
                 return false;
             }
-            set => UpdateOrRemoveValue(Details, LocalPackageKey, value.ToString(), (string value) => value == true.ToString());
+            set => UpdateOrRemoveValue(Details, LocalPackageKey, value.ToString(), (value) => value == true.ToString());
         }
 
         public string? NuGetSource
         {
             get => Details.TryGetValue(NuGetSourceKey, out string nugetSource) ? nugetSource : null;
-            set => UpdateOrRemoveValue(Details, NuGetSourceKey, value, (string entry) => !string.IsNullOrEmpty(entry));
+            set => UpdateOrRemoveValue(Details, NuGetSourceKey, value, (entry) => !string.IsNullOrEmpty(entry));
         }
 
         public string? Version
         {
             get => Details.TryGetValue(PackageVersionKey, out string version) ? version : null;
-            set => UpdateOrRemoveValue(Details, PackageVersionKey, value, (string entry) => !string.IsNullOrEmpty(entry));
+            set => UpdateOrRemoveValue(Details, PackageVersionKey, value, (entry) => !string.IsNullOrEmpty(entry));
         }
 
         internal Dictionary<string, string> Details { get; }
@@ -169,10 +169,10 @@ public IReadOnlyDictionary<string, string> GetDetails()
         {
             var details = new Dictionary<string, string>();
 
-            details.TryAdd(AuthorKey, Author ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
-            details.TryAdd(OwnersKey, Owners ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
-            details.TryAdd(ReservedKey, Reserved ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
-            details.TryAdd(NuGetSourceKey, NuGetSource ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));
+            details.TryAdd(AuthorKey, Author ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
+            details.TryAdd(OwnersKey, Owners ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
+            details.TryAdd(ReservedKey, Reserved ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
+            details.TryAdd(NuGetSourceKey, NuGetSource ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));
 
             return details;
         }
diff --git a/src/Microsoft.TemplateEngine.Edge/Settings/TemplatePackageManager.cs b/src/Microsoft.TemplateEngine.Edge/Settings/TemplatePackageManager.cs
@@ -342,7 +342,7 @@ private async Task<TemplateCache> UpdateTemplateCacheAsync(bool needsRebuild, Ca
             }
 
             var scanResults = new ScanResult?[allTemplatePackages.Count];
-            Parallel.For(0, allTemplatePackages.Count, async (int index) =>
+            Parallel.For(0, allTemplatePackages.Count, async (index) =>
             {
                 try
                 {
diff --git a/src/Microsoft.TemplateEngine.Edge/ValidationUtils.cs b/src/Microsoft.TemplateEngine.Edge/ValidationUtils.cs
@@ -112,10 +112,10 @@ private static void LogValidationEntries(ILogger logger, string header, IReadOnl
         {
             Action<string> log = severity switch
             {
-                IValidationEntry.SeverityLevel.None => (string s) => throw new NotSupportedException($"{IValidationEntry.SeverityLevel.None} severity is not supported."),
-                IValidationEntry.SeverityLevel.Info => (string s) => logger.LogDebug(s),
-                IValidationEntry.SeverityLevel.Warning => (string s) => logger.LogWarning(s),
-                IValidationEntry.SeverityLevel.Error => (string s) => logger.LogError(s),
+                IValidationEntry.SeverityLevel.None => (s) => throw new NotSupportedException($"{IValidationEntry.SeverityLevel.None} severity is not supported."),
+                IValidationEntry.SeverityLevel.Info => (s) => logger.LogDebug(s),
+                IValidationEntry.SeverityLevel.Warning => (s) => logger.LogWarning(s),
+                IValidationEntry.SeverityLevel.Error => (s) => logger.LogError(s),
                 _ => throw new InvalidOperationException($"{severity} is not expected value for {nameof(IValidationEntry.SeverityLevel)}."),
             };
 
diff --git a/test/Microsoft.TemplateEngine.Core.UnitTests/ChunkStreamReadTests.cs b/test/Microsoft.TemplateEngine.Core.UnitTests/ChunkStreamReadTests.cs
@@ -124,7 +124,7 @@ public void VerifyConsumeWholeLine()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.ConsumeWholeLine(ref length, ref position);
                     return 0;
diff --git a/test/Microsoft.TemplateEngine.Core.UnitTests/CommonOperationsTests.cs b/test/Microsoft.TemplateEngine.Core.UnitTests/CommonOperationsTests.cs
@@ -25,7 +25,7 @@ public void VerifyTrimWhitespaceForward()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.TrimWhitespace(true, false, ref length, ref position);
                     return 0;
@@ -50,7 +50,7 @@ public void VerifyTrimWhitespaceBackward()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.TrimWhitespace(false, true, ref length, ref position);
                     return 0;
@@ -75,7 +75,7 @@ public void VerifyTrimWhitespaceBothDirections()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.TrimWhitespace(true, true, ref length, ref position);
                     return 0;
@@ -100,7 +100,7 @@ public void VerifyTrimWhitespaceNeitherDirection()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.TrimWhitespace(false, false, ref length, ref position);
                     return 0;
@@ -125,7 +125,7 @@ public void VerifyConsumeWholeLine()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.ConsumeWholeLine(ref length, ref position);
                     return 0;
@@ -158,7 +158,7 @@ public void VerifyWhitespaceHandlerConsumeWholeLine(bool trim, bool trimForward,
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.WhitespaceHandler(ref length, ref position, true, trim, trimForward, trimBackward);
                     return 0;
@@ -187,7 +187,7 @@ public void VerifyWhitespaceHandlerTrim(bool trimForward, bool trimBackward)
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.WhitespaceHandler(ref length, ref position, false, true, trimForward, trimBackward);
                     return 0;
@@ -213,7 +213,7 @@ public void VerifyWhitespaceHandlerTrimForwardButNotBack()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.WhitespaceHandler(ref length, ref position, false, false, true, false);
                     return 0;
@@ -238,7 +238,7 @@ public void VerifyWhitespaceHandlerTrimBackButNotForward()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.WhitespaceHandler(ref length, ref position, false, false, false, true);
                     return 0;
@@ -263,7 +263,7 @@ public void VerifyWhitespaceHandlerTrimBackAndForward()
         {
             MockOperation o = new MockOperation(
                 null,
-                (IProcessorState state, int length, ref int position, int token) =>
+                (state, length, ref position, token) =>
                 {
                     state.WhitespaceHandler(ref length, ref position, false, false, true, true);
                     return 0;
diff --git a/test/Microsoft.TemplateEngine.Core.UnitTests/TrieTests.cs b/test/Microsoft.TemplateEngine.Core.UnitTests/TrieTests.cs
@@ -29,7 +29,7 @@ public void VerifyThatTrieMatchesAtTheBeginning()
                     new MockOperationProvider(
                         new MockOperation(
                             null,
-                            (IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
+                            (processor, bufferLength, ref currentBufferPosition, token) =>
                             {
                                 testActivated = true;
                                 return 0;
@@ -58,7 +58,7 @@ public void VerifyThatTrieMatchesAtTheEnd()
                     new MockOperationProvider(
                         new MockOperation(
                             null,
-                            (IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
+                            (processor, bufferLength, ref currentBufferPosition, token) =>
                             {
                                 testActivated = true;
                                 return 0;
@@ -83,7 +83,7 @@ public void VerifyThatTrieMatchesInTheInterior()
                     new MockOperationProvider(
                         new MockOperation(
                             null,
-                            (IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
+                            (processor, bufferLength, ref currentBufferPosition, token) =>
                             {
                                 testActivated = true;
                                 return 0;
@@ -108,7 +108,7 @@ public void VerifyThatTrieMatchesAsTheWholeContents()
                     new MockOperationProvider(
                         new MockOperation(
                             null,
-                            (IProcessorState processor, int bufferLength, ref int currentBufferPosition, int token) =>
+                            (processor, bufferLength, ref currentBufferPosition, token) =>
                             {
                                 testActivated = true;
                                 return 0;
diff --git a/tools/Microsoft.TemplateSearch.TemplateDiscovery/TemplateDiscoveryCommand.cs b/tools/Microsoft.TemplateSearch.TemplateDiscovery/TemplateDiscoveryCommand.cs
@@ -104,7 +104,7 @@ public TemplateDiscoveryCommand() : base("template-discovery", "Generates the te
             Options.Add(_diffOverrideNonPackagesOption);
 
             TreatUnmatchedTokensAsErrors = true;
-            SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>
+            SetAction(async (parseResult, cancellationToken) =>
             {
                 var config = new CommandArgs(parseResult.GetValue(_basePathOption) ?? throw new Exception("Output path is not set"))
                 {

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"tools": {`
`3`		`- "dotnet": "10.0.100-alpha.1.25064.3"`
	`3`	`+ "dotnet": "10.0.100-alpha.1.25077.2"`
`4`	`4`	`},`
`5`	`5`	`"msbuild-sdks": {`
`6`		`- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25074.4"`
	`6`	`+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25080.7"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,19 +113,19 @@ public DateTime LastChangeTime`
`113`	`113`	`public string? Reserved`
`114`	`114`	`{`
`115`	`115`	`get => Details.TryGetValue(ReservedKey, out string reserved) ? reserved : false.ToString();`
`116`		`- set => UpdateOrRemoveValue(Details, ReservedKey, value, (string entry) => !string.IsNullOrEmpty(entry));`
	`116`	`+ set => UpdateOrRemoveValue(Details, ReservedKey, value, (entry) => !string.IsNullOrEmpty(entry));`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public string? Author`
`120`	`120`	`{`
`121`	`121`	`get => Details.TryGetValue(AuthorKey, out string author) ? author : null;`
`122`		`- set => UpdateOrRemoveValue(Details, AuthorKey, value, (string entry) => !string.IsNullOrEmpty(entry));`
	`122`	`+ set => UpdateOrRemoveValue(Details, AuthorKey, value, (entry) => !string.IsNullOrEmpty(entry));`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`public string? Owners`
`126`	`126`	`{`
`127`	`127`	`get => Details.TryGetValue(OwnersKey, out string owners) ? owners : null;`
`128`		`- set => UpdateOrRemoveValue(Details, OwnersKey, value, (string entry) => !string.IsNullOrEmpty(entry));`
	`128`	`+ set => UpdateOrRemoveValue(Details, OwnersKey, value, (entry) => !string.IsNullOrEmpty(entry));`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`public bool IsLocalPackage`
`@@ -138,19 +138,19 @@ public bool IsLocalPackage`
`138`	`138`	`}`
`139`	`139`	`return false;`
`140`	`140`	`}`
`141`		`- set => UpdateOrRemoveValue(Details, LocalPackageKey, value.ToString(), (string value) => value == true.ToString());`
	`141`	`+ set => UpdateOrRemoveValue(Details, LocalPackageKey, value.ToString(), (value) => value == true.ToString());`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`public string? NuGetSource`
`145`	`145`	`{`
`146`	`146`	`get => Details.TryGetValue(NuGetSourceKey, out string nugetSource) ? nugetSource : null;`
`147`		`- set => UpdateOrRemoveValue(Details, NuGetSourceKey, value, (string entry) => !string.IsNullOrEmpty(entry));`
	`147`	`+ set => UpdateOrRemoveValue(Details, NuGetSourceKey, value, (entry) => !string.IsNullOrEmpty(entry));`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`public string? Version`
`151`	`151`	`{`
`152`	`152`	`get => Details.TryGetValue(PackageVersionKey, out string version) ? version : null;`
`153`		`- set => UpdateOrRemoveValue(Details, PackageVersionKey, value, (string entry) => !string.IsNullOrEmpty(entry));`
	`153`	`+ set => UpdateOrRemoveValue(Details, PackageVersionKey, value, (entry) => !string.IsNullOrEmpty(entry));`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`internal Dictionary<string, string> Details { get; }`
`@@ -169,10 +169,10 @@ public IReadOnlyDictionary<string, string> GetDetails()`
`169`	`169`	`{`
`170`	`170`	`var details = new Dictionary<string, string>();`
`171`	`171`
`172`		`- details.TryAdd(AuthorKey, Author ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));`
`173`		`- details.TryAdd(OwnersKey, Owners ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));`
`174`		`- details.TryAdd(ReservedKey, Reserved ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));`
`175`		`- details.TryAdd(NuGetSourceKey, NuGetSource ?? string.Empty, (string entry) => !string.IsNullOrEmpty(entry));`
	`172`	`+ details.TryAdd(AuthorKey, Author ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));`
	`173`	`+ details.TryAdd(OwnersKey, Owners ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));`
	`174`	`+ details.TryAdd(ReservedKey, Reserved ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));`
	`175`	`+ details.TryAdd(NuGetSourceKey, NuGetSource ?? string.Empty, (entry) => !string.IsNullOrEmpty(entry));`
`176`	`176`
`177`	`177`	`return details;`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ private async Task<TemplateCache> UpdateTemplateCacheAsync(bool needsRebuild, Ca`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`var scanResults = new ScanResult?[allTemplatePackages.Count];`
`345`		`- Parallel.For(0, allTemplatePackages.Count, async (int index) =>`
	`345`	`+ Parallel.For(0, allTemplatePackages.Count, async (index) =>`
`346`	`346`	`{`
`347`	`347`	`try`
`348`	`348`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,10 +112,10 @@ private static void LogValidationEntries(ILogger logger, string header, IReadOnl`
`112`	`112`	`{`
`113`	`113`	`Action<string> log = severity switch`
`114`	`114`	`{`
`115`		`- IValidationEntry.SeverityLevel.None => (string s) => throw new NotSupportedException($"{IValidationEntry.SeverityLevel.None} severity is not supported."),`
`116`		`- IValidationEntry.SeverityLevel.Info => (string s) => logger.LogDebug(s),`
`117`		`- IValidationEntry.SeverityLevel.Warning => (string s) => logger.LogWarning(s),`
`118`		`- IValidationEntry.SeverityLevel.Error => (string s) => logger.LogError(s),`
	`115`	`+ IValidationEntry.SeverityLevel.None => (s) => throw new NotSupportedException($"{IValidationEntry.SeverityLevel.None} severity is not supported."),`
	`116`	`+ IValidationEntry.SeverityLevel.Info => (s) => logger.LogDebug(s),`
	`117`	`+ IValidationEntry.SeverityLevel.Warning => (s) => logger.LogWarning(s),`
	`118`	`+ IValidationEntry.SeverityLevel.Error => (s) => logger.LogError(s),`
`119`	`119`	`_ => throw new InvalidOperationException($"{severity} is not expected value for {nameof(IValidationEntry.SeverityLevel)}."),`
`120`	`120`	`};`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public void VerifyConsumeWholeLine()`
`124`	`124`	`{`
`125`	`125`	`MockOperation o = new MockOperation(`
`126`	`126`	`null,`
`127`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`127`	`+ (state, length, ref position, token) =>`
`128`	`128`	`{`
`129`	`129`	`state.ConsumeWholeLine(ref length, ref position);`
`130`	`130`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void VerifyTrimWhitespaceForward()`
`25`	`25`	`{`
`26`	`26`	`MockOperation o = new MockOperation(`
`27`	`27`	`null,`
`28`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`28`	`+ (state, length, ref position, token) =>`
`29`	`29`	`{`
`30`	`30`	`state.TrimWhitespace(true, false, ref length, ref position);`
`31`	`31`	`return 0;`
`@@ -50,7 +50,7 @@ public void VerifyTrimWhitespaceBackward()`
`50`	`50`	`{`
`51`	`51`	`MockOperation o = new MockOperation(`
`52`	`52`	`null,`
`53`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`53`	`+ (state, length, ref position, token) =>`
`54`	`54`	`{`
`55`	`55`	`state.TrimWhitespace(false, true, ref length, ref position);`
`56`	`56`	`return 0;`
`@@ -75,7 +75,7 @@ public void VerifyTrimWhitespaceBothDirections()`
`75`	`75`	`{`
`76`	`76`	`MockOperation o = new MockOperation(`
`77`	`77`	`null,`
`78`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`78`	`+ (state, length, ref position, token) =>`
`79`	`79`	`{`
`80`	`80`	`state.TrimWhitespace(true, true, ref length, ref position);`
`81`	`81`	`return 0;`
`@@ -100,7 +100,7 @@ public void VerifyTrimWhitespaceNeitherDirection()`
`100`	`100`	`{`
`101`	`101`	`MockOperation o = new MockOperation(`
`102`	`102`	`null,`
`103`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`103`	`+ (state, length, ref position, token) =>`
`104`	`104`	`{`
`105`	`105`	`state.TrimWhitespace(false, false, ref length, ref position);`
`106`	`106`	`return 0;`
`@@ -125,7 +125,7 @@ public void VerifyConsumeWholeLine()`
`125`	`125`	`{`
`126`	`126`	`MockOperation o = new MockOperation(`
`127`	`127`	`null,`
`128`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`128`	`+ (state, length, ref position, token) =>`
`129`	`129`	`{`
`130`	`130`	`state.ConsumeWholeLine(ref length, ref position);`
`131`	`131`	`return 0;`
`@@ -158,7 +158,7 @@ public void VerifyWhitespaceHandlerConsumeWholeLine(bool trim, bool trimForward,`
`158`	`158`	`{`
`159`	`159`	`MockOperation o = new MockOperation(`
`160`	`160`	`null,`
`161`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`161`	`+ (state, length, ref position, token) =>`
`162`	`162`	`{`
`163`	`163`	`state.WhitespaceHandler(ref length, ref position, true, trim, trimForward, trimBackward);`
`164`	`164`	`return 0;`
`@@ -187,7 +187,7 @@ public void VerifyWhitespaceHandlerTrim(bool trimForward, bool trimBackward)`
`187`	`187`	`{`
`188`	`188`	`MockOperation o = new MockOperation(`
`189`	`189`	`null,`
`190`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`190`	`+ (state, length, ref position, token) =>`
`191`	`191`	`{`
`192`	`192`	`state.WhitespaceHandler(ref length, ref position, false, true, trimForward, trimBackward);`
`193`	`193`	`return 0;`
`@@ -213,7 +213,7 @@ public void VerifyWhitespaceHandlerTrimForwardButNotBack()`
`213`	`213`	`{`
`214`	`214`	`MockOperation o = new MockOperation(`
`215`	`215`	`null,`
`216`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`216`	`+ (state, length, ref position, token) =>`
`217`	`217`	`{`
`218`	`218`	`state.WhitespaceHandler(ref length, ref position, false, false, true, false);`
`219`	`219`	`return 0;`
`@@ -238,7 +238,7 @@ public void VerifyWhitespaceHandlerTrimBackButNotForward()`
`238`	`238`	`{`
`239`	`239`	`MockOperation o = new MockOperation(`
`240`	`240`	`null,`
`241`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`241`	`+ (state, length, ref position, token) =>`
`242`	`242`	`{`
`243`	`243`	`state.WhitespaceHandler(ref length, ref position, false, false, false, true);`
`244`	`244`	`return 0;`
`@@ -263,7 +263,7 @@ public void VerifyWhitespaceHandlerTrimBackAndForward()`
`263`	`263`	`{`
`264`	`264`	`MockOperation o = new MockOperation(`
`265`	`265`	`null,`
`266`		`- (IProcessorState state, int length, ref int position, int token) =>`
	`266`	`+ (state, length, ref position, token) =>`
`267`	`267`	`{`
`268`	`268`	`state.WhitespaceHandler(ref length, ref position, false, false, true, true);`
`269`	`269`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public TemplateDiscoveryCommand() : base("template-discovery", "Generates the te`
`104`	`104`	`Options.Add(_diffOverrideNonPackagesOption);`
`105`	`105`
`106`	`106`	`TreatUnmatchedTokensAsErrors = true;`
`107`		`- SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>`
	`107`	`+ SetAction(async (parseResult, cancellationToken) =>`
`108`	`108`	`{`
`109`	`109`	`var config = new CommandArgs(parseResult.GetValue(_basePathOption) ?? throw new Exception("Output path is not set"))`
`110`	`110`	`{`