diff --git a/CODEOWNERS b/CODEOWNERS
index a3dc756e44fa..d93147292fd8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -30,8 +30,9 @@
/src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
# Area-Format
-/src/Cli/dotnet/commands/dotnet-format @phil-allen-msft
-/test/dotnet-format.UnitTests @phil-allen-msft
+/src/Cli/dotnet/commands/Format @dotnet/roslyn-ide
+/test/dotnet-format.UnitTests @dotnet/roslyn-ide
+/src/Dotnet.Format @dotnet/roslyn-ide
# Area-NuGet
/src/Cli/dotnet/Commands/NuGet @dotnet/nuget-team
@@ -106,8 +107,5 @@
/test/Microsoft.NET.Build.Containers.IntegrationTests @dotnet/sdk-container-builds-maintainers
/test/Microsoft.NET.Build.Containers.UnitTests @dotnet/sdk-container-builds-maintainers
-# dotnet-format
-/src/BuiltInTools/dotnet-format @dotnet/roslyn-ide
-/test/dotnet-format.UnitTests @dotnet/roslyn-ide
/src/Microsoft.CodeAnalysis.NetAnalyzers @dotnet/dotnet-analyzers
diff --git a/eng/dotnet-format/dotnet-format-integration.yml b/eng/dotnet-format/dotnet-format-integration.yml
index 77b3baec5db9..26ecd59edc46 100644
--- a/eng/dotnet-format/dotnet-format-integration.yml
+++ b/eng/dotnet-format/dotnet-format-integration.yml
@@ -83,7 +83,7 @@ jobs:
displayName: 🟣 Restore dependencies
- script: |
.\artifacts\sdk-build-env.bat
- dotnet run --project .\src\BuiltInTools\dotnet-format\dotnet-format.csproj -c Release -- @eng\dotnet-format\validate.rsp
+ dotnet run --project .\src\Dotnet.Format\dotnet-format\dotnet-format.csproj -c Release -- @eng\dotnet-format\validate.rsp
displayName: 🟣 Run dotnet-format
- task: ${{ parameters.oneESCompat.publishTaskPrefix }}PublishBuildArtifacts@1
displayName: 🟣 Publish Logs
diff --git a/sdk.slnx b/sdk.slnx
index 1f9a8f45530d..b5f5c625b0c2 100644
--- a/sdk.slnx
+++ b/sdk.slnx
@@ -43,7 +43,7 @@
-
+
diff --git a/src/BuiltInTools/dotnet-format.slnf b/src/Dotnet.Format/dotnet-format.slnf
similarity index 69%
rename from src/BuiltInTools/dotnet-format.slnf
rename to src/Dotnet.Format/dotnet-format.slnf
index afa68f4acfff..6f3ae502a927 100644
--- a/src/BuiltInTools/dotnet-format.slnf
+++ b/src/Dotnet.Format/dotnet-format.slnf
@@ -2,7 +2,7 @@
"solution": {
"path": "..\\..\\sdk.slnx",
"projects": [
- "src\\BuiltInTools\\dotnet-format\\dotnet-format.csproj",
+ "src\\Dotnet.Format\\dotnet-format\\dotnet-format.csproj",
"test\\dotnet-format.UnitTests\\dotnet-format.UnitTests.csproj"
]
}
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/AnalyzerFinderHelpers.cs b/src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerFinderHelpers.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/AnalyzerFinderHelpers.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerFinderHelpers.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/AnalyzerFormatter.cs b/src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/AnalyzerFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/AnalyzerOptionExtensions.cs b/src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerOptionExtensions.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/AnalyzerOptionExtensions.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerOptionExtensions.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/AnalyzerReferenceInformationProvider.cs b/src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerReferenceInformationProvider.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/AnalyzerReferenceInformationProvider.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerReferenceInformationProvider.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/AnalyzerRunner.cs b/src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerRunner.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/AnalyzerRunner.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/AnalyzerRunner.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/AnalyzersAndFixers.cs b/src/Dotnet.Format/dotnet-format/Analyzers/AnalyzersAndFixers.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/AnalyzersAndFixers.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/AnalyzersAndFixers.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/CodeAnalysisResult.cs b/src/Dotnet.Format/dotnet-format/Analyzers/CodeAnalysisResult.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/CodeAnalysisResult.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/CodeAnalysisResult.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/CodeStyleInformationProvider.cs b/src/Dotnet.Format/dotnet-format/Analyzers/CodeStyleInformationProvider.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/CodeStyleInformationProvider.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/CodeStyleInformationProvider.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/Extensions.cs b/src/Dotnet.Format/dotnet-format/Analyzers/Extensions.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/Extensions.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/Extensions.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/Interfaces/IAnalyzerInformationProvider.cs b/src/Dotnet.Format/dotnet-format/Analyzers/Interfaces/IAnalyzerInformationProvider.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/Interfaces/IAnalyzerInformationProvider.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/Interfaces/IAnalyzerInformationProvider.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/Interfaces/IAnalyzerRunner.cs b/src/Dotnet.Format/dotnet-format/Analyzers/Interfaces/IAnalyzerRunner.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/Interfaces/IAnalyzerRunner.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/Interfaces/IAnalyzerRunner.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/Interfaces/ICodeFixApplier.cs b/src/Dotnet.Format/dotnet-format/Analyzers/Interfaces/ICodeFixApplier.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/Interfaces/ICodeFixApplier.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/Interfaces/ICodeFixApplier.cs
diff --git a/src/BuiltInTools/dotnet-format/Analyzers/SolutionCodeFixApplier.cs b/src/Dotnet.Format/dotnet-format/Analyzers/SolutionCodeFixApplier.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Analyzers/SolutionCodeFixApplier.cs
rename to src/Dotnet.Format/dotnet-format/Analyzers/SolutionCodeFixApplier.cs
diff --git a/src/BuiltInTools/dotnet-format/CodeFormatter.cs b/src/Dotnet.Format/dotnet-format/CodeFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/CodeFormatter.cs
rename to src/Dotnet.Format/dotnet-format/CodeFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs b/src/Dotnet.Format/dotnet-format/Commands/FormatAnalyzersCommand.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Commands/FormatAnalyzersCommand.cs
rename to src/Dotnet.Format/dotnet-format/Commands/FormatAnalyzersCommand.cs
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs b/src/Dotnet.Format/dotnet-format/Commands/FormatCommandCommon.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Commands/FormatCommandCommon.cs
rename to src/Dotnet.Format/dotnet-format/Commands/FormatCommandCommon.cs
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs b/src/Dotnet.Format/dotnet-format/Commands/FormatStyleCommand.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Commands/FormatStyleCommand.cs
rename to src/Dotnet.Format/dotnet-format/Commands/FormatStyleCommand.cs
diff --git a/src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs b/src/Dotnet.Format/dotnet-format/Commands/FormatWhitespaceCommand.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Commands/FormatWhitespaceCommand.cs
rename to src/Dotnet.Format/dotnet-format/Commands/FormatWhitespaceCommand.cs
diff --git a/src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs b/src/Dotnet.Format/dotnet-format/Commands/RootFormatCommand.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Commands/RootFormatCommand.cs
rename to src/Dotnet.Format/dotnet-format/Commands/RootFormatCommand.cs
diff --git a/src/BuiltInTools/dotnet-format/FileChange.cs b/src/Dotnet.Format/dotnet-format/FileChange.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/FileChange.cs
rename to src/Dotnet.Format/dotnet-format/FileChange.cs
diff --git a/src/BuiltInTools/dotnet-format/FixCategory.cs b/src/Dotnet.Format/dotnet-format/FixCategory.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/FixCategory.cs
rename to src/Dotnet.Format/dotnet-format/FixCategory.cs
diff --git a/src/BuiltInTools/dotnet-format/FixSeverity.cs b/src/Dotnet.Format/dotnet-format/FixSeverity.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/FixSeverity.cs
rename to src/Dotnet.Format/dotnet-format/FixSeverity.cs
diff --git a/src/BuiltInTools/dotnet-format/FormatOptions.cs b/src/Dotnet.Format/dotnet-format/FormatOptions.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/FormatOptions.cs
rename to src/Dotnet.Format/dotnet-format/FormatOptions.cs
diff --git a/src/BuiltInTools/dotnet-format/FormattedFile.cs b/src/Dotnet.Format/dotnet-format/FormattedFile.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/FormattedFile.cs
rename to src/Dotnet.Format/dotnet-format/FormattedFile.cs
diff --git a/src/BuiltInTools/dotnet-format/Formatters/CharsetFormatter.cs b/src/Dotnet.Format/dotnet-format/Formatters/CharsetFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Formatters/CharsetFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Formatters/CharsetFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Formatters/DocumentFormatter.cs b/src/Dotnet.Format/dotnet-format/Formatters/DocumentFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Formatters/DocumentFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Formatters/DocumentFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Formatters/EndOfLineFormatter.cs b/src/Dotnet.Format/dotnet-format/Formatters/EndOfLineFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Formatters/EndOfLineFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Formatters/EndOfLineFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Formatters/FinalNewlineFormatter.cs b/src/Dotnet.Format/dotnet-format/Formatters/FinalNewlineFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Formatters/FinalNewlineFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Formatters/FinalNewlineFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Formatters/ICodeFormatter.cs b/src/Dotnet.Format/dotnet-format/Formatters/ICodeFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Formatters/ICodeFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Formatters/ICodeFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Formatters/OrganizeImportsFormatter.cs b/src/Dotnet.Format/dotnet-format/Formatters/OrganizeImportsFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Formatters/OrganizeImportsFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Formatters/OrganizeImportsFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Formatters/WhitespaceFormatter.cs b/src/Dotnet.Format/dotnet-format/Formatters/WhitespaceFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Formatters/WhitespaceFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Formatters/WhitespaceFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Logging/IIssueFormatter.cs b/src/Dotnet.Format/dotnet-format/Logging/IIssueFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Logging/IIssueFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Logging/IIssueFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Logging/ILoggerExtensions.cs b/src/Dotnet.Format/dotnet-format/Logging/ILoggerExtensions.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Logging/ILoggerExtensions.cs
rename to src/Dotnet.Format/dotnet-format/Logging/ILoggerExtensions.cs
diff --git a/src/BuiltInTools/dotnet-format/Logging/MSBuildIssueFormatter.cs b/src/Dotnet.Format/dotnet-format/Logging/MSBuildIssueFormatter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Logging/MSBuildIssueFormatter.cs
rename to src/Dotnet.Format/dotnet-format/Logging/MSBuildIssueFormatter.cs
diff --git a/src/BuiltInTools/dotnet-format/Logging/NullScope.cs b/src/Dotnet.Format/dotnet-format/Logging/NullScope.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Logging/NullScope.cs
rename to src/Dotnet.Format/dotnet-format/Logging/NullScope.cs
diff --git a/src/BuiltInTools/dotnet-format/Logging/SimpleConsoleLogger.cs b/src/Dotnet.Format/dotnet-format/Logging/SimpleConsoleLogger.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Logging/SimpleConsoleLogger.cs
rename to src/Dotnet.Format/dotnet-format/Logging/SimpleConsoleLogger.cs
diff --git a/src/BuiltInTools/dotnet-format/Logging/SimpleConsoleLoggerFactoryExtensions.cs b/src/Dotnet.Format/dotnet-format/Logging/SimpleConsoleLoggerFactoryExtensions.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Logging/SimpleConsoleLoggerFactoryExtensions.cs
rename to src/Dotnet.Format/dotnet-format/Logging/SimpleConsoleLoggerFactoryExtensions.cs
diff --git a/src/BuiltInTools/dotnet-format/Logging/SimpleConsoleLoggerProvider.cs b/src/Dotnet.Format/dotnet-format/Logging/SimpleConsoleLoggerProvider.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Logging/SimpleConsoleLoggerProvider.cs
rename to src/Dotnet.Format/dotnet-format/Logging/SimpleConsoleLoggerProvider.cs
diff --git a/src/BuiltInTools/dotnet-format/Program.cs b/src/Dotnet.Format/dotnet-format/Program.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Program.cs
rename to src/Dotnet.Format/dotnet-format/Program.cs
diff --git a/src/BuiltInTools/dotnet-format/Properties/launchSettings.json b/src/Dotnet.Format/dotnet-format/Properties/launchSettings.json
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Properties/launchSettings.json
rename to src/Dotnet.Format/dotnet-format/Properties/launchSettings.json
diff --git a/src/BuiltInTools/dotnet-format/README.md b/src/Dotnet.Format/dotnet-format/README.md
similarity index 100%
rename from src/BuiltInTools/dotnet-format/README.md
rename to src/Dotnet.Format/dotnet-format/README.md
diff --git a/src/BuiltInTools/dotnet-format/Reflection/RemoveUnnecessaryImportsHelper.cs b/src/Dotnet.Format/dotnet-format/Reflection/RemoveUnnecessaryImportsHelper.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Reflection/RemoveUnnecessaryImportsHelper.cs
rename to src/Dotnet.Format/dotnet-format/Reflection/RemoveUnnecessaryImportsHelper.cs
diff --git a/src/BuiltInTools/dotnet-format/ReportWriter.cs b/src/Dotnet.Format/dotnet-format/ReportWriter.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/ReportWriter.cs
rename to src/Dotnet.Format/dotnet-format/ReportWriter.cs
diff --git a/src/BuiltInTools/dotnet-format/Resources.resx b/src/Dotnet.Format/dotnet-format/Resources.resx
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Resources.resx
rename to src/Dotnet.Format/dotnet-format/Resources.resx
diff --git a/src/BuiltInTools/dotnet-format/Resources/icon.png b/src/Dotnet.Format/dotnet-format/Resources/icon.png
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Resources/icon.png
rename to src/Dotnet.Format/dotnet-format/Resources/icon.png
diff --git a/src/BuiltInTools/dotnet-format/Utilities/DotNetHelper.cs b/src/Dotnet.Format/dotnet-format/Utilities/DotNetHelper.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Utilities/DotNetHelper.cs
rename to src/Dotnet.Format/dotnet-format/Utilities/DotNetHelper.cs
diff --git a/src/BuiltInTools/dotnet-format/Utilities/EditorConfigFinder.cs b/src/Dotnet.Format/dotnet-format/Utilities/EditorConfigFinder.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Utilities/EditorConfigFinder.cs
rename to src/Dotnet.Format/dotnet-format/Utilities/EditorConfigFinder.cs
diff --git a/src/BuiltInTools/dotnet-format/Utilities/EditorConfigOptions.cs b/src/Dotnet.Format/dotnet-format/Utilities/EditorConfigOptions.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Utilities/EditorConfigOptions.cs
rename to src/Dotnet.Format/dotnet-format/Utilities/EditorConfigOptions.cs
diff --git a/src/BuiltInTools/dotnet-format/Utilities/GeneratedCodeUtilities.cs b/src/Dotnet.Format/dotnet-format/Utilities/GeneratedCodeUtilities.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Utilities/GeneratedCodeUtilities.cs
rename to src/Dotnet.Format/dotnet-format/Utilities/GeneratedCodeUtilities.cs
diff --git a/src/BuiltInTools/dotnet-format/Utilities/ProcessRunner.cs b/src/Dotnet.Format/dotnet-format/Utilities/ProcessRunner.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Utilities/ProcessRunner.cs
rename to src/Dotnet.Format/dotnet-format/Utilities/ProcessRunner.cs
diff --git a/src/BuiltInTools/dotnet-format/Utilities/SourceFileMatcher.cs b/src/Dotnet.Format/dotnet-format/Utilities/SourceFileMatcher.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Utilities/SourceFileMatcher.cs
rename to src/Dotnet.Format/dotnet-format/Utilities/SourceFileMatcher.cs
diff --git a/src/BuiltInTools/dotnet-format/WorkspaceFormatResult.cs b/src/Dotnet.Format/dotnet-format/WorkspaceFormatResult.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/WorkspaceFormatResult.cs
rename to src/Dotnet.Format/dotnet-format/WorkspaceFormatResult.cs
diff --git a/src/BuiltInTools/dotnet-format/WorkspaceType.cs b/src/Dotnet.Format/dotnet-format/WorkspaceType.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/WorkspaceType.cs
rename to src/Dotnet.Format/dotnet-format/WorkspaceType.cs
diff --git a/src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace.cs b/src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace.cs
rename to src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace.cs
diff --git a/src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_CSharpProjectLoader.cs b/src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_CSharpProjectLoader.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_CSharpProjectLoader.cs
rename to src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_CSharpProjectLoader.cs
diff --git a/src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_FolderSolutionLoader.cs b/src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_FolderSolutionLoader.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_FolderSolutionLoader.cs
rename to src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_FolderSolutionLoader.cs
diff --git a/src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_ProjectLoader.cs b/src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_ProjectLoader.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_ProjectLoader.cs
rename to src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_ProjectLoader.cs
diff --git a/src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_VisualBasicProjectLoader.cs b/src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_VisualBasicProjectLoader.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Workspaces/FolderWorkspace_VisualBasicProjectLoader.cs
rename to src/Dotnet.Format/dotnet-format/Workspaces/FolderWorkspace_VisualBasicProjectLoader.cs
diff --git a/src/BuiltInTools/dotnet-format/Workspaces/MSBuildWorkspaceFinder.cs b/src/Dotnet.Format/dotnet-format/Workspaces/MSBuildWorkspaceFinder.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Workspaces/MSBuildWorkspaceFinder.cs
rename to src/Dotnet.Format/dotnet-format/Workspaces/MSBuildWorkspaceFinder.cs
diff --git a/src/BuiltInTools/dotnet-format/Workspaces/MSBuildWorkspaceLoader.cs b/src/Dotnet.Format/dotnet-format/Workspaces/MSBuildWorkspaceLoader.cs
similarity index 100%
rename from src/BuiltInTools/dotnet-format/Workspaces/MSBuildWorkspaceLoader.cs
rename to src/Dotnet.Format/dotnet-format/Workspaces/MSBuildWorkspaceLoader.cs
diff --git a/src/BuiltInTools/dotnet-format/dotnet-format.csproj b/src/Dotnet.Format/dotnet-format/dotnet-format.csproj
similarity index 100%
rename from src/BuiltInTools/dotnet-format/dotnet-format.csproj
rename to src/Dotnet.Format/dotnet-format/dotnet-format.csproj
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.cs.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.cs.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.cs.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.de.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.de.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.de.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.es.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.es.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.es.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.fr.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.fr.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.fr.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.it.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.it.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.it.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.ja.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.ja.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.ja.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.ko.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.ko.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.ko.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.pl.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.pl.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.pl.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.pt-BR.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.pt-BR.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.pt-BR.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.ru.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.ru.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.ru.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.tr.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.tr.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.tr.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.zh-Hans.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hans.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.zh-Hans.xlf
diff --git a/src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf b/src/Dotnet.Format/dotnet-format/xlf/Resources.zh-Hant.xlf
similarity index 100%
rename from src/BuiltInTools/dotnet-format/xlf/Resources.zh-Hant.xlf
rename to src/Dotnet.Format/dotnet-format/xlf/Resources.zh-Hant.xlf
diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj
index 22d3827eab44..80aea476d46c 100644
--- a/src/Layout/redist/redist.csproj
+++ b/src/Layout/redist/redist.csproj
@@ -67,7 +67,7 @@
-
+
diff --git a/test/dotnet-format.UnitTests/dotnet-format.UnitTests.csproj b/test/dotnet-format.UnitTests/dotnet-format.UnitTests.csproj
index 7180d64a01b9..78265ab3456a 100644
--- a/test/dotnet-format.UnitTests/dotnet-format.UnitTests.csproj
+++ b/test/dotnet-format.UnitTests/dotnet-format.UnitTests.csproj
@@ -16,7 +16,7 @@
-
+