diff --git a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
index b1561e51e..ae26692d9 100644
--- a/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
+++ b/AltCover.Api.Tests/AltCover.Api.Tests.fsproj
@@ -7,13 +7,8 @@
false
Exe
Library
-
$(AssemblySearchPaths);{GAC}
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
DEBUG;TRACE
- Major
diff --git a/AltCover.Avalonia.FuncUI/AltCover.Avalonia.FuncUI.fsproj b/AltCover.Avalonia.FuncUI/AltCover.Avalonia.FuncUI.fsproj
index c1eeeb210..1bbbb7494 100644
--- a/AltCover.Avalonia.FuncUI/AltCover.Avalonia.FuncUI.fsproj
+++ b/AltCover.Avalonia.FuncUI/AltCover.Avalonia.FuncUI.fsproj
@@ -8,34 +8,13 @@
false
True
altcover.visualizer
- true
AVALONIA
- $(ProjectDir)..\_Binaries/$(AssemblyName).FuncUI/$(Configuration)+$(Platform)/
- $(ProjectDir)..\_Intermediate/$(AssemblyName).FuncUI/$(Configuration)+$(Platform)/
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
- Major
- false
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- true
- 5
- true
-
- 52
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.Avalonia/AltCover.Avalonia.fsproj b/AltCover.Avalonia/AltCover.Avalonia.fsproj
index 545dc1895..9602c37df 100644
--- a/AltCover.Avalonia/AltCover.Avalonia.fsproj
+++ b/AltCover.Avalonia/AltCover.Avalonia.fsproj
@@ -5,39 +5,17 @@
netcoreapp2.1
AltCover.Visualizer
AltCover.Visualizer
- false
True
altcover.visualizer
- true
AVALONIA;$(TOGGLE)
- $(ProjectDir)..\_Binaries/$(AssemblyName).Avalonia/$(Configuration)+$(Platform)/
- $(ProjectDir)..\_Intermediate/$(AssemblyName).Avalonia/$(Configuration)+$(Platform)/
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
True
$(ProjectDir)../AltCover.Visualizer/Resource.res
- Major
- false
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- true
- 5
- true
-
- 52
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.Cake/AltCover.Cake.csproj b/AltCover.Cake/AltCover.Cake.csproj
index f19907017..19ec0b994 100644
--- a/AltCover.Cake/AltCover.Cake.csproj
+++ b/AltCover.Cake/AltCover.Cake.csproj
@@ -6,32 +6,14 @@
false
AltCover.Cake
AltCover.Cake
- true
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- true
- true
-
-
-
- false
- false
-
-
- true
- true
+
+ false
TRACE;DEBUG;CODE_ANALYSIS
- true
-
-
- true
TRACE
diff --git a/AltCover.DataCollector/AltCover.DataCollector.csproj b/AltCover.DataCollector/AltCover.DataCollector.csproj
index 17777ff52..f5b10dcae 100644
--- a/AltCover.DataCollector/AltCover.DataCollector.csproj
+++ b/AltCover.DataCollector/AltCover.DataCollector.csproj
@@ -5,25 +5,8 @@
netstandard2.0
AltCover
AltCover.DataCollector
- false
- true
- $(ProjectDir)../
- true
- $(SolutionDir)\Build\Infrastructure.snk
1701;1702;NU1603
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- true
- true
-
-
-
- false
- false
-
-
- true
- true
+
diff --git a/AltCover.DotNet/AltCover.DotNet.fsproj b/AltCover.DotNet/AltCover.DotNet.fsproj
index 4620d3c94..2d5d75ce7 100644
--- a/AltCover.DotNet/AltCover.DotNet.fsproj
+++ b/AltCover.DotNet/AltCover.DotNet.fsproj
@@ -5,34 +5,13 @@
netstandard2.0
AltCover.DotNet
AltCover.DotNet
- false
- true
RUNNER
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- 4
- true
-
- true
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.Engine/AltCover.Engine.fsproj b/AltCover.Engine/AltCover.Engine.fsproj
index 9dc5e3c57..c5b83c499 100644
--- a/AltCover.Engine/AltCover.Engine.fsproj
+++ b/AltCover.Engine/AltCover.Engine.fsproj
@@ -5,32 +5,16 @@
netstandard2.0
AltCover
AltCover.Engine
- false
RUNNER
- true
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- --keyfile:$(SolutionDir)Build\Infrastructure.snk
- false
- false
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- 4
- true
-
- 52
- true
- true
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj b/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj
index 3d700f066..cf095cd34 100644
--- a/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj
+++ b/AltCover.Expecto.Tests/AltCover.Expecto.Tests.fsproj
@@ -3,8 +3,6 @@
Exe
net6.0
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
DEBUG;TRACE;EXPECTO_MAIN
false
diff --git a/AltCover.Fake.DotNet.Testing.AltCover/AltCover.Fake.DotNet.Testing.AltCover.fsproj b/AltCover.Fake.DotNet.Testing.AltCover/AltCover.Fake.DotNet.Testing.AltCover.fsproj
index 80da7f9f6..360e85526 100644
--- a/AltCover.Fake.DotNet.Testing.AltCover/AltCover.Fake.DotNet.Testing.AltCover.fsproj
+++ b/AltCover.Fake.DotNet.Testing.AltCover/AltCover.Fake.DotNet.Testing.AltCover.fsproj
@@ -5,36 +5,15 @@
netstandard2.0
AltCover.Fake.DotNet.Testing.AltCover
AltCover.Fake.DotNet.Testing.AltCover
- false
- true
NoCanonicalDirectories
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- --keyfile:$(SolutionDir)Build\Infrastructure.snk
MSB3277;MSB3245
-
- false
- false
-
-
- true
- true
-
-
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- 4
- true
-
- true
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.Fake/AltCover.Fake.fsproj b/AltCover.Fake/AltCover.Fake.fsproj
index 06fbb4d82..9d7253833 100644
--- a/AltCover.Fake/AltCover.Fake.fsproj
+++ b/AltCover.Fake/AltCover.Fake.fsproj
@@ -5,34 +5,13 @@
netstandard2.0
AltCover.Fake
AltCover.Fake
- false
- true
RUNNER
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- --keyfile:$(SolutionDir)Build\Infrastructure.snk
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- 4
- true
-
- true
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.FontSupport/AltCover.FontSupport.csproj b/AltCover.FontSupport/AltCover.FontSupport.csproj
index 701bfa110..2b03a0811 100644
--- a/AltCover.FontSupport/AltCover.FontSupport.csproj
+++ b/AltCover.FontSupport/AltCover.FontSupport.csproj
@@ -5,32 +5,15 @@
AltCover.FontSupport
AltCover.FontSupport
false
- true
- $(ProjectDir)../
- true
- $(SolutionDir)\Build\Infrastructure.snk
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
1701;1702;8002
NU1605
- true
- true
-
-
-
- false
- false
-
-
- true
- true
+
TRACE;DEBUG;CODE_ANALYSIS
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj b/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj
index 54932035c..6580b4012 100644
--- a/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj
+++ b/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj
@@ -9,12 +9,8 @@
Library
$(AssemblySearchPaths);{GAC}
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
DEBUG;TRACE;CODE_ANALYSIS;Monitor
DEBUG;TRACE;CODE_ANALYSIS;Monitor;BUILD_ON_APPVEYOR
- Major
diff --git a/AltCover.Monitor/AltCover.Monitor.csproj b/AltCover.Monitor/AltCover.Monitor.csproj
index da74cd463..f97b9e454 100644
--- a/AltCover.Monitor/AltCover.Monitor.csproj
+++ b/AltCover.Monitor/AltCover.Monitor.csproj
@@ -4,36 +4,13 @@
net20;netstandard2.0
AltCover
AltCover.Monitor
- false
- true
- $(ProjectDir)../
- true
- $(SolutionDir)\Build\Infrastructure.snk
1701;1702;NU1603
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- true
- true
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS
- true
-
-
- true
TRACE
diff --git a/AltCover.PowerShell/AltCover.PowerShell.fsproj b/AltCover.PowerShell/AltCover.PowerShell.fsproj
index a54f6704a..d7aa37876 100644
--- a/AltCover.PowerShell/AltCover.PowerShell.fsproj
+++ b/AltCover.PowerShell/AltCover.PowerShell.fsproj
@@ -5,35 +5,13 @@
netstandard2.0
AltCover.PowerShell
AltCover.PowerShell
- false
- true
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- --tailcalls+ --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
- 4
- true
-
- true
- true
TRACE;$(GlobalDefineConstants)
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
diff --git a/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj b/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj
index 95563157c..81c81d1f9 100644
--- a/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj
+++ b/AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj
@@ -5,24 +5,16 @@
false
AltCover.Recorder.Tests
false
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
NU1702
NU1702
- Major
- false
- false
TRACE;DEBUG;ALTCOVER_TEST;$(ExtraDefines)
- --tailcalls+ --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
TRACE;RELEASE;ALTCOVER_TEST;$(ExtraDefines)
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
diff --git a/AltCover.Recorder/AltCover.Recorder.fsproj b/AltCover.Recorder/AltCover.Recorder.fsproj
index 5e88ae63b..16e02278e 100644
--- a/AltCover.Recorder/AltCover.Recorder.fsproj
+++ b/AltCover.Recorder/AltCover.Recorder.fsproj
@@ -4,27 +4,18 @@
net20;net46
AltCover.Recorder
AltCover.Recorder
- false
- true
false
false
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
false
TRACE
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk --standalone --staticlink:ICSharpCode.SharpZipLib
+ $(OtherFlags) --standalone --staticlink:ICSharpCode.SharpZipLib
TRACE;DEBUG;CODE_ANALYSIS
- 4
- 52
- true
-
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
diff --git a/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj b/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj
index b7e054de9..b6da0f577 100644
--- a/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj
+++ b/AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj
@@ -1,29 +1,21 @@
- net6.0
+ net6.0;net48
false
AltCover.Recorder2.Tests
false
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
-
NU1702
NU1702
- Major
- false
- false
TRACE;DEBUG;ALTCOVER_TEST;$(ExtraDefines)
- --tailcalls+ --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
TRACE;RELEASE;ALTCOVER_TEST;$(ExtraDefines)
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
+
@@ -67,9 +59,6 @@
-
- ..\_Binaries\AltCover.Recorder\Debug+AnyCPU\net20\AltCover.Hallmark.dll
-
..\_Binaries\AltCover.Recorder\Debug+AnyCPU\net20\AltCover.Recorder.dll
diff --git a/AltCover.Tests/AltCover.Tests.fsproj b/AltCover.Tests/AltCover.Tests.fsproj
index 5ae6f502c..6dd933b47 100644
--- a/AltCover.Tests/AltCover.Tests.fsproj
+++ b/AltCover.Tests/AltCover.Tests.fsproj
@@ -6,12 +6,7 @@
AltCover.Tests
MONO
WINDOWS
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
- Major
TRACE;$(ExtraDefines)
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
diff --git a/AltCover.Toolkit/AltCover.Toolkit.fsproj b/AltCover.Toolkit/AltCover.Toolkit.fsproj
index 336deabd9..fb25b0ba4 100644
--- a/AltCover.Toolkit/AltCover.Toolkit.fsproj
+++ b/AltCover.Toolkit/AltCover.Toolkit.fsproj
@@ -5,34 +5,13 @@
netstandard2.0
AltCover.Toolkit
AltCover.Toolkit
- false
- true
RUNNER
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- 4
- true
-
- true
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.UICommon/AltCover.UICommon.fsproj b/AltCover.UICommon/AltCover.UICommon.fsproj
index a34913a45..8d3fef4a0 100644
--- a/AltCover.UICommon/AltCover.UICommon.fsproj
+++ b/AltCover.UICommon/AltCover.UICommon.fsproj
@@ -5,34 +5,14 @@
netstandard2.0
AltCover.UICommon
AltCover.UICommon
- false
- true
GUI;LITEVERSION;$(TOGGLE)
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
false
-
- false
- false
-
-
- true
- true
-
-
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- 4
- true
-
- true
- true
TRACE;$(GlobalDefineConstants)
diff --git a/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj b/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj
index 2e63187fe..c8bf9ef3e 100644
--- a/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj
+++ b/AltCover.ValidateGendarmeEmulation/AltCover.ValidateGendarmeEmulation.fsproj
@@ -10,9 +10,6 @@
$(NuGetCache)/altcode.gendarme-tool/$(GendarmeVersion)/tools/netcoreapp2.1/any/
false
AltCover.ValidateGendarmeEmulation
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- Major
TRACE;DEBUG;CODE_ANALYSIS;ValidateGendarmeEmulation
diff --git a/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj b/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj
index dfe3a99c9..014d3c214 100644
--- a/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj
+++ b/AltCover.Visualizer.Tests/AltCover.Visualizer.Tests.fsproj
@@ -6,20 +6,15 @@
false
AltCover.Tests.Visualizer
GUI
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- Major
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- --tailcalls+ --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
TRACE;$(GlobalDefineConstants)
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
-
+
988
diff --git a/AltCover.Visualizer/AltCover.Visualizer.fsproj b/AltCover.Visualizer/AltCover.Visualizer.fsproj
index 70a0ff1e9..ca06cf2f3 100644
--- a/AltCover.Visualizer/AltCover.Visualizer.fsproj
+++ b/AltCover.Visualizer/AltCover.Visualizer.fsproj
@@ -5,42 +5,20 @@
netcoreapp2.1;net472
AltCover.Visualizer
AltCover.Visualizer
- false
x86
True
altcover.visualizer
AltCover.Visualizer
- true
GUI;$(TOGGLE)
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
True
$(ProjectDir)Resource.res
- Major
- false
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS;$(GlobalDefineConstants)
- --tailcalls+ --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
- 4
- true
-
- true
TRACE;$(GlobalDefineConstants)
- --keyfile:$(ProjectDir)..\Build\Infrastructure.snk
diff --git a/AltCover/AltCover.fsproj b/AltCover/AltCover.fsproj
index 4ca059fa6..930768183 100644
--- a/AltCover/AltCover.fsproj
+++ b/AltCover/AltCover.fsproj
@@ -7,40 +7,16 @@
True
AltCover
AltCover
- false
- true
AltCover.ico
- $(ProjectDir)../
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml
- --keyfile:$(SolutionDir)Build\Infrastructure.snk
True
$(ProjectDir)Resource.res
- Major
- false
-
-
-
- false
- false
-
-
- true
- true
TRACE;DEBUG;CODE_ANALYSIS
TRACE;DEBUG;CODE_ANALYSIS;GLOBALTOOL
- 4
- true
-
- 52
- true
- true
TRACE
TRACE;GLOBALTOOL
diff --git a/Build/targets.fsx b/Build/targets.fsx
index 0a0032d1c..dcaca83bd 100644
--- a/Build/targets.fsx
+++ b/Build/targets.fsx
@@ -287,8 +287,7 @@ let cliArguments =
ConsoleLogParameters = []
DistributedLoggers = None
Properties =
- [ ("CheckEolTargetFramework", "false")
- ("ContinuousIntegrationBuild", "false") ]
+ [ ]
DisableInternalBinLog = true }
let withWorkingDirectoryVM dir o =
@@ -443,17 +442,17 @@ let msbuildCommon (p: MSBuildParams) =
DistributedLoggers = None
DisableInternalBinLog = true
Properties =
- [ "CheckEolTargetFramework", "false"
- "ContinuousIntegrationBuild", "false"
- "DebugSymbols", "True" ] }
+ [ "DebugSymbols", "True" ] }
let withDebug (p: MSBuildParams) =
{ p with
- Properties = ("Configuration", "Debug") :: p.Properties }
+ Properties = ("Configuration", "Debug") :: p.Properties
+ DoRestore = true }
let withRelease (p: MSBuildParams) =
{ p with
- Properties = ("Configuration", "Release") :: p.Properties }
+ Properties = ("Configuration", "Release") :: p.Properties
+ DoRestore = true }
let splitCommandLine line =
line
@@ -696,29 +695,6 @@ module SolutionRoot =
if not (old.Equals(hack)) then
File.WriteAllText(path, hack)
- [ "./AltCover.Recorder/AltCover.Recorder.fsproj" // net20 resgen ?? https://docs.microsoft.com/en-us/visualstudio/msbuild/generateresource-task?view=vs-2019
- "./AltCover.Recorder.Tests/AltCover.Recorder.Tests.fsproj"
- "./AltCover.Recorder2.Tests/AltCover.Recorder2.Tests.fsproj"
- "./Samples/Sample25/Sample25.fsproj" ]
- |> Seq.iter
- (fun f ->
- let dir = Path.GetDirectoryName f
- let proj = Path.GetFileName f
-
- DotNet.restore
- (fun o ->
- let tmp = o.WithCommon(withWorkingDirectoryVM dir)
-
- let mparams =
- { tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
-
- { tmp with MSBuildParams = mparams })
- proj)
-
do
let xml =
XDocument.Load("./AltCover.Recorder/Strings.resx")
@@ -832,11 +808,12 @@ _Target
Shell.copyFile "/tmp/.AltCover_SourceLink/Sample14.SourceLink.Class3.cs")
"./Samples/Sample14/Sample14/Class3.txt"
- [ "./AltCover.Recorder.sln" ]
- |> Seq.iter (msbuildDebug MSBuildPath) // net20
-
- [ "./AltCover.Recorder.sln" ]
- |> Seq.iter (msbuildRelease MSBuildPath) // net20
+ // net20 and such
+ [
+ msbuildDebug MSBuildPath
+ msbuildRelease MSBuildPath
+ ]
+ |> List.iter (fun f -> f "./AltCover.Recorder.sln")
[ "./AltCover.sln"
"./AltCover.Visualizer.sln"
@@ -2189,10 +2166,7 @@ _Target
let mparams =
{ tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
+ Properties = tmp.MSBuildParams.Properties }
{ tmp with MSBuildParams = mparams })
proj
@@ -3948,10 +3922,7 @@ _Target
Configuration = DotNet.BuildConfiguration.Release
MSBuildParams =
{ options.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: options.MSBuildParams.Properties }
+ Properties = options.MSBuildParams.Properties }
Framework = Some "netcoreapp2.0" })
netcoresource
@@ -3962,10 +3933,7 @@ _Target
Configuration = DotNet.BuildConfiguration.Release
MSBuildParams =
{ options.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: options.MSBuildParams.Properties }
+ Properties = options.MSBuildParams.Properties }
Framework = Some "netcoreapp2.1" })
(Path.getFullName "./AltCover.Avalonia/AltCover.Avalonia.fsproj")
@@ -5410,10 +5378,7 @@ _Target
let mparams =
{ tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
+ Properties = tmp.MSBuildParams.Properties }
{ tmp with MSBuildParams = mparams })
(build @@ "msbuildtest.proj")
@@ -5436,8 +5401,6 @@ _Target
Properties =
[ "Configuration", "Debug"
"MSBuildTest", "true"
- "CheckEolTargetFramework", "false"
- "ContinuousIntegrationBuild", "false"
"AltCoverPath", unpack.Replace('\\', '/')
"DebugSymbols", "True" ] })
"./Samples/Sample4/Sample4LongForm.fsproj")
@@ -5582,8 +5545,7 @@ _Target "DoIt"
{ MSBuild.CliArguments.Create() with
ConsoleLogParameters = []
DistributedLoggers = None
- Properties = [("CheckEolTargetFramework", "false")
- ("ContinuousIntegrationBuild", "false")]
+ Properties = []
DisableInternalBinLog = true }
DotNet.test
@@ -6412,10 +6374,7 @@ _Target
let mparams =
{ tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
+ Properties = tmp.MSBuildParams.Properties }
{ tmp with MSBuildParams = mparams })
""
@@ -6427,10 +6386,7 @@ _Target
let mparams =
{ tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
+ Properties = tmp.MSBuildParams.Properties }
{ tmp with MSBuildParams = mparams })
""
@@ -6546,10 +6502,7 @@ _Target
let mparams =
{ tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
+ Properties = tmp.MSBuildParams.Properties }
{ tmp with MSBuildParams = mparams })
""
@@ -6630,10 +6583,7 @@ _Target
let mparams =
{ tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
+ Properties = tmp.MSBuildParams.Properties }
{ tmp with MSBuildParams = mparams })
""
@@ -7051,10 +7001,7 @@ _Target
let mparams =
{ tmp.MSBuildParams with
- Properties =
- ("CheckEolTargetFramework", "false")
- :: ("ContinuousIntegrationBuild", "false")
- :: tmp.MSBuildParams.Properties }
+ Properties = tmp.MSBuildParams.Properties }
{ tmp with MSBuildParams = mparams })
""
diff --git a/Directory.Build.props b/Directory.Build.props
index e6995c46b..1b2f0713c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,4 +3,7 @@
+
+
+
\ No newline at end of file
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 000000000..ab3da0636
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/MCS/MCS.fsproj b/MCS/MCS.fsproj
index 54787eaac..411999c1e 100644
--- a/MCS/MCS.fsproj
+++ b/MCS/MCS.fsproj
@@ -3,26 +3,25 @@
Exe
net472
MCS
- true
- $(SolutionDir)_Intermediate\$(AssemblyName)\$(Configuration)+$(Platform)\
-
- $(SolutionDir)_Binaries\$(AssemblyName)\$(Configuration)+$(Platform)\
- --keyfile:$(SolutionDir)Build\Infrastructure.snk
$(BuildDependsOn);AfterBuildMigrated
+
false
TRACE;DEBUG;CODE_ANALYSIS
+
true
+
+
@@ -32,10 +31,12 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/OutputBuildProps.props b/OutputBuildProps.props
new file mode 100644
index 000000000..b3ceda40c
--- /dev/null
+++ b/OutputBuildProps.props
@@ -0,0 +1,40 @@
+
+
+
+ Debug
+ AnyCPU
+ $(MSBuildThisFileDirectory)_Binaries\
+ $(MSBuildThisFileDirectory)_Intermediate/$(MSBuildProjectName)/$(Configuration)
+ $(BaseIntermediateOutputPath)+$(Platform)
+ $(AltCoverTag)$(MSBuildProjectName)/$(Configuration)+$(Platform)
+ $(BuildDir)$(ProjectBuildDirectoryName)
+ $(OutputPathWithoutEndSlash)/
+ $(MSBuildThisFileDirectory)Build\
+ $(KeyDir)infrastructure.snk
+ $(OutputPath)\$(TargetFramework)\$(MSBuildProjectName).xml
+ --keyfile:$(InfrastructureKey)
+ Major
+ false
+ true
+ true
+ true
+ true
+ $(InfrastructureKey)
+ false
+
+
+
+ false
+ false
+ 4
+ true
+
+ 52
+ true
+
+
+ true
+ true
+
+
+
\ No newline at end of file
diff --git a/OutputBuildTargets.props b/OutputBuildTargets.props
new file mode 100644
index 000000000..e4da70b1c
--- /dev/null
+++ b/OutputBuildTargets.props
@@ -0,0 +1,21 @@
+
+
+ $(OutputPathWithoutEndSlash)
+ $(BaseOutDir)/$(TargetFramework)\
+ $(OutDir)
+ $(TargetDir)$(TargetFileName)
+ $(TargetDir)ref\$(TargetFileName)
+ $(BaseOutDir)/$(TargetFramework)_$(RuntimeIdentifier)
+
+
+
+
\ No newline at end of file
diff --git a/Samples/Directory.build.props b/Samples/Directory.build.props
new file mode 100644
index 000000000..f5af21e57
--- /dev/null
+++ b/Samples/Directory.build.props
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Samples/Sample1/Sample1.csproj b/Samples/Sample1/Sample1.csproj
index 8a7ed6eaa..82a3e2736 100644
--- a/Samples/Sample1/Sample1.csproj
+++ b/Samples/Sample1/Sample1.csproj
@@ -5,18 +5,6 @@
netcoreapp2.0;net20
Sample1
false
- Major
- false
- false
-
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
diff --git a/Samples/Sample10/Sample10.csproj b/Samples/Sample10/Sample10.csproj
index 3e8a841af..e42adb1b9 100644
--- a/Samples/Sample10/Sample10.csproj
+++ b/Samples/Sample10/Sample10.csproj
@@ -2,18 +2,7 @@
netcoreapp2.1
- Major
false
- false
-
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
diff --git a/Samples/Sample11/Sample11.csproj b/Samples/Sample11/Sample11.csproj
index cb6219005..80cc02604 100644
--- a/Samples/Sample11/Sample11.csproj
+++ b/Samples/Sample11/Sample11.csproj
@@ -3,12 +3,6 @@
netstandard2.0;net472
Sample11
- false
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- true
- $(ProjectDir)..\..\Build\Infrastructure.snk
- Major
diff --git a/Samples/Sample12/Sample12.csproj b/Samples/Sample12/Sample12.csproj
index 25dacfc21..c4d26e508 100644
--- a/Samples/Sample12/Sample12.csproj
+++ b/Samples/Sample12/Sample12.csproj
@@ -4,18 +4,6 @@
Exe
netcoreapp2.0;net472
Sample12
- false
- Major
- false
-
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
diff --git a/Samples/Sample13/Sample13.fsproj b/Samples/Sample13/Sample13.fsproj
index 5ce77ec82..52622f223 100644
--- a/Samples/Sample13/Sample13.fsproj
+++ b/Samples/Sample13/Sample13.fsproj
@@ -2,9 +2,7 @@
netcoreapp2.1
- Major
false
- false
diff --git a/Samples/Sample14/Sample14/Sample14.csproj b/Samples/Sample14/Sample14/Sample14.csproj
index fb8f9971f..637a35a5a 100644
--- a/Samples/Sample14/Sample14/Sample14.csproj
+++ b/Samples/Sample14/Sample14/Sample14.csproj
@@ -3,9 +3,6 @@
Exe
netcoreapp2.1
- true
- Major
- true
diff --git a/Samples/Sample15/Sample15/Sample15.fsproj b/Samples/Sample15/Sample15/Sample15.fsproj
index f45573d50..bd484939f 100644
--- a/Samples/Sample15/Sample15/Sample15.fsproj
+++ b/Samples/Sample15/Sample15/Sample15.fsproj
@@ -5,6 +5,7 @@
true
Sample15
+
full
false
@@ -12,6 +13,7 @@
3
bin\$(Configuration)\$(AssemblyName).XML
+
pdbonly
true
@@ -19,16 +21,20 @@
3
bin\$(Configuration)\$(AssemblyName).XML
+
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets
+
+
contentfiles
+
diff --git a/Samples/Sample16/Sample16.csproj b/Samples/Sample16/Sample16.csproj
index 92385f9d8..a56616701 100644
--- a/Samples/Sample16/Sample16.csproj
+++ b/Samples/Sample16/Sample16.csproj
@@ -3,19 +3,8 @@
netstandard2.0;net472
Sample16
- false
- Major
- false
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
diff --git a/Samples/Sample17/Sample17.fsproj b/Samples/Sample17/Sample17.fsproj
index 83914950a..b34ef69fe 100644
--- a/Samples/Sample17/Sample17.fsproj
+++ b/Samples/Sample17/Sample17.fsproj
@@ -4,17 +4,6 @@
netcoreapp2.0;net472
Sample17
$(AssetTargetFallback);netcoreapp1.0;
- Major
- false
-
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
-
-
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
diff --git a/Samples/Sample18/Sample18.fsproj b/Samples/Sample18/Sample18.fsproj
index 5c40e3475..9127a77f3 100644
--- a/Samples/Sample18/Sample18.fsproj
+++ b/Samples/Sample18/Sample18.fsproj
@@ -4,13 +4,10 @@
false
Sample18
false
- $(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/
- $(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/
- --keyfile:$(ProjectDir)..\..\Build\Infrastructure.snk
- Major
portable
-
+
+
988
diff --git a/Samples/Sample19/ConsoleApp2/ConsoleApp2.fsproj b/Samples/Sample19/ConsoleApp2/ConsoleApp2.fsproj
index 7ae498732..8bae367c1 100644
--- a/Samples/Sample19/ConsoleApp2/ConsoleApp2.fsproj
+++ b/Samples/Sample19/ConsoleApp2/ConsoleApp2.fsproj
@@ -4,7 +4,6 @@
Exe
netcoreapp2.0
AnyCPU;x86
- Major
diff --git a/Samples/Sample19/ConsoleApplication1/ConsoleApplication1.fsproj b/Samples/Sample19/ConsoleApplication1/ConsoleApplication1.fsproj
index 84f7e912c..238cbbd28 100644
--- a/Samples/Sample19/ConsoleApplication1/ConsoleApplication1.fsproj
+++ b/Samples/Sample19/ConsoleApplication1/ConsoleApplication1.fsproj
@@ -15,6 +15,7 @@
2.3.0.0
ConsoleApplication1
+
true
full
@@ -27,6 +28,7 @@
bin\$(Configuration)\$(AssemblyName).XML
true
+
pdbonly
true
@@ -38,6 +40,7 @@
bin\$(Configuration)\$(AssemblyName).XML
true
+
@@ -51,14 +54,17 @@
+
+
11
+
true
full
@@ -71,6 +77,7 @@
true
x86
+
pdbonly
true
@@ -82,6 +89,7 @@
true
x86
+
@@ -94,6 +102,7 @@
+