Skip to content

Commit

Permalink
[WIP] Removing dynamic yaml
Browse files Browse the repository at this point in the history 
This commit is the bulk of the work required to remove DynamicYaml configuration and replace it with an extendable generic config file, which can also be used for static typing.

Note, build fails, tests fail. More work needed.

Note, nuget also needed to a package reinstall. It looks like the stylecop analyzers might be broken.

By Adding a `Parse` method to the `IAnalyser2` interface we can allow for analyzers to parse their own config files to static classes 😀. However, this means the way we resolve Analyses by identifiers has changed and is now dependent on either an explicit argument, or the first two sections (separated by a period) of a config file name.

This work was done for #119
  • Loading branch information
@atruskie
atruskie committed Feb 12, 2018
1 parent 38c8987 commit 72aab48
Show file tree
Hide file tree
Showing 147 changed files with 2,322 additions and 1,829 deletions.
1 change: 1 addition & 0 deletions NuGet.Config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<packageSources>
<add key="All" value="(Aggregate source)" />
<add key="SqLiteFileSystem Packages" value="https://ci.appveyor.com/nuget/sqlitefilesystem-dcfwbf0p9du0" />
<add key="natemcmaster Packages" value="https://www.myget.org/F/natemcmaster" />
</packageSources>
</configuration>
8 changes: 4 additions & 4 deletions src/AED/AED.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
<Error Condition="!Exists('..\..\packages\FSharp.Compiler.Tools.4.1.29\build\FSharp.Compiler.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\FSharp.Compiler.Tools.4.1.29\build\FSharp.Compiler.Tools.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
Expand Down Expand Up @@ -90,13 +90,13 @@
<HintPath>..\..\packages\FSPowerPack.Core.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.dll</HintPath>
</Reference>
<Reference Include="FSharp.PowerPack.Linq">
<HintPath>..\..\packages\FSPowerPack.Linq.Community.3.0.0.0\Lib\Net40\FSharp.PowerPack.Linq.dll</HintPath>
<HintPath>..\..\packages\FSPowerPack.Linq.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.Linq.dll</HintPath>
</Reference>
<Reference Include="FSharp.PowerPack.Metadata">
<HintPath>..\..\packages\FSPowerPack.Metadata.Community.3.0.0.0\Lib\Net40\FSharp.PowerPack.Metadata.dll</HintPath>
<HintPath>..\..\packages\FSPowerPack.Metadata.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.Metadata.dll</HintPath>
</Reference>
<Reference Include="FSharp.PowerPack.Parallel.Seq">
<HintPath>..\..\packages\FSPowerPack.Parallel.Seq.Community.3.0.0.0\Lib\Net40\FSharp.PowerPack.Parallel.Seq.dll</HintPath>
<HintPath>..\..\packages\FSPowerPack.Parallel.Seq.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.Parallel.Seq.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
Expand Down
22 changes: 11 additions & 11 deletions src/AED/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="FSharp.Compiler.Tools" version="4.1.29" targetFramework="net462" />
<package id="FSharp.Core" version="4.2.3" targetFramework="net461" />
<package id="FSPowerPack.Community" version="3.0.0.0" targetFramework="net461" />
<package id="FSPowerPack.Core.Community" version="3.0.0.0" targetFramework="net461" />
<package id="FSPowerPack.Linq.Community" version="3.0.0.0" targetFramework="net461" />
<package id="FSPowerPack.Metadata.Community" version="3.0.0.0" targetFramework="net461" />
<package id="FSPowerPack.Parallel.Seq.Community" version="3.0.0.0" targetFramework="net461" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net461" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net461" developmentDependency="true" />
<package id="FSharp.Core" version="4.2.3" targetFramework="net462" />
<package id="FSPowerPack.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Core.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Linq.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Metadata.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Parallel.Seq.Community" version="3.0.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net462" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net462" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net462" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net462" developmentDependency="true" />
</packages>
66 changes: 15 additions & 51 deletions src/Acoustics.Shared.FSharp/Acoustics.Shared.FSharp.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,60 +72,42 @@
<Compile Include="Math.fs" />
<Compile Include="Mutex.fs" />
<Compile Include="Serialization.fs" />
<None Include="packages.config" />
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Accord">
<HintPath>..\..\packages\Accord.2.12.0.0\lib\Accord.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Accord.Math">
<HintPath>..\..\packages\Accord.Math.2.12.0.0\lib\Accord.Math.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Accord.Statistics">
<HintPath>..\..\packages\Accord.Statistics.2.12.0.0\lib\Accord.Statistics.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="AForge">
<HintPath>..\..\packages\AForge.2.2.5\lib\AForge.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="AForge.Math">
<HintPath>..\..\packages\AForge.Math.2.2.5\lib\AForge.Math.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="FSharp.Core">
<HintPath>..\..\packages\FSharp.Core.4.2.3\lib\net45\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="FSharp.PowerPack">
<HintPath>..\..\packages\FSPowerPack.Core.Community.3.0.0.0\Lib\Net40\FSharp.PowerPack.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\packages\FSPowerPack.Core.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.dll</HintPath>
</Reference>
<Reference Include="FSharp.PowerPack.Linq">
<HintPath>..\..\packages\FSPowerPack.Linq.Community.3.0.0.0\Lib\Net40\FSharp.PowerPack.Linq.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\packages\FSPowerPack.Linq.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.Linq.dll</HintPath>
</Reference>
<Reference Include="FSharp.PowerPack.Metadata">
<HintPath>..\..\packages\FSPowerPack.Metadata.Community.3.0.0.0\Lib\Net40\FSharp.PowerPack.Metadata.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\packages\FSPowerPack.Metadata.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.Metadata.dll</HintPath>
</Reference>
<Reference Include="FSharp.PowerPack.Parallel.Seq">
<HintPath>..\..\packages\FSPowerPack.Parallel.Seq.Community.3.0.0.0\Lib\Net40\FSharp.PowerPack.Parallel.Seq.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\packages\FSPowerPack.Parallel.Seq.Community.3.0.0.0\lib\Net40\FSharp.PowerPack.Parallel.Seq.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\packages\log4net.2.0.8\lib\net40-full\log4net.dll</HintPath>
<HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Threading.Tasks">
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
</Reference>
Expand All @@ -138,59 +120,41 @@
<Reference Include="mscorlib" />
<Reference Include="QuickGraph">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="QuickGraph.Data">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="QuickGraph.Graphviz">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="QuickGraph.Serialization">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="QuickGraph">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="QuickGraph.Data">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="QuickGraph.Graphviz">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="QuickGraph.Serialization">
<HintPath>..\..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.ValueTuple">
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.IO">
<HintPath>..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.IO.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime">
<HintPath>..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Runtime.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Threading.Tasks">
<HintPath>..\..\packages\Microsoft.Bcl.1.1.10\lib\net40\System.Threading.Tasks.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
</ItemGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\FSharp.Compiler.Tools.4.1.29\build\FSharp.Compiler.Tools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\FSharp.Compiler.Tools.4.1.29\build\FSharp.Compiler.Tools.props'))" />
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
34 changes: 17 additions & 17 deletions src/Acoustics.Shared.FSharp/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accord" version="2.12.0.0" targetFramework="net40" />
<package id="Accord.Math" version="2.12.0.0" targetFramework="net40" />
<package id="Accord.Statistics" version="2.12.0.0" targetFramework="net40" />
<package id="AForge" version="2.2.5" targetFramework="net40" />
<package id="AForge.Math" version="2.2.5" targetFramework="net40" />
<package id="Accord" version="2.12.0.0" targetFramework="net462" />
<package id="Accord.Math" version="2.12.0.0" targetFramework="net462" />
<package id="Accord.Statistics" version="2.12.0.0" targetFramework="net462" />
<package id="AForge" version="2.2.5" targetFramework="net462" />
<package id="AForge.Math" version="2.2.5" targetFramework="net462" />
<package id="FSharp.Compiler.Tools" version="4.1.29" targetFramework="net462" />
<package id="FSharp.Core" version="4.2.3" targetFramework="net452" />
<package id="FSPowerPack.Community" version="3.0.0.0" targetFramework="net40" />
<package id="FSPowerPack.Core.Community" version="3.0.0.0" targetFramework="net40" />
<package id="FSPowerPack.Linq.Community" version="3.0.0.0" targetFramework="net40" />
<package id="FSPowerPack.Metadata.Community" version="3.0.0.0" targetFramework="net40" />
<package id="FSPowerPack.Parallel.Seq.Community" version="3.0.0.0" targetFramework="net40" />
<package id="log4net" version="2.0.8" targetFramework="net40" requireReinstallation="true" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" requireReinstallation="true" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
<package id="QuickGraph" version="3.6.61119.7" targetFramework="net40" />
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net40" developmentDependency="true" />
<package id="FSharp.Core" version="4.2.3" targetFramework="net462" />
<package id="FSPowerPack.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Core.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Linq.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Metadata.Community" version="3.0.0.0" targetFramework="net462" />
<package id="FSPowerPack.Parallel.Seq.Community" version="3.0.0.0" targetFramework="net462" />
<package id="log4net" version="2.0.8" targetFramework="net462" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net462" />
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net462" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net462" />
<package id="QuickGraph" version="3.6.61119.7" targetFramework="net462" />
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net462" developmentDependency="true" />
</packages>
Loading

0 comments on commit 72aab48

Please sign in to comment.