Skip to content

Commit 224d081

Browse files
SteveGilhamSteveGilham
committed
Address review comments
1 parent 92794cc commit 224d081

File tree

4 files changed

+7
-52
lines changed

4 files changed

+7
-52
lines changed

‎Build/Build.fsproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<PackageReference Include="Fake.DotNet.MSBuild" />
2222
<PackageReference Include="Fake.DotNet.NuGet" />
2323
<PackageReference Include="Fake.DotNet.Testing.NUnit" />
24-
<PackageReference Include="Fake.DotNet.Testing.OpenCover" />
2524
<PackageReference Include="Fake.DotNet.Testing.XUnit2" />
2625
<PackageReference Include="Fake.IO.FileSystem" />
2726
<PackageReference Include="Fake.Tools.Git" />
@@ -31,5 +30,4 @@
3130
<PackageReference Include="Markdig" />
3231
<PackageReference Include="NUnit" />
3332
</ItemGroup>
34-
35-
</Project>
33+
</Project>

‎Directory.Packages.props‎

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,31 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<PackageVersion Include="AltCode.Dixon" Version="2022.1.8.13182" />
5-
<PackageVersion Include="altcode.gendarme" Version="2022.12.6.7345" />
64
<PackageVersion Include="altcover" Version="8.6.125" />
7-
<PackageVersion Include="AltCover.Api" Version="8.6.68" />
85
<PackageVersion Include="AltCover.Fake" Version="8.6.125" />
6+
<PackageVersion Include="Expecto" Version="10.2.3" />
97
<PackageVersion Include="BlackFox.CommandLine" Version="1.0.0" />
108
<PackageVersion Include="BlackFox.VsWhere" Version="1.1.0" />
11-
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.0.0" />
12-
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
13-
<PackageVersion Include="CsvTextFieldParser" Version="1.2.2-preview" />
149
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
15-
<PackageVersion Include="Expecto" Version="10.2.3" />
16-
<PackageVersion Include="Expecto.FsCheck" Version="9.0.4" />
17-
<PackageVersion Include="Expecto.TestResults" Version="8.13.2" />
1810
<PackageVersion Include="FAKE.Core.Environment" Version="6.0.0" />
1911
<PackageVersion Include="FAKE.Core.Process" Version="6.0.0" />
2012
<PackageVersion Include="FAKE.Core.Target" Version="6.0.0" />
21-
<PackageVersion Include="FAKE.Core.Trace" Version="5.23.1" />
2213
<PackageVersion Include="FAKE.DotNet.AssemblyInfoFile" Version="6.0.0" />
2314
<PackageVersion Include="FAKE.DotNet.Cli" Version="6.0.0" />
2415
<PackageVersion Include="FAKE.DotNet.FxCop" Version="6.0.0" />
2516
<PackageVersion Include="FAKE.DotNet.MSBuild" Version="6.0.0" />
2617
<PackageVersion Include="FAKE.DotNet.Nuget" Version="6.0.0" />
2718
<PackageVersion Include="FAKE.DotNet.Testing.NUnit" Version="6.0.0" />
28-
<PackageVersion Include="FAKE.DotNet.Testing.OpenCover" Version="6.0.0" />
2919
<PackageVersion Include="FAKE.DotNet.Testing.XUnit2" Version="6.0.0" />
3020
<PackageVersion Include="FAKE.IO.FileSystem" Version="6.0.0" />
31-
<PackageVersion Include="FAKE.Tools.Git" Version="6.0.0" />
3221
<PackageVersion Include="FAKE.Testing.ReportGenerator" Version="6.0.0" />
33-
<PackageVersion Include="FsCheck" Version="2.16.5" />
22+
<PackageVersion Include="FAKE.Tools.Git" Version="6.0.0" />
3423
<PackageVersion Include="FSharp.Core" Version="9.0.303" />
35-
<PackageVersion Include="FsUnit" Version="5.1.0" />
36-
<!-- PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" / -->
3724
<PackageVersion Include="Markdig" Version="0.41.3" />
3825
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
39-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
40-
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="16.0.0" />
41-
<PackageVersion Include="Mono.Cecil" Version="0.11.4" />
42-
<PackageVersion Include="Mono.Options" Version="6.12.0.148" />
43-
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
44-
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
45-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
46-
<PackageVersion Include="NuGet.CommandLine" Version="6.14.0" />
4726
<PackageVersion Include="NUnit" Version="4.4.0" />
4827
<PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
49-
<!-- This one w/just net20/net40 agents works as before on Linux for the AltCoverRunner test -->
50-
<PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' != 'Windows_NT'" Version="3.12.0" />
51-
<!-- This one w/extra netcore3.1 agent causes mono vs framework problems for some reason on the AltCoverRunner test -->
52-
<PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" Version="3.16.0" />
53-
<PackageVersion Include="OpenCover" Version="4.7.1221" />
54-
<PackageVersion Include="Pester" Version="5.3.3" />
55-
<PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
56-
<PackageVersion Include="System.Collections.Immutable" Version="5.0.0" />
57-
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
58-
<PackageVersion Include="System.Reactive.Core" Version="5.0.0" />
59-
<PackageVersion Include="System.Security.Permissions" Version="7.0.0" />
60-
<PackageVersion Include="Unquote" Version="6.1.0" />
61-
<PackageVersion Include="XmlDoc2CmdletDoc" Version="0.4.0-dotnetcore0001" />
62-
<PackageVersion Include="xunit" Version="2.4.2" />
63-
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
64-
<PackageVersion Include="xunit.analyzers" Version="1.0.0" />
28+
<PackageVersion Include="NuGet.CommandLine" Version="6.14.0" />
6529
<PackageVersion Include="xunit.assert" Version="2.9.3" />
66-
<PackageVersion Include="xunit.core" Version="2.4.2" />
67-
<PackageVersion Include="xunit.extensibility.core" Version="2.4.2" />
68-
<PackageVersion Include="xunit.extensibility.execution" Version="2.4.2" />
69-
<PackageVersion Include="xunit.runner.console" Version="2.4.2" />
70-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
71-
<PackageVersion Include="YamlDotNet" Version="12.0.2" />
72-
<PackageVersion Include="YoloDev.Expecto.TestSdk" Version="1.0.0" />
7330
</ItemGroup>
7431
</Project>

‎FakeForAltCodeTestBuild.slnx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Folder Name="/Solution Items/">
33
<File Path=".config/dotnet-tools.json" />
44
<File Path=".github/workflows/main.yml" />
5-
<File Path="Build/build-rules.xml" />
65
<File Path="Build/Directory.Build.props" />
6+
<File Path="Build/rules-fake.xml" />
77
<File Path="Directory.Build.props" />
88
<File Path="Directory.Build.targets" />
99
<File Path="Directory.Packages.props" />

‎fullbuild.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dotnet tool restore
2-
dotnet run --project .\Build\setup.fsproj
3-
dotnet run --project .\Build\build.fsproj
2+
dotnet run --project .\Build\Setup.fsproj
3+
dotnet run --project .\Build\Build.fsproj

0 commit comments

Comments
 (0)