Added common high-use usings as global usings. Removed unused usings in TemplateEngine projects as they cause build errors based on their project settings. Adjusted one class name conflict.

MiYanni · MiYanni · commit aa1aabb276f0 · 2023-07-25T20:58:16.000-07:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -47,5 +47,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <!-- Global usings -->
+  <!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
+  <ItemGroup>
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Text" />
+    <Using Include="System.Xml.Linq" />
+  </ItemGroup>
+
   <Import Project="build/GenerateResxSource.targets" />
 </Project>
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateParameter.cs b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateParameter.cs
@@ -6,7 +6,6 @@
 using System.CommandLine.Parsing;
 using System.Diagnostics;
 using System.Globalization;
-using System.Text;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Cli.Commands;
 
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CliPathInfo.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CliPathInfo.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
 using Microsoft.TemplateEngine.Abstractions;
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CommandLineUtils.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/CommandLineUtils.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.Text;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
 {
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/InvalidTemplateParametersException.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/InvalidTemplateParametersException.cs
@@ -1,8 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
-
 namespace Microsoft.TemplateEngine.Cli.Commands
 {
     internal class InvalidTemplateParametersException : Exception
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.Text;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Edge.Settings;
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InvalidTemplateOptionResult.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InvalidTemplateOptionResult.cs
@@ -3,7 +3,6 @@
 
 using System.CommandLine;
 using System.CommandLine.Parsing;
-using System.Text;
 using Microsoft.TemplateEngine.Abstractions;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/Extensions.cs b/src/Cli/Microsoft.TemplateEngine.Cli/Extensions.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.Constraints;
 using Microsoft.TemplateEngine.Utils;
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/IReporterExtensions.cs b/src/Cli/Microsoft.TemplateEngine.Cli/IReporterExtensions.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
-using System.Text;
 using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.TemplateEngine.Cli
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TabularOutput/TabularOutput.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TabularOutput/TabularOutput.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
-
 namespace Microsoft.TemplateEngine.Cli.TabularOutput
 {
     internal class TabularOutput
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Cli.Commands;
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.TemplatePackage;
diff --git a/src/Cli/dotnet-new3/ArgumentEscaper.cs b/src/Cli/dotnet-new3/ArgumentEscaper.cs
@@ -1,8 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
-
 namespace Dotnet_new3
 {
     internal static class ArgumentEscaper
diff --git a/src/Cli/dotnet-new3/Dotnet.cs b/src/Cli/dotnet-new3/Dotnet.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
-using System.Text;
 
 namespace Dotnet_new3
 {
diff --git a/src/Cli/dotnet-new3/Program.cs b/src/Cli/dotnet-new3/Program.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.Text;
 
 namespace Dotnet_new3
 {
diff --git a/src/Cli/dotnet/Telemetry/Telemetry.cs b/src/Cli/dotnet/Telemetry/Telemetry.cs
@@ -9,6 +9,7 @@
 using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
+using CLIRuntimeEnvironment = Microsoft.DotNet.Cli.Utils.RuntimeEnvironment;
 
 namespace Microsoft.DotNet.Cli.Telemetry
 {
@@ -146,7 +147,7 @@ private void InitializeTelemetry()
                 config.ConnectionString = ConnectionString;
                 _client = new TelemetryClient(config);
                 _client.Context.Session.Id = CurrentSessionId;
-                _client.Context.Device.OperatingSystem = RuntimeEnvironment.OperatingSystem;
+                _client.Context.Device.OperatingSystem = CLIRuntimeEnvironment.OperatingSystem;
 
                 _commonProperties = new TelemetryCommonProperties().GetTelemetryCommonProperties();
                 _commonMeasurements = new Dictionary<string, double>();
diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/TemplatePackageDisplayTest.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/TemplatePackageDisplayTest.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.Text;
 using FakeItEasy;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Abstractions;
diff --git a/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs b/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Tools.New;
diff --git a/src/Tests/dotnet-new.Tests/DotnetClassTemplateTests.cs b/src/Tests/dotnet-new.Tests/DotnetClassTemplateTests.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
 using Microsoft.Extensions.Logging;
 using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
 using NuGet.Packaging;
diff --git a/src/Tests/dotnet-new.Tests/DotnetNewDebugOptionsTests.cs b/src/Tests/dotnet-new.Tests/DotnetNewDebugOptionsTests.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Runtime.InteropServices;
 using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.Cli.New.IntegrationTests
diff --git a/src/Tests/dotnet-new.Tests/DotnetNewLocaleTests.cs b/src/Tests/dotnet-new.Tests/DotnetNewLocaleTests.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Globalization;
-using System.Text;
 using System.Text.RegularExpressions;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.TestHelper;
diff --git a/src/Tests/dotnet-new.Tests/DotnetNewSearchTests.cs b/src/Tests/dotnet-new.Tests/DotnetNewSearchTests.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
 using Microsoft.DotNet.Cli.Utils;
 
 namespace Microsoft.DotNet.Cli.New.IntegrationTests
diff --git a/src/Tests/dotnet-new.Tests/PostActionTests.cs b/src/Tests/dotnet-new.Tests/PostActionTests.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Runtime.InteropServices;
 using System.Text.Json.Nodes;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Utils;
diff --git a/src/Tests/dotnet-new.Tests/TemplateEngineSamplesTest.cs b/src/Tests/dotnet-new.Tests/TemplateEngineSamplesTest.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
 using EmptyFiles;
 using Microsoft.Extensions.Logging;
 using Microsoft.TemplateEngine.Authoring.TemplateVerifier;
diff --git a/src/Tests/dotnet-new.Tests/VerifyScrubbers.cs b/src/Tests/dotnet-new.Tests/VerifyScrubbers.cs
@@ -1,7 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
 using System.Text.RegularExpressions;
 
 namespace Microsoft.DotNet.Cli.New.IntegrationTests

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`using System.CommandLine;`
`5`		`-using System.Text;`
`6`	`5`
`7`	`6`	`namespace Microsoft.TemplateEngine.Cli.Commands`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`		`-using System.Text;`
`5`		`-`
`6`	`4`	`namespace Microsoft.TemplateEngine.Cli.Commands`
`7`	`5`	`{`
`8`	`6`	`internal class InvalidTemplateParametersException : Exception`