From a200cf5545c8338351b5d7f0c2637434768ec61e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 18 Dec 2025 19:11:34 +0000
Subject: [PATCH 1/2] Initial plan
From f5ab1edcc9fa298fd39a0b1cc3ec3d0bff4e160e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 18 Dec 2025 19:16:32 +0000
Subject: [PATCH 2/2] Replace Microsoft.Extensions.CommandLineUtils with
McMaster.Extensions.CommandLineUtils
Co-authored-by: haileymck <111816896+haileymck@users.noreply.github.com>
---
Directory.Packages.props | 2 +-
eng/Versions.props | 4 ++--
src/Scaffolding/VS.Web.CG.Core/ActionInvoker.cs | 2 +-
src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs | 2 +-
src/Scaffolding/VS.Web.CG.Core/VS.Web.CG.Core.csproj | 2 +-
src/Scaffolding/VS.Web.CG.Design/Program.cs | 2 +-
src/Scaffolding/VS.Web.CG.Design/Shared.props | 2 +-
src/Scaffolding/VS.Web.CG/VS.Web.CG.csproj | 2 +-
src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs | 2 +-
.../dotnet-aspnet-codegenerator.csproj | 2 +-
.../VS.Web.CG.Core.Test/ParameterDescriptorTests.cs | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4c5a296c52..3dcfc7aa4f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -25,7 +25,7 @@
-
+
diff --git a/eng/Versions.props b/eng/Versions.props
index f8db48134a..cda101f250 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -89,8 +89,8 @@
6.0.24
$(MicrosoftCodeAnalysisVersion)
-
- 6.0.0-preview.3.21166.3
+
+ 4.1.1
13.0.3
6.12.1
2.14.1
diff --git a/src/Scaffolding/VS.Web.CG.Core/ActionInvoker.cs b/src/Scaffolding/VS.Web.CG.Core/ActionInvoker.cs
index 9d580e0849..d69eb87dab 100644
--- a/src/Scaffolding/VS.Web.CG.Core/ActionInvoker.cs
+++ b/src/Scaffolding/VS.Web.CG.Core/ActionInvoker.cs
@@ -4,7 +4,7 @@
using System;
using System.Reflection;
using System.Threading.Tasks;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
using Microsoft.VisualStudio.Web.CodeGeneration.Core;
namespace Microsoft.VisualStudio.Web.CodeGeneration
diff --git a/src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs b/src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs
index 99408e405b..0d46452850 100644
--- a/src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs
+++ b/src/Scaffolding/VS.Web.CG.Core/ParameterDescriptor.cs
@@ -4,7 +4,7 @@
using System;
using System.Diagnostics;
using System.Reflection;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
using Microsoft.VisualStudio.Web.CodeGeneration.CommandLine;
namespace Microsoft.VisualStudio.Web.CodeGeneration
diff --git a/src/Scaffolding/VS.Web.CG.Core/VS.Web.CG.Core.csproj b/src/Scaffolding/VS.Web.CG.Core/VS.Web.CG.Core.csproj
index 24c249cc21..dd821d3d9f 100644
--- a/src/Scaffolding/VS.Web.CG.Core/VS.Web.CG.Core.csproj
+++ b/src/Scaffolding/VS.Web.CG.Core/VS.Web.CG.Core.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/src/Scaffolding/VS.Web.CG.Design/Program.cs b/src/Scaffolding/VS.Web.CG.Design/Program.cs
index 0297b7ab8b..503b2641f0 100644
--- a/src/Scaffolding/VS.Web.CG.Design/Program.cs
+++ b/src/Scaffolding/VS.Web.CG.Design/Program.cs
@@ -6,7 +6,7 @@
using System.Linq;
using Microsoft.DotNet.Scaffolding.Shared;
using Microsoft.DotNet.Scaffolding.Shared.ProjectModel;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
namespace Microsoft.VisualStudio.Web.CodeGeneration.Design
{
diff --git a/src/Scaffolding/VS.Web.CG.Design/Shared.props b/src/Scaffolding/VS.Web.CG.Design/Shared.props
index fe9934eb86..f2b2d46e08 100644
--- a/src/Scaffolding/VS.Web.CG.Design/Shared.props
+++ b/src/Scaffolding/VS.Web.CG.Design/Shared.props
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Scaffolding/VS.Web.CG/VS.Web.CG.csproj b/src/Scaffolding/VS.Web.CG/VS.Web.CG.csproj
index 00ae675b2c..46cd9403cc 100644
--- a/src/Scaffolding/VS.Web.CG/VS.Web.CG.csproj
+++ b/src/Scaffolding/VS.Web.CG/VS.Web.CG.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs b/src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs
index dd5a7bae2d..c3569e784d 100644
--- a/src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs
+++ b/src/Scaffolding/dotnet-aspnet-codegenerator/ScaffoldingApp.cs
@@ -8,7 +8,7 @@
using System.Linq;
using System.Text;
using Microsoft.DotNet.Scaffolding.Shared.ProjectModel;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
using Newtonsoft.Json;
namespace Microsoft.VisualStudio.Web.CodeGeneration.Tools
diff --git a/src/Scaffolding/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj b/src/Scaffolding/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj
index 7a28e410d4..f2b9ca9b8a 100644
--- a/src/Scaffolding/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj
+++ b/src/Scaffolding/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj
@@ -28,7 +28,7 @@
-
+
diff --git a/test/Scaffolding/VS.Web.CG.Core.Test/ParameterDescriptorTests.cs b/test/Scaffolding/VS.Web.CG.Core.Test/ParameterDescriptorTests.cs
index ff6b837279..41056e6e40 100644
--- a/test/Scaffolding/VS.Web.CG.Core.Test/ParameterDescriptorTests.cs
+++ b/test/Scaffolding/VS.Web.CG.Core.Test/ParameterDescriptorTests.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Linq;
-using Microsoft.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils;
using Microsoft.VisualStudio.Web.CodeGeneration.CommandLine;
using Xunit;