Skip to content

Commit 78c5c07

Browse files
committed
(build) update to cake 2.1.0
- remove dotnet format custom code, use the build-in code
1 parent 7b0fac6 commit 78c5c07

File tree

8 files changed

+12
-188
lines changed

8 files changed

+12
-188
lines changed

build/.run/Code Format.run.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Code Format" type="DotNetProject" factoryName=".NET Project">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=CodeFormat" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=CodeFormat --verbosity=diagnostic" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
1717
<option name="Build" />
1818
</method>
1919
</configuration>
20-
</component>
20+
</component>

build/Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="Cake.Common" Version="2.0.0" />
3+
<PackageReference Include="Cake.Common" Version="2.1.0" />
44
<PackageReference Include="Cake.Compression" Version="0.2.6" />
5-
<PackageReference Include="Cake.Frosting" Version="2.0.0" />
6-
<PackageReference Include="Cake.Incubator" Version="6.0.0" />
5+
<PackageReference Include="Cake.Frosting" Version="2.1.0" />
6+
<PackageReference Include="Cake.Incubator" Version="7.0.0" />
77

8-
<PackageReference Include="Cake.Docker" Version="1.0.0" />
8+
<PackageReference Include="Cake.Docker" Version="1.1.1" />
99

1010
</ItemGroup>
1111
</Project>

build/build/Tasks/CodeFormat.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Common.Addins.Cake.DotNetFormat;
1+
using Cake.Common.Tools.DotNet.Format;
22
using Common.Utilities;
33

44
namespace Build.Tasks;
@@ -10,14 +10,9 @@ public class CodeFormat : FrostingTask<BuildContext>
1010
public override void Run(BuildContext context)
1111
{
1212
context.Information("Code format...");
13-
context.DotNetFormat(new DotNetFormatSettings
13+
context.DotNetFormat(Paths.Build.FullPath);
14+
context.DotNetFormat(Paths.Src.FullPath, new DotNetFormatSettings
1415
{
15-
Workspace = Paths.Build
16-
});
17-
18-
context.DotNetFormat(new DotNetFormatSettings
19-
{
20-
Workspace = Paths.Src,
2116
Exclude = new List<string> { " **/AddFormats/" }
2217
});
2318
}

build/chores/chores.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<RootNamespace>Chores</RootNamespace>
55
</PropertyGroup>
66
<ItemGroup>
7-
<ProjectReference Include="..\common\common.csproj"/>
7+
<ProjectReference Include="..\common\common.csproj" />
88
</ItemGroup>
99
<ItemGroup>
10-
<PackageReference Include="Cake.Json" Version="6.0.1"/>
10+
<PackageReference Include="Cake.Json" Version="7.0.1" />
1111
</ItemGroup>
1212
</Project>

build/common/Addins/Cake.DotNetFormat/DotNetFormatAliases.cs

Lines changed: 0 additions & 32 deletions
This file was deleted.

build/common/Addins/Cake.DotNetFormat/DotNetFormatSettings.cs

Lines changed: 0 additions & 79 deletions
This file was deleted.

build/common/Addins/Cake.DotNetFormat/DotNetFormatToolRunner.cs

Lines changed: 0 additions & 60 deletions
This file was deleted.

build/docs/docs.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ProjectReference Include="..\common\common.csproj" />
88
</ItemGroup>
99
<ItemGroup>
10-
<PackageReference Include="Cake.Git" Version="1.1.0" />
10+
<PackageReference Include="Cake.Git" Version="2.0.0" />
1111
<PackageReference Include="Cake.Wyam2" Version="3.0.0-rc2" />
1212
</ItemGroup>
1313
</Project>

0 commit comments

Comments
 (0)