Move dotnet/format to dotnet/sdk #38857

Cosifne · 2024-02-17T05:57:31Z

This is generated based on 82edc548821f6f36fb4b8542ad47466d65a3a26a in dotnet/format repo.
I pulled the commits from dotnet/format directly, so it will preserve all the history. Let me know if this is not OK.
I get dotnet/format project locally build passed.

All commits before 592b10a are not interested. Mine commits are listed after that. I will put comments in interesting place to help review

Merge release/8.x to main

Include external access layer for Razor

…/7.x-to-release/8.x

Merge release/7.x to release/8.x

* Update dependencies from https://github.com/dotnet/roslyn build 20231017.14 Microsoft.CodeAnalysis From Version 4.8.0-3.23474.1 -> To Version 4.8.0-3.23517.14 * Update dependencies from https://github.com/dotnet/roslyn build 20231018.7 Microsoft.CodeAnalysis From Version 4.8.0-3.23474.1 -> To Version 4.8.0-3.23518.7 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Sam Harwell <[email protected]>

Merge release/8.x to main

…0af-99a020876755

…127-b0af-99a020876755 [release/8.x] Update dependencies from dotnet/arcade

…8-29d299321a94 [main] Update dependencies from dotnet/source-build-externals

…fdc-87ea-0146510626ce [release/7.x] Update dependencies from dotnet/roslyn

* Update dependencies from https://github.com/dotnet/roslyn build 20231020.1 Microsoft.CodeAnalysis From Version 4.8.0-3.23474.1 -> To Version 4.9.0-1.23520.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Joey Robichaud <[email protected]> Co-authored-by: Jan Jones <[email protected]>

* Update dependencies from https://github.com/dotnet/runtime build 20231020.16 Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging From Version 8.0.0-rtm.23517.16 -> To Version 8.0.0-rtm.23520.16 * Update dependencies from https://github.com/dotnet/runtime build 20231023.12 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging From Version 8.0.0-rtm.23517.16 -> To Version 8.0.0 * Stabilize package version * Remove package source mapping * Update Version.Details.xml * Update azure-pipelines-official.yml --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Jones <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>

Merge release/7.x to release/8.x

Merge release/8.x to main

* Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23516.5 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23509.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk * Fix NuGet version * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23516.5 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23509.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23516.5 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23509.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23516.5 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23509.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23516.5 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23509.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23516.5 -> To Version 9.0.0-beta.23518.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23509.1 -> To Version 1.0.0-beta.23516.1 (parent: Microsoft.DotNet.Arcade.Sdk * Fixup merge --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Jones <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>

* Update dependencies from https://github.com/dotnet/runtime build 20231017.5 Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging From Version 8.0.0-rtm.23513.17 -> To Version 9.0.0-alpha.1.23517.5 * Update dependencies from https://github.com/dotnet/runtime build 20231023.1 Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging From Version 8.0.0-rtm.23517.16 -> To Version 9.0.0-alpha.1.23523.1 * Update Version.Details.xml --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Jones <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>

Merge release/8.x to main

…024.1 (#1997) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23516.1 to 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk)

…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:97b8e377-e3a6-442c-efa9-08dbd545292d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 97b8e377-e3a6-442c-efa9-08dbd545292d - **Build**: 20230926.7 - **Date Produced**: September 26, 2023 11:30:23 PM UTC - **Commit**: 0b25e38ad32a69cd83ae246104b32449203cc71c - **Branch**: refs/heads/internal/release/8.0-rc2 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 8.0.0 to 8.0.0-rc.2.23476.7][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 8.0.0 to 8.0.0-rc.2.23476.7][1] - **Microsoft.Extensions.Logging**: [from 8.0.0 to 8.0.0-rc.2.23476.7][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.0-rtm.23523.12 to 8.0.0-rc.2.23476.7][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC488a8a3521&targetVersion=GC0b25e38ad3&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:97b8e377-e3a6-442c-efa9-08dbd545292d)

…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:97b8e377-e3a6-442c-efa9-08dbd545292d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 97b8e377-e3a6-442c-efa9-08dbd545292d - **Build**: 20231025.7 - **Date Produced**: October 25, 2023 9:10:32 PM UTC - **Commit**: 17ea9ab3f662320d4ac62d3a2b783b5054ad80bf - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Bcl.AsyncInterfaces**: [from 8.0.0-rc.2.23476.7 to 8.0.0][1] - **Microsoft.Extensions.FileSystemGlobbing**: [from 8.0.0-rc.2.23476.7 to 8.0.0][1] - **Microsoft.Extensions.Logging**: [from 8.0.0-rc.2.23476.7 to 8.0.0][1] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.0-rc.2.23476.7 to 8.0.0-rtm.23525.7][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC0b25e38ad3&targetVersion=GC17ea9ab3f6&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:97b8e377-e3a6-442c-efa9-08dbd545292d)

MiYanni

Other things to mention:

The repo using global usings, so likely 70% or more of the using statements in your source files are unnecessary.
The tests should be converted to Helix tests at some point, but it is not necessary in this PR to do that.

documentation/format/docs/test-plan.md

MiYanni · 2024-03-04T22:52:26Z

eng/Version.Details.xml

-    <Dependency Name="dotnet-format" Version="9.0.512801">
-      <Uri>https://github.com/dotnet/format</Uri>
-      <Sha>de0824fccb49f4c23a9a55c6d35b1f1fb23bcfa5</Sha>
-    </Dependency>
    <!-- Intermediate is necessary for source build. -->
    <Dependency Name="Microsoft.SourceBuild.Intermediate.format" Version="9.0.512801">
      <Uri>https://github.com/dotnet/format</Uri>


AFAIK, this should be removed. Not sure if adjustments need to be made on the sourcebuild side.

MiYanni · 2024-03-04T22:56:13Z

eng/dotnet-format/format-verifier.ps1

+
+            if ($stage -eq "format-workspace") {
+                Write-Output "$(Get-Date) - $solutionFile - Formatting Workspace"
+                $output = & $parentDotNetPath "$currentLocation/artifacts/bin/dotnet-format/Release/net9.0/dotnet-format.dll" $solution --no-restore -v diag --verify-no-changes | Out-String


Seems suspicious to have net9.0 folder hardcoded in the path.

MiYanni · 2024-03-04T22:56:38Z

eng/dotnet-format/format-verifier.ps1

+
+    if ($stage -eq "format-folder") {
+        Write-Output "$(Get-Date) - $folderName - Formatting Folder"
+        $output = & $parentDotNetPath "$currentLocation/artifacts/bin/dotnet-format/Release/net9.0/dotnet-format.dll" whitespace $repoPath --folder -v diag --verify-no-changes | Out-String


Same here with net9.0 folder hardcoded in the path.

If TFM get updates, will it be OK to change the value here when the build failed?

I guess TFM is now maintained by arcade using NetCurrent, not sure if there a good way to get that value in normal script

What I was indicating is that you can just find the dll. You know the name of it, and you know the directory structure up until the point where it could change. So, just before this line add:

$dllPath = Get-ChildItem -Path "$currentLocation/artifacts/bin/dotnet-format/Release/" -Include dotnet-format.dll -Recurse

And then this line would be:

$output = & $parentDotNetPath "$($dllPath.FullName)" whitespace $repoPath --folder -v diag --verify-no-changes | Out-String

src/Assets/dotnet-format/Directory.Build.props

src/BuiltInTools/dotnet-format/Formatters/EndOfLineFormatter.cs

src/BuiltInTools/dotnet-format/Workspaces/MSBuildWorkspaceFinder.cs

test/Directory.Build.targets

MichaelSimons · 2024-03-07T19:03:11Z

I think it would be valuable to validated this change in the context of the VMR to unsure this doesn't break. A break would block the dependency from of the SDK into installer which is something to try to avoid. To validate:

Pull the VMR locally
Create a working branch
Sync these change into the VMR using the https://github.com/dotnet/dotnet/blob/main/src/installer/eng/vmr-sync.sh script.
```
<path to your local VMR>/vmr-sync.sh \
   --repository sdk:3e70a96b84932215a4e77bc2ec9c7b667e2a1679 \
   --sdk sdk:https://github.com/dotnet/sdk         \
   --tmp "$HOME/repos/tmp"
   --vmr "<path to your local VMR>
```
cc @premun on usage of vmr-sync

After syncing, you will want to remove this reference - https://github.com/dotnet/dotnet/blob/main/repo-projects/sdk.proj#L21
Create a PR and let CI validate the change.

Cosifne · 2024-03-13T21:38:08Z

VMR test PR
dotnet/dotnet#79

Cosifne · 2024-03-15T17:18:11Z

VMR build passed

MiYanni

Looks good!

MiYanni · 2024-03-15T16:33:37Z

eng/dotnet-format/format-verifier.ps1

+
+    if ($stage -eq "format-folder") {
+        Write-Output "$(Get-Date) - $folderName - Formatting Folder"
+        $output = & $parentDotNetPath "$currentLocation/artifacts/bin/dotnet-format/Release/net9.0/dotnet-format.dll" whitespace $repoPath --folder -v diag --verify-no-changes | Out-String


What I was indicating is that you can just find the dll. You know the name of it, and you know the directory structure up until the point where it could change. So, just before this line add:

$dllPath = Get-ChildItem -Path "$currentLocation/artifacts/bin/dotnet-format/Release/" -Include dotnet-format.dll -Recurse

And then this line would be:

$output = & $parentDotNetPath "$($dllPath.FullName)" whitespace $repoPath --folder -v diag --verify-no-changes | Out-String

src/BuiltInTools/dotnet-format/Utilities/AssemblyResolver.cs

Cosifne · 2024-03-15T19:11:33Z

@MiYanni
Does sdk team prefer to keep the commit history from dotnet/format? Or should I squash all commits into one commit for a clean history?

MiYanni · 2024-03-15T19:20:20Z

@Cosifne You can keep the history. That's fine. This PR cannot be merged, though, until after the preview snap, which I think is... Monday? You can confirm that with @marcpopMSFT

sharwell and others added 30 commits October 23, 2023 09:09

Include external access layer for Razor

fc5cc04

Merge pull request #1990 from dotnet/merges/release/8.x-to-main

801d245

Merge release/8.x to main

Merge pull request #1989 from sharwell/ea-layer

84eb2b7

Include external access layer for Razor

Merge remote-tracking branch 'dotnet/release/7.x' into merges/release…

2c6f36d

…/7.x-to-release/8.x

Merge pull request #1991 from dotnet/merges/release/7.x-to-release/8.x

580368d

Merge release/7.x to release/8.x

Merge pull request #1992 from dotnet/merges/release/8.x-to-main

7096dd8

Merge release/8.x to main

Migrate official build pipeline to dnceng (#1988)

5f8c76c

Merge branch 'release/8.x' into darc-release/8.x-c23d961a-f29c-4127-b…

cecb88a

…0af-99a020876755

Migrate official build pipeline to dnceng

c519d26

Update VS version used for signed builds

79b771c

Disable signing validation

ecc2f27

Merge pull request #1967 from dotnet/darc-release/8.x-c23d961a-f29c-4…

fd1f33b

…127-b0af-99a020876755 [release/8.x] Update dependencies from dotnet/arcade

Merge pull request #1970 from dotnet/darc-main-659d666e-101e-4dad-85f…

5190325

…8-29d299321a94 [main] Update dependencies from dotnet/source-build-externals

Merge pull request #1927 from dotnet/darc-release/7.x-98c6a3f6-f7e9-4…

4b74199

…fdc-87ea-0146510626ce [release/7.x] Update dependencies from dotnet/roslyn

Merge branch 'release/8.x' into merges/release/7.x-to-release/8.x

3c3c81d

Merge pull request #1994 from dotnet/merges/release/7.x-to-release/8.x

aadaa16

Merge release/7.x to release/8.x

Merge branch 'main' into merges/release/8.x-to-main

febf17c

Merge pull request #1995 from dotnet/merges/release/8.x-to-main

2a374a5

Merge release/8.x to main

Merge branch 'main' into merges/release/8.x-to-main

eddf4f3

Update NuGet.config

a99dd51

Update Version.Details.xml

03e4fb2

Merge pull request #1996 from dotnet/merges/release/8.x-to-main

8a707d9

Merge release/8.x to main

Update dependencies from https://github.com/dotnet/arcade build 20231…

f5f24f3

…024.1 (#1997) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23516.1 to 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk)

Cosifne added 2 commits March 4, 2024 14:59

Remove Intermediate.format

076f52d

Pipe the script

3ad5f39

MiYanni reviewed Mar 5, 2024

View reviewed changes

Cosifne added 3 commits March 6, 2024 18:04

Restore test/Directory.Build.targets

bbbf57b

Add comment

eb8e6c2

Merge remote-tracking branch 'upstream/main' into dev/shech/mergeFormat

3e70a96

Sort and remove usings for all the dotnet/format code

2364425

MiYanni mentioned this pull request Mar 7, 2024

Update TestAsTool builds to use 1ES pools #39308

Merged

Cosifne added 3 commits March 7, 2024 16:49

Remove test-plan

67ab69a

Merge remote-tracking branch 'upstream/main' into dev/shech/mergeFormat

6797e2e

Merge remote-tracking branch 'upstream/main' into dev/shech/mergeFormat

636ba11

Cosifne added 2 commits March 14, 2024 15:37

Do not copy dotnet-format to output

86c6af4

Merge remote-tracking branch 'upstream/main' into dev/shech/mergeFormat

8704b61

arunchndr mentioned this pull request Mar 15, 2024

Questions around Contributing to the Repo dotnet/format#2132

Closed

MiYanni approved these changes Mar 15, 2024

View reviewed changes

dkurepa mentioned this pull request Mar 18, 2024

Add dotnet/format to flow creation script dotnet/arcade#14606

Merged

Cosifne added 3 commits March 18, 2024 12:07

Remove assemblyResolver as it's no longer used

50dfaa8

Use pattern to find dotnet-format dlls

fb74021

Merge remote-tracking branch 'upstream/main' into dev/shech/mergeFormat

735809a

arunchndr merged commit 20a37c5 into main Mar 19, 2024
16 checks passed

arunchndr deleted the dev/shech/mergeFormat branch March 19, 2024 16:57

arunchndr mentioned this pull request Mar 19, 2024

dotnet format is now part of the SDK repo dotnet/format#2152

Open

MichaelSimons mentioned this pull request Mar 20, 2024

Remove the format repo which was merged into sdk dotnet/installer#19113

Merged

This was referenced Mar 27, 2024

dotnet format: IDE0051 format issues with Razor code behind files with SDK 8.0.200 #39817

Open

IDE0051 format issues with Razor code behind files with SDK 8.0.200 dotnet/format#2127

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move dotnet/format to dotnet/sdk #38857

Move dotnet/format to dotnet/sdk #38857

Cosifne commented Feb 17, 2024 •

edited

Loading

MiYanni left a comment

MiYanni Mar 4, 2024

MiYanni Mar 4, 2024

MiYanni Mar 4, 2024

Cosifne Mar 7, 2024

Cosifne Mar 7, 2024

MiYanni Mar 15, 2024

MichaelSimons commented Mar 7, 2024 •

edited

Loading

Cosifne commented Mar 13, 2024

Cosifne commented Mar 15, 2024

MiYanni left a comment

MiYanni Mar 15, 2024

Cosifne commented Mar 15, 2024

MiYanni commented Mar 15, 2024

Move dotnet/format to dotnet/sdk #38857

Move dotnet/format to dotnet/sdk #38857

Conversation

Cosifne commented Feb 17, 2024 • edited Loading

MiYanni left a comment

Choose a reason for hiding this comment

MiYanni Mar 4, 2024

Choose a reason for hiding this comment

MiYanni Mar 4, 2024

Choose a reason for hiding this comment

MiYanni Mar 4, 2024

Choose a reason for hiding this comment

Cosifne Mar 7, 2024

Choose a reason for hiding this comment

Cosifne Mar 7, 2024

Choose a reason for hiding this comment

MiYanni Mar 15, 2024

Choose a reason for hiding this comment

MichaelSimons commented Mar 7, 2024 • edited Loading

Cosifne commented Mar 13, 2024

Cosifne commented Mar 15, 2024

MiYanni left a comment

Choose a reason for hiding this comment

MiYanni Mar 15, 2024

Choose a reason for hiding this comment

Cosifne commented Mar 15, 2024

MiYanni commented Mar 15, 2024

Cosifne commented Feb 17, 2024 •

edited

Loading

MichaelSimons commented Mar 7, 2024 •

edited

Loading