From 9f361272ebcada9b95033a1695aad2884110002f Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 26 Jun 2019 09:51:35 -0500 Subject: [PATCH] Remove+sort usings, add headers for build tasks Commit migrated from https://github.com/dotnet/core-setup/commit/52a5513a7cd4d11fbd8d89ca8fd6f4fe07a4efd0 --- tools-local/tasks/ChangeEntryPointLibraryName.cs | 5 ++--- tools-local/tasks/GenerateCurrentVersion.cs | 3 +-- tools-local/tasks/GenerateDebRepoUploadJsonFile.cs | 3 --- tools-local/tasks/GenerateGuidFromName.cs | 2 +- tools-local/tasks/GenerateMsiVersion.cs | 1 - tools-local/tasks/GetTargetMachineInfo.cs | 2 -- tools-local/tasks/ProcessSharedFrameworkDeps.cs | 4 ++++ tools-local/tasks/ReplaceFileContents.cs | 4 ++-- tools-local/tasks/RuntimeGraphManager.cs | 7 +++++-- tools-local/tasks/ValidateBinInspectResults.cs | 2 -- tools-local/tasks/ZipFileCreateFromDirectory.cs | 4 ++-- tools-local/tasks/ZipFileExtractToDirectory.cs | 1 - 12 files changed, 17 insertions(+), 21 deletions(-) diff --git a/tools-local/tasks/ChangeEntryPointLibraryName.cs b/tools-local/tasks/ChangeEntryPointLibraryName.cs index 956633d..dce1f22 100644 --- a/tools-local/tasks/ChangeEntryPointLibraryName.cs +++ b/tools-local/tasks/ChangeEntryPointLibraryName.cs @@ -2,12 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; -using System.Linq; using Microsoft.Build.Framework; -using System.IO; using Newtonsoft.Json; using Newtonsoft.Json.Linq; +using System.IO; +using System.Linq; namespace Microsoft.DotNet.Build.Tasks { diff --git a/tools-local/tasks/GenerateCurrentVersion.cs b/tools-local/tasks/GenerateCurrentVersion.cs index 7068a2a..c74cb19 100644 --- a/tools-local/tasks/GenerateCurrentVersion.cs +++ b/tools-local/tasks/GenerateCurrentVersion.cs @@ -2,9 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; +using System; using System.Globalization; using System.Text.RegularExpressions; diff --git a/tools-local/tasks/GenerateDebRepoUploadJsonFile.cs b/tools-local/tasks/GenerateDebRepoUploadJsonFile.cs index b173baf..51e3739 100644 --- a/tools-local/tasks/GenerateDebRepoUploadJsonFile.cs +++ b/tools-local/tasks/GenerateDebRepoUploadJsonFile.cs @@ -2,11 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Microsoft.Build.Framework; using System.IO; -using System.Collections.Generic; -using Microsoft.Build.Construction; namespace Microsoft.DotNet.Build.Tasks diff --git a/tools-local/tasks/GenerateGuidFromName.cs b/tools-local/tasks/GenerateGuidFromName.cs index f64885c..be7d1ae 100644 --- a/tools-local/tasks/GenerateGuidFromName.cs +++ b/tools-local/tasks/GenerateGuidFromName.cs @@ -2,9 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Build.Framework; using System; using System.Security.Cryptography; -using Microsoft.Build.Framework; namespace Microsoft.DotNet.Build.Tasks { diff --git a/tools-local/tasks/GenerateMsiVersion.cs b/tools-local/tasks/GenerateMsiVersion.cs index f24c087..454ecbf 100644 --- a/tools-local/tasks/GenerateMsiVersion.cs +++ b/tools-local/tasks/GenerateMsiVersion.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using Microsoft.Build.Framework; namespace Microsoft.DotNet.Build.Tasks diff --git a/tools-local/tasks/GetTargetMachineInfo.cs b/tools-local/tasks/GetTargetMachineInfo.cs index 93cf854..67aa53b 100644 --- a/tools-local/tasks/GetTargetMachineInfo.cs +++ b/tools-local/tasks/GetTargetMachineInfo.cs @@ -3,9 +3,7 @@ // See the LICENSE file in the project root for more information. using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System.Runtime.InteropServices; -using Microsoft.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Build.Tasks { diff --git a/tools-local/tasks/ProcessSharedFrameworkDeps.cs b/tools-local/tasks/ProcessSharedFrameworkDeps.cs index b5e9642..687a8c1 100644 --- a/tools-local/tasks/ProcessSharedFrameworkDeps.cs +++ b/tools-local/tasks/ProcessSharedFrameworkDeps.cs @@ -1,3 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Microsoft.Extensions.DependencyModel; diff --git a/tools-local/tasks/ReplaceFileContents.cs b/tools-local/tasks/ReplaceFileContents.cs index 488699f..53aa631 100644 --- a/tools-local/tasks/ReplaceFileContents.cs +++ b/tools-local/tasks/ReplaceFileContents.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using System; using System.IO; -using Microsoft.Build.Utilities; -using Microsoft.Build.Framework; namespace Microsoft.DotNet.Build.Tasks { diff --git a/tools-local/tasks/RuntimeGraphManager.cs b/tools-local/tasks/RuntimeGraphManager.cs index 3cd1de5..2bedeef 100644 --- a/tools-local/tasks/RuntimeGraphManager.cs +++ b/tools-local/tasks/RuntimeGraphManager.cs @@ -1,5 +1,8 @@ -using Microsoft.Extensions.DependencyModel; -using NuGet.Frameworks; +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using Microsoft.Extensions.DependencyModel; using NuGet.Packaging; using NuGet.ProjectModel; using NuGet.RuntimeModel; diff --git a/tools-local/tasks/ValidateBinInspectResults.cs b/tools-local/tasks/ValidateBinInspectResults.cs index f8d1dc5..2d5b7aa 100644 --- a/tools-local/tasks/ValidateBinInspectResults.cs +++ b/tools-local/tasks/ValidateBinInspectResults.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Build.Construction; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using System; using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; diff --git a/tools-local/tasks/ZipFileCreateFromDirectory.cs b/tools-local/tasks/ZipFileCreateFromDirectory.cs index 472c52b..3b2cbf6 100644 --- a/tools-local/tasks/ZipFileCreateFromDirectory.cs +++ b/tools-local/tasks/ZipFileCreateFromDirectory.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; using System; using System.IO; using System.IO.Compression; using System.Text.RegularExpressions; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; namespace Microsoft.DotNet.Build.Tasks { diff --git a/tools-local/tasks/ZipFileExtractToDirectory.cs b/tools-local/tasks/ZipFileExtractToDirectory.cs index 049ca12..e03a860 100644 --- a/tools-local/tasks/ZipFileExtractToDirectory.cs +++ b/tools-local/tasks/ZipFileExtractToDirectory.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using System; using System.IO; using System.IO.Compression; -- 2.7.4