Skip to content

Commit 193e0d9

Browse files
author
Sam Hanes
committed
Cleanup net40 test project, references
1 parent 5733305 commit 193e0d9

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎paket.dependencies‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,18 @@ group Test
3232
nuget xunit = 2.4.1
3333
nuget xunit.runner.visualstudio = 2.4.1
3434

35+
group Net40
36+
source https://www.nuget.org/api/v2/
37+
framework: net40
38+
39+
nuget FSharp.Core = 4.1.18
40+
3541
group TestProjects
3642
source https://www.nuget.org/api/v2/
3743
framework: >= net40, netcoreapp2.0, netstandard2.0
3844

3945
nuget FSharp.Core = 4.3.4
4046

41-
nuget Microsoft.SqlServer.TransactSql.ScriptDom
42-
nuget Microsoft.SqlServer.Types ~> 12
43-
4447
nuget System.Data.SqlClient
4548
nuget System.Configuration.ConfigurationManager
4649

‎paket.lock‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ NUGET
2121
RazorEngine (3.3)
2222
Microsoft.AspNet.Razor (>= 2.0.30506)
2323

24+
GROUP Net40
25+
RESTRICTION: == net40
26+
NUGET
27+
remote: https://www.nuget.org/api/v2
28+
FSharp.Core (4.1.18)
29+
2430
GROUP Samples
2531
RESTRICTION: >= net40
2632
NUGET
@@ -546,10 +552,8 @@ NUGET
546552
remote: https://www.nuget.org/api/v2
547553
FSharp.Core (4.3.4)
548554
Microsoft.NETCore.Platforms (2.1.1) - restriction: || (== netcoreapp2.0) (&& (== netstandard2.0) (>= netcoreapp2.0)) (&& (>= net40) (>= netcoreapp2.0))
549-
Microsoft.SqlServer.TransactSql.ScriptDom (14.0.3811.1)
550-
Microsoft.SqlServer.Types (12.0.5000)
551555
Microsoft.Win32.Registry (4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
552-
System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= monoandroid) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= net40)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos))
556+
System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= monoandroid) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos))
553557
System.Memory (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
554558
System.Security.AccessControl (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461)
555559
System.Security.Principal.Windows (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net46) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (>= net461)
@@ -568,16 +572,16 @@ NUGET
568572
System.Data.SqlClient (4.5.1)
569573
Microsoft.Win32.Registry (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
570574
runtime.native.System.Data.SqlClient.sni (>= 4.4) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
571-
System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= net40)) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0))
575+
System.Buffers (>= 4.4) - restriction: || (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0))
572576
System.Data.Common (>= 4.3) - restriction: || (&& (== netcoreapp2.0) (< netstandard1.2)) (&& (== netcoreapp2.0) (< netstandard1.3)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netstandard2.0) (< netstandard1.2)) (&& (== netstandard2.0) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.2) (< netstandard1.3)) (&& (>= net40) (< net451) (>= netstandard1.3) (< netstandard2.0)) (&& (>= net40) (< netstandard1.2) (>= portable-net451+win81+wpa81)) (&& (>= net40) (< netstandard1.3) (>= wpa81)) (&& (>= net40) (< netstandard2.0) (>= win81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< net461) (< netstandard2.0))
573577
System.Diagnostics.DiagnosticSource (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
574578
System.Memory (>= 4.5.1) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
575579
System.Security.Principal.Windows (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
576580
System.Text.Encoding.CodePages (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0))
577581
System.Diagnostics.DiagnosticSource (4.5.1) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
578582
System.Memory (4.5.1) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= net40) (< net451) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= uap10.1))
579-
System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (>= net40)) (&& (== netcoreapp2.0) (< netstandard1.1)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (< netstandard1.1) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.1) (>= win8)) (&& (>= net40) (< netstandard2.0) (>= wpa81)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= net45) (< netstandard2.0)) (>= net461)
580-
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= net40)) (== netstandard2.0) (&& (>= net40) (< net45) (>= netstandard2.0)) (>= net461)
583+
System.Buffers (>= 4.4) - restriction: || (&& (== netcoreapp2.0) (>= monotouch)) (&& (== netcoreapp2.0) (< netstandard1.1)) (&& (== netcoreapp2.0) (< netstandard2.0)) (&& (== netcoreapp2.0) (>= xamarinios)) (&& (== netcoreapp2.0) (>= xamarinmac)) (&& (== netcoreapp2.0) (>= xamarintvos)) (&& (== netcoreapp2.0) (>= xamarinwatchos)) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (< netstandard1.1) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.1) (>= win8)) (&& (>= net40) (< netstandard2.0) (>= wpa81)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= net45) (< netstandard2.0)) (>= net461)
584+
System.Numerics.Vectors (>= 4.4) - restriction: || (== netstandard2.0) (&& (>= net40) (< net45) (>= netstandard2.0)) (>= net461)
581585
System.Runtime.CompilerServices.Unsafe (>= 4.5) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monoandroid) (>= net40) (< netstandard2.0)) (&& (>= monotouch) (>= net40)) (&& (>= net40) (< net45) (>= netstandard1.1) (< netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (< netstandard1.1) (>= portable-net45+win8+wpa81)) (&& (>= net40) (< netstandard1.1) (>= win8)) (&& (>= net40) (< netstandard2.0) (>= wpa81)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= xamarinios)) (&& (>= net40) (>= xamarinmac)) (&& (>= net40) (>= xamarintvos)) (&& (>= net40) (>= xamarinwatchos)) (&& (>= net45) (< netstandard2.0)) (>= net461)
582586
System.Numerics.Vectors (4.5) - restriction: || (&& (== netcoreapp2.0) (>= net40)) (&& (== netcoreapp2.0) (>= net461)) (== netstandard2.0) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (>= netstandard2.0) (>= uap10.1)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))
583587
System.Runtime.CompilerServices.Unsafe (4.5.2) - restriction: || (== netcoreapp2.0) (== netstandard2.0) (&& (>= monotouch) (>= net40) (>= netstandard2.0)) (&& (>= net40) (< net45) (>= netstandard2.0)) (&& (>= net40) (>= netcoreapp2.0)) (&& (>= net40) (< netstandard1.1) (>= netstandard2.0)) (&& (>= net40) (>= netstandard2.0) (>= xamarinmac)) (&& (>= net40) (>= netstandard2.0) (>= xamarintvos)) (&& (>= net40) (>= netstandard2.0) (>= xamarinwatchos)) (&& (>= net40) (>= uap10.1)) (&& (>= net40) (>= xamarinios)) (&& (>= net45) (>= netcoreapp2.0) (< netstandard2.0)) (&& (>= net45) (>= uap10.1)) (&& (< net451) (>= net461) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.0)) (&& (>= net461) (>= uap10.1))

‎src/SqlClient.TestProjects/SqlClient.Tests.NET40/SqlClient.Tests.NET40.fsproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\..\..\netfx.props" />
55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFrameworks>net461</TargetFrameworks>
7+
<TargetFrameworks>net40</TargetFrameworks>
88
<AssemblyName>SqlClient.Tests.NET40</AssemblyName>
99
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
1010
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -17,12 +17,7 @@
1717
<Content Include="Uncomment.App.config" />
1818
<Content Include="packages.config" />
1919
</ItemGroup>
20-
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
21-
<Reference Include="FSharp.Data.SqlClient">
22-
<HintPath>..\..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
23-
</Reference>
24-
</ItemGroup>
25-
<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
20+
<ItemGroup>
2621
<Reference Include="System.Data" />
2722
<Reference Include="System.Xml" />
2823
<Reference Include="FSharp.Data.SqlClient">

‎src/SqlClient.TestProjects/SqlClient.Tests.NET40/paket.references‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
group TestProjects
1+
group Net40
22
FSharp.Core
3-
System.Data.SqlClient
4-
System.Configuration.ConfigurationManager

0 commit comments

Comments
 (0)