Skip to content

Commit 9145cd3

Browse files
SteveGilhamSteveGilham
committed
Merge branch 'develop/maintenance' into develop/Indori
# Conflicts: # .github/workflows/main.yml # Directory.Packages.props # global.json
2 parents 2e32f8a + 0cd69fb commit 9145cd3

19 files changed

+57
-182
lines changed

‎AltCover.Api.Tests/AltCover.Api.Tests.fsproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,6 @@
7474
<PackageReference Include="FSharp.Core">
7575
<ExcludeAssets>contentfiles</ExcludeAssets>
7676
</PackageReference>
77-
<PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
78-
<Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
79-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
80-
</Reference>
81-
<Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
82-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
83-
</Reference>
84-
<Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
85-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
86-
</Reference>
87-
<Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
88-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
89-
</Reference>
90-
<Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
91-
<HintPath>..\ThirdParty\Unquote.dll</HintPath>
92-
</Reference>
9377
</ItemGroup>
9478

9579
<ItemGroup>

‎AltCover.Engine/AltCover.Engine.fsproj

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,7 @@
8080
<PrivateAssets>all</PrivateAssets>
8181
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
8282
</PackageReference>
83-
<PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
84-
<Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
85-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
86-
</Reference>
87-
<Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
88-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
89-
</Reference>
90-
<Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
91-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
92-
</Reference>
93-
<Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
94-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
95-
</Reference>
83+
<PackageReference Include="Mono.Cecil" />
9684
<PackageReference Include="System.IO.Compression" />
9785
<PackageReference Include="FSharp.Core">
9886
<ExcludeAssets>contentfiles</ExcludeAssets>

‎AltCover.PowerShell/AltCover.PowerShell.fsproj

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,6 @@
3535
<PackageReference Include="FSharp.Core">
3636
<ExcludeAssets>contentfiles</ExcludeAssets>
3737
</PackageReference>
38-
<PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
39-
<Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
40-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
41-
</Reference>
42-
<Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
43-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
46-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
49-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
50-
</Reference>
5138
</ItemGroup>
5239

5340
<ItemGroup>

‎AltCover.Toolkit/AltCover.Toolkit.fsproj

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,6 @@
4848
<PackageReference Include="FSharp.Core">
4949
<ExcludeAssets>contentfiles</ExcludeAssets>
5050
</PackageReference>
51-
<PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
52-
<Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
53-
<HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
56-
<HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
57-
</Reference>
58-
<Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
59-
<HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
60-
</Reference>
61-
<Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
62-
<HintPath>$(MSBuildThisFileDirectory)\..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
63-
</Reference>
6451
</ItemGroup>
6552

6653
<ItemGroup>

‎AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<AssemblyName>AltCover.ValidateGendarmeEmulation</AssemblyName>
1010
<OtherFlags />
1111
<SignAssembly>false</SignAssembly>
12-
<NoWarn Condition="'$(LocalCecil)' == 'true'">MSB3277</NoWarn>
1312
</PropertyGroup>
1413

1514
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -26,19 +25,7 @@
2625
<Reference Include="Gendarme.Rules.Maintainability">
2726
<HintPath>$(GendarmeToolDir)Gendarme.Rules.Maintainability.dll</HintPath>
2827
</Reference>
29-
<PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
30-
<Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
31-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
32-
</Reference>
33-
<Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
34-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
35-
</Reference>
36-
<Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
37-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
38-
</Reference>
39-
<Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
40-
<HintPath>$(SolutionDir)\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
41-
</Reference>
28+
<PackageReference Include="mono.cecil" />
4229
<Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
4330
<HintPath>..\ThirdParty\Unquote.dll</HintPath>
4431
</Reference>

‎AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,10 @@
3333
<PackageReference Include="NUnit" Condition="'$(TargetFramework)' != 'net472'" />
3434
<PackageReference Include="NUnit" VersionOverride="3.14.0" Condition="'$(TargetFramework)' == 'net472'" />
3535
<PackageReference Include="YoloDev.Expecto.TestSdk" Condition="'$(TargetFramework)' != 'net472'" />
36+
<PackageReference Include="Mono.Cecil" />
3637
<PackageReference Include="FSharp.Core">
3738
<ExcludeAssets>contentfiles</ExcludeAssets>
3839
</PackageReference>
39-
<PackageReference Include="Mono.Cecil" Condition="'$(LocalCecil)' != 'true'" />
40-
<Reference Include="Mono.Cecil" Condition="'$(LocalCecil)' == 'true'">
41-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Mono.Cecil.Rocks" Condition="'$(LocalCecil)' == 'true'">
44-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Rocks.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Mono.Cecil.Mdb" Condition="'$(LocalCecil)' == 'true'">
47-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Mdb.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Mono.Cecil.Pdb" Condition="'$(LocalCecil)' == 'true'">
50-
<HintPath>..\ThirdParty\cecil\Mono.Cecil.Pdb.dll</HintPath>
51-
</Reference>
52-
<Reference Include="Unquote" Condition="'$(TargetFramework)' == 'net472'">
53-
<HintPath>..\ThirdParty\Unquote.dll</HintPath>
54-
</Reference>
5540
</ItemGroup>
5641

5742
<ItemGroup>

‎Build/NuGet.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="ILRepack"/>
19+
<PackageReference Include="ILRepack">
20+
<PrivateAssets>all</PrivateAssets>
21+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
22+
</PackageReference>
2023
<PackageReference Include="Mono.Options" />
2124
<PackageReference Include="NUnit.ConsoleRunner" />
2225
<PackageReference Include="OpenCover" />
@@ -28,6 +31,6 @@
2831
<PackageReference Include="AltCode.Dixon" />
2932
<PackageReference Include="altcode.gendarme" />
3033
<PackageReference Include="XmlDoc2CmdletDoc" />
31-
<PackageReference Include="System.ValueTuple" VersionOverride="4.0.0-rc3-24212-01"/>
34+
<PackageReference Include="System.ValueTuple" VersionOverride="4.0.0-rc3-24212-01" />
3235
</ItemGroup>
3336
</Project>

‎Build/targets.fs

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,6 @@ module Targets =
3939
let mutable Copyright = String.Empty
4040
let mutable Version = String.Empty
4141

42-
let localCecil =
43-
let xml =
44-
"./Directory.Build.props"
45-
|> Path.getFullName
46-
|> XDocument.Load
47-
48-
xml.Descendants()
49-
|> Seq.filter (fun (e: XElement) ->
50-
e.Name.LocalName.Equals("LocalCecil", StringComparison.OrdinalIgnoreCase))
51-
|> Seq.map (fun x -> x.Value |> Boolean.TryParse |> snd)
52-
|> Seq.tryLast
53-
|> Option.defaultValue false
54-
55-
printfn "Local Cecil = %A" localCecil
56-
5742
let currentBranch =
5843
"."
5944
|> Path.getFullName
@@ -600,13 +585,7 @@ module Targets =
600585
let dotnetBuildDebug proj =
601586
DotNet.build
602587
(fun p ->
603-
{ p.WithCommon(
604-
dotnetOptions
605-
>> dotnetOptionsWithSkipGtkInstall
606-
>> (fun o ->
607-
{ o with
608-
Verbosity = Some DotNet.Verbosity.Minimal })
609-
) with
588+
{ p.WithCommon(dotnetOptions >> dotnetOptionsWithSkipGtkInstall) with
610589
Configuration = DotNet.BuildConfiguration.Debug }
611590
|> buildWithCLIArguments)
612591
(Path.GetFullPath proj)
@@ -1453,13 +1432,13 @@ module Targets =
14531432
@@ "gtksharp/"
14541433
+ (ddItem "gtksharp")
14551434
+ "/lib/netstandard2.0"
1456-
if localCecil then
1457-
Path.GetFullPath "./ThirdParty/cecil"
1458-
else
1459-
nugetCache
1460-
@@ "mono.cecil/"
1461-
+ (ddItem "mono.cecil")
1462-
+ "/lib/netstandard2.0"
1435+
//if localCecil then
1436+
// Path.GetFullPath "./ThirdParty/cecil"
1437+
//else
1438+
nugetCache
1439+
@@ "mono.cecil/"
1440+
+ (ddItem "mono.cecil")
1441+
+ "/lib/netstandard2.0"
14631442
nugetCache
14641443
@@ "mono.options/"
14651444
+ (ddItem "mono.options")
@@ -1508,20 +1487,10 @@ module Targets =
15081487
|> Path.getFullName
15091488
|> XDocument.Load
15101489

1511-
let skip =
1512-
if localCecil then
1513-
"mono.cecil"
1514-
else
1515-
"$$$$$$$"
1516-
15171490
let packages =
15181491
xml.Descendants(XName.Get("PackageReference"))
15191492
|> Seq.filter (_.Attribute(XName.Get("Include")) >> isNull >> not)
15201493
|> Seq.map _.Attribute(XName.Get("Include")).Value
1521-
|> Seq.filter (
1522-
_.Equals(skip, StringComparison.OrdinalIgnoreCase)
1523-
>> not
1524-
) //CECIL
15251494
|> Seq.toList
15261495

15271496
let dirs =
@@ -4564,12 +4533,10 @@ module Targets =
45644533
"AltCover.Cake"
45654534
"AltCover.Base"
45664535
"Recorder"
4567-
"Mono"
45684536
"DataCollector"
45694537
"FSharp" ]
45704538
InPlace = false
45714539
ReportFormat = "OpenCover"
4572-
LocalSource = true
45734540
Save = true
45744541
VisibleBranches = true }
45754542
)

‎Directory.Build.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
77
<!-- .nuget\packages\dotnet.reproduciblebuilds.isolated\x.x.x\Sdk\Sdk.targets -->
88
<EnsureNETFrameworkReferenceAssembliesProvided>false</EnsureNETFrameworkReferenceAssembliesProvided>
9-
<LocalCecil>true</LocalCecil>
109
</PropertyGroup>
1110
<ItemGroup>
1211
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All" />
13-
<PackageReference Include="Nerdbank.GitVersioning"
14-
Condition="('$(TargetFramework)' != 'net20') AND ('$(Configuration)'!='Debug')">
12+
<PackageReference Include="Nerdbank.GitVersioning"
13+
Condition="('$(TargetFramework)' != 'net20') AND ('$(Configuration)'!='Debug')" >
1514
<PrivateAssets>all</PrivateAssets>
1615
</PackageReference>
1716
</ItemGroup>

0 commit comments

Comments
 (0)