Skip to content

Commit 02c56f8

Browse files
authored
Merge pull request #22489 from dotnet/darc-main-2eb28ba1-df04-43b7-a838-6fe81ccea649
[main] Update dependencies from dotnet/format
2 parents a785861 + 38e6591 commit 02c56f8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@
7979
<Sha>6d626ff0752a77d339f609b4d361787dc9ca93a5</Sha>
8080
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
8181
</Dependency>
82-
<Dependency Name="dotnet-format" Version="6.0.243105">
82+
<Dependency Name="dotnet-format" Version="7.0.255601">
8383
<Uri>https://github.com/dotnet/format</Uri>
84-
<Sha>d6223d0358efdc569701904d8e6e628a722de802</Sha>
84+
<Sha>e645885cce5590e34c4a2c609d320ea963e4ecd0</Sha>
8585
</Dependency>
8686
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-6.21555.3">
8787
<Uri>https://github.com/dotnet/roslyn</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependencies from https://github.com/dotnet/format -->
92-
<dotnetformatVersion>6.0.243105</dotnetformatVersion>
92+
<dotnetformatVersion>7.0.255601</dotnetformatVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

src/Layout/redist/targets/GenerateLayout.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
</PropertyGroup>
7373

7474
<ItemGroup>
75-
<DotnetFormatDllFiles Include="$(Pkgdotnet-format)/tools/netcoreapp3.1/any/**/*.dll" />
76-
<DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/netcoreapp3.1/any/**/*.json" />
77-
<DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/netcoreapp3.1/any/**/*.config" />
75+
<DotnetFormatDllFiles Include="$(Pkgdotnet-format)/tools/net6.0/any/**/*.dll" />
76+
<DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/net6.0/any/**/*.json" />
77+
<DotnetFormatConfigFiles Include="$(Pkgdotnet-format)/tools/net6.0/any/**/*.config" />
7878
</ItemGroup>
7979

8080
<Error Condition="'@(DotnetFormatDllFiles)' == ''" Text="Something moved around in dotnet-format package, adjust code here accordingly. TFM change?" />

0 commit comments

Comments
 (0)