Skip to content

Commit 305ff8b

Browse files
author
Craig Fowler
committed
Merge branch 'feature/37-Reflection-compatibility'
2 parents bb80b87 + d97e74a commit 305ff8b

5 files changed

Lines changed: 106 additions & 33 deletions

File tree

‎CSF.Validation.Tests/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
7-
<bindingRedirect oldVersion="3.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="Moq" publicKeyToken="69f491c39445e920" culture="neutral" />
11-
<bindingRedirect oldVersion="4.0.0.0-4.7.8.0" newVersion="4.7.8.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-4.7.8.0" newVersion="4.7.8.0" />
1212
</dependentAssembly>
1313
</assemblyBinding>
1414
</runtime>

‎CSF.Validation.Tests/CSF.Validation.Tests.csproj‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -33,6 +33,12 @@
3333
</PropertyGroup>
3434
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
3535
<ItemGroup>
36+
<Reference Include="CSF.Reflection, Version=1.0.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730, processorArchitecture=MSIL">
37+
<HintPath>..\packages\CSF.Reflection.2.0.0\lib\netstandard1.0\CSF.Reflection.dll</HintPath>
38+
</Reference>
39+
<Reference Include="CSF.Specifications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730, processorArchitecture=MSIL">
40+
<HintPath>..\packages\CSF.Specifications.1.1.0\lib\netstandard1.0\CSF.Specifications.dll</HintPath>
41+
</Reference>
3642
<Reference Include="System" />
3743
<Reference Include="nunit.framework">
3844
<HintPath>..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
@@ -53,28 +59,26 @@
5359
<Reference Include="Ploeh.AutoFixture.AutoMoq">
5460
<HintPath>..\packages\AutoFixture.AutoMoq.3.50.2\lib\net40\Ploeh.AutoFixture.AutoMoq.dll</HintPath>
5561
</Reference>
56-
<Reference Include="CSF.Reflection">
57-
<HintPath>..\packages\CSF.Reflection.1.0.3\lib\net45\CSF.Reflection.dll</HintPath>
58-
</Reference>
5962
<Reference Include="CSF.Utils">
6063
<HintPath>..\packages\CSF.Utils.6.1.1\lib\net45\CSF.Utils.dll</HintPath>
6164
</Reference>
65+
<Reference Include="System.ComponentModel.Composition" />
66+
<Reference Include="System.IO.Compression" />
67+
<Reference Include="System.Net.Http" />
68+
<Reference Include="System.Numerics" />
69+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
70+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
71+
</Reference>
72+
<Reference Include="System.Xml" />
73+
<Reference Include="System.Xml.Linq" />
6274
</ItemGroup>
6375
<ItemGroup>
6476
<ProjectReference Include="..\CSF.Validation\CSF.Validation.csproj">
6577
<Project>{C4446BF2-FF24-4C05-893E-0C9E195FBF82}</Project>
6678
<Name>CSF.Validation</Name>
6779
</ProjectReference>
6880
</ItemGroup>
69-
<ItemGroup>
70-
<Folder Include="StockRules\" />
71-
<Folder Include="ValidationRuns\" />
72-
<Folder Include="Manifest\" />
73-
<Folder Include="Integration\" />
74-
<Folder Include="Rules\" />
75-
<Folder Include="Resources\" />
76-
<Folder Include="Messages\" />
77-
</ItemGroup>
81+
<ItemGroup />
7882
<ItemGroup>
7983
<Compile Include="StockRules\NotNullRuleTests.cs" />
8084
<Compile Include="RuleRunner.cs" />

‎CSF.Validation.Tests/packages.config‎

100644100755
Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,42 @@
44
<package id="AutoFixture.AutoMoq" version="3.50.2" targetFramework="net45" />
55
<package id="AutoFixture.NUnit3" version="3.50.2" targetFramework="net45" />
66
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
7-
<package id="CSF.Reflection" version="1.0.3" targetFramework="net45" />
7+
<package id="CSF.Reflection" version="2.0.0" targetFramework="net45" />
8+
<package id="CSF.Specifications" version="1.1.0" targetFramework="net45" />
89
<package id="CSF.Utils" version="6.1.1" targetFramework="net45" />
10+
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
911
<package id="Moq" version="4.7.8" targetFramework="net45" />
12+
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
1013
<package id="NUnit" version="3.6.1" targetFramework="net45" />
1114
<package id="NUnit.ConsoleRunner" version="3.6.1" targetFramework="net45" />
15+
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
16+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
17+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
18+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
19+
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
20+
<package id="System.Globalization" version="4.3.0" targetFramework="net45" />
21+
<package id="System.IO" version="4.3.0" targetFramework="net45" />
22+
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
23+
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
24+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
25+
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net45" />
26+
<package id="System.Net.Http" version="4.3.0" targetFramework="net45" />
27+
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
28+
<package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
29+
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
30+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
31+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
32+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
33+
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
34+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
35+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
36+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
37+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
38+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
39+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
40+
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
41+
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
42+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
43+
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
44+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
1245
</packages>

‎CSF.Validation/CSF.Validation.csproj‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,7 +27,8 @@
2727
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType></DebugType>
30+
<DebugType>
31+
</DebugType>
3132
<Optimize>true</Optimize>
3233
<OutputPath>bin\Release</OutputPath>
3334
<ErrorReport>prompt</ErrorReport>
@@ -36,15 +37,26 @@
3637
<ConsolePause>false</ConsolePause>
3738
</PropertyGroup>
3839
<ItemGroup>
39-
<Reference Include="System" />
40-
<Reference Include="CSF.Reflection">
41-
<HintPath>..\packages\CSF.Reflection.1.0.3\lib\net45\CSF.Reflection.dll</HintPath>
42-
<Private>False</Private>
40+
<Reference Include="CSF.Reflection, Version=1.0.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730, processorArchitecture=MSIL">
41+
<HintPath>..\packages\CSF.Reflection.2.0.0\lib\netstandard1.0\CSF.Reflection.dll</HintPath>
4342
</Reference>
43+
<Reference Include="CSF.Specifications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=83989bab8a1a4730, processorArchitecture=MSIL">
44+
<HintPath>..\packages\CSF.Specifications.1.1.0\lib\netstandard1.0\CSF.Specifications.dll</HintPath>
45+
</Reference>
46+
<Reference Include="System" />
4447
<Reference Include="CSF.Utils">
4548
<HintPath>..\packages\CSF.Utils.6.1.1\lib\net45\CSF.Utils.dll</HintPath>
4649
<Private>False</Private>
4750
</Reference>
51+
<Reference Include="System.ComponentModel.Composition" />
52+
<Reference Include="System.IO.Compression" />
53+
<Reference Include="System.Net.Http" />
54+
<Reference Include="System.Numerics" />
55+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
57+
</Reference>
58+
<Reference Include="System.Xml" />
59+
<Reference Include="System.Xml.Linq" />
4860
</ItemGroup>
4961
<ItemGroup>
5062
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -127,16 +139,7 @@
127139
<Compile Include="Messages\PlaceholderRegistrationHelper.cs" />
128140
<Compile Include="Messages\ByIdentityFormatterProviderExtensions.cs" />
129141
</ItemGroup>
130-
<ItemGroup>
131-
<Folder Include="Rules\" />
132-
<Folder Include="ValidationRuns\" />
133-
<Folder Include="Resources\" />
134-
<Folder Include="StockRules\" />
135-
<Folder Include="Manifest\" />
136-
<Folder Include="Options\" />
137-
<Folder Include="Manifest\Fluent\" />
138-
<Folder Include="Messages\" />
139-
</ItemGroup>
142+
<ItemGroup />
140143
<ItemGroup>
141144
<None Include="packages.config" />
142145
<None Include="CSF.Validation.nuspec" />

‎CSF.Validation/packages.config‎

100644100755
Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CSF.Reflection" version="1.0.3" targetFramework="net45" />
3+
<package id="CSF.Reflection" version="2.0.0" targetFramework="net45" />
4+
<package id="CSF.Specifications" version="1.1.0" targetFramework="net45" />
45
<package id="CSF.Utils" version="6.1.1" targetFramework="net45" />
6+
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
7+
<package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
8+
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
9+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
10+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
11+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />
12+
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net45" />
13+
<package id="System.Globalization" version="4.3.0" targetFramework="net45" />
14+
<package id="System.IO" version="4.3.0" targetFramework="net45" />
15+
<package id="System.IO.Compression" version="4.3.0" targetFramework="net45" />
16+
<package id="System.Linq" version="4.3.0" targetFramework="net45" />
17+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net45" />
18+
<package id="System.Linq.Queryable" version="4.3.0" targetFramework="net45" />
19+
<package id="System.Net.Http" version="4.3.0" targetFramework="net45" />
20+
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net45" />
21+
<package id="System.ObjectModel" version="4.3.0" targetFramework="net45" />
22+
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
23+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
24+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
25+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
26+
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
27+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net45" />
28+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
29+
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net45" />
30+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net45" />
31+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
32+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
33+
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net45" />
34+
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
35+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
36+
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" />
37+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
538
</packages>

0 commit comments

Comments
 (0)