Skip to content

Commit 46e768b

Browse files
committed
Revert "Avoid dotnet format hang"
This reverts commit 20e285c. This workaround is no longer needed with the 9.0.200 .NET SDK.
1 parent 1e00ddc commit 46e768b

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

Directory.Packages.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
<ItemGroup Label="Library.Template">
2020
<GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" />
2121
<GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
22-
<!-- The condition works around https://github.com/dotnet/sdk/issues/44951 -->
23-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" Condition="!('$(TF_BUILD)'=='true' and '$(dotnetformat)'=='true')" />
22+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
2423
<GlobalPackageReference Include="PolySharp" Version="1.15.0" />
2524
<GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.556" />
2625
</ItemGroup>
27-
</Project>
26+
</Project>

azure-pipelines/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ jobs:
3737
- template: dotnet.yml
3838
parameters:
3939
RunTests: ${{ parameters.RunTests }}
40-
- script: dotnet format --verify-no-changes
40+
- script: dotnet format --verify-no-changes --no-restore
4141
displayName: 💅 Verify formatted code
42-
env:
43-
dotnetformat: true # part of a workaround for https://github.com/dotnet/sdk/issues/44951
4442
- template: expand-template.yml
4543

4644
- job: macOS

0 commit comments

Comments
 (0)