Skip to content

Commit b2a8fa4

Browse files
daniellittledevdaniellittledev
committed
successfully complete build step in build script
1 parent de1297b commit b2a8fa4

File tree

14 files changed

+1988
-865
lines changed

14 files changed

+1988
-865
lines changed

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "sdk": { "version": "2.1.402" } }
1+
{ "sdk": { "version": "2.2.401" } }

‎paket.dependencies

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ group Library
2727

2828
group DesignTime
2929
source https://www.nuget.org/api/v2/
30-
framework: >= netstandard20
30+
framework: >= netcoreapp2.2
3131
storage: none
3232

3333
nuget System.Configuration.ConfigurationManager
@@ -40,9 +40,8 @@ group DesignTime
4040

4141
group Test
4242
source https://www.nuget.org/api/v2/
43-
framework: netcoreapp2.0
44-
storage: none
45-
framework: netcoreapp2.0
43+
framework: netcoreapp2.2
44+
storage: none
4645

4746
nuget FSharp.Core = 5.0.0 redirects:force
4847
nuget System.Configuration.ConfigurationManager
@@ -65,11 +64,11 @@ group TestProjects
6564

6665
group Samples
6766
source https://www.nuget.org/api/v2/
68-
framework: >= net40
69-
storage: none
70-
67+
framework: >= netcoreapp2.2
68+
storage: none
69+
7170
nuget FSharp.Core = 4.5.2 redirects: force
72-
71+
7372
nuget Microsoft.AspNet.WebApi
7473
nuget Microsoft.AspNet.WebApi.Client
7574
nuget Microsoft.AspNet.WebApi.Core

‎paket.lock

Lines changed: 1888 additions & 702 deletions
Large diffs are not rendered by default.

‎src/SqlClient.DesignTime/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
66
[<assembly: AssemblyTitleAttribute("SqlClient.DesignTime")>]
77
[<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient.DesignTime")>]
88
[<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
9-
[<assembly: AssemblyVersionAttribute("2.0.5")>]
10-
[<assembly: AssemblyFileVersionAttribute("2.0.5")>]
9+
[<assembly: AssemblyVersionAttribute("2.1.0")>]
10+
[<assembly: AssemblyFileVersionAttribute("2.1.0")>]
1111
[<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
1212
do ()
1313

1414
module internal AssemblyVersionInformation =
1515
let [<Literal>] AssemblyTitle = "SqlClient.DesignTime"
1616
let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient.DesignTime"
1717
let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
18-
let [<Literal>] AssemblyVersion = "2.0.5"
19-
let [<Literal>] AssemblyFileVersion = "2.0.5"
18+
let [<Literal>] AssemblyVersion = "2.1.0"
19+
let [<Literal>] AssemblyFileVersion = "2.1.0"
2020
let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"

‎src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2</TargetFrameworks>
55
<AssemblyName>FSharp.Data.SqlClient.DesignTime</AssemblyName>
66
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -10,32 +10,6 @@
1010
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
1111
<DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;WITH_LEGACY_NAMESPACE</DefineConstants>
1212
</PropertyGroup>
13-
<ItemGroup>
14-
<PackageReference Include="FSharp.Core" Version="4.1.18" Condition="'$(TargetFramework)' == 'net40'" />
15-
<PackageReference Include="FSharp.Core" Version="4.3.4" Condition="'$(TargetFramework)' == 'net461'" />
16-
<!--<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" Condition="'$(TargetFramework)' == 'net461'" />
17-
18-
<PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="14.0.3811.1" />
19-
<PackageReference Include="Microsoft.SqlServer.Types" Version="12.0.5000" />
20-
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' == 'net461'" />
21-
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' == 'netstandard'" />
22-
23-
-->
24-
</ItemGroup>
25-
<!--<ItemGroup Condition="$(TargetFramework) == 'net40'">
26-
<Reference Include="System.Configuration" />
27-
<Reference Include="System.Data" />
28-
</ItemGroup>
29-
<ItemGroup>
30-
<Reference Include="System.IdentityModel" />
31-
<Reference Include="System.Runtime.Caching" />
32-
<Reference Include="System.ServiceModel" />
33-
<Reference Include="System.Transactions" />
34-
<Reference Include="System.Xml" />
35-
</ItemGroup>-->
36-
<ItemGroup Condition="$(TargetFramework) == 'net461'">
37-
<Reference Include="System.Data" />
38-
</ItemGroup>
3913

4014
<ItemGroup>
4115
<None Include="paket.references" />

‎src/SqlClient.Samples/WebApi.Controllers/WebApi.Controllers.fsproj

Lines changed: 61 additions & 90 deletions
Large diffs are not rendered by default.

‎src/SqlClient.TestProjects/Lib/App.config

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@
33
<connectionStrings>
44
<add name="AdventureWorks" connectionString="Data Source=localhost;Initial Catalog=AdventureWorks2012;Integrated Security=True" />
55
</connectionStrings>
6-
</configuration>
6+
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
7+
<dependentAssembly>
8+
<Paket>True</Paket>
9+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
11+
</dependentAssembly>
12+
</assemblyBinding></runtime></configuration>

‎src/SqlClient.TestProjects/Lib/Lib.fsproj

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
5-
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.2</TargetFrameworks>
65
<AssemblyName>Lib</AssemblyName>
76
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
87
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
9-
10-
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
11-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
128
</PropertyGroup>
139

1410
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -25,11 +21,8 @@
2521

2622
<ItemGroup>
2723
<Reference Include="netstandard" />
28-
<Reference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlClient">
29-
<HintPath>..\..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
30-
</Reference>
31-
<Reference Condition="'$(TargetFramework)' == 'net471'" Include="FSharp.Data.SqlClient">
32-
<HintPath>..\..\..\bin\net40\FSharp.Data.SqlClient.dll</HintPath>
24+
<Reference Condition="'$(TargetFramework)' == 'netstandard2.2'" Include="FSharp.Data.SqlClient">
25+
<HintPath>..\..\..\bin\netstandard2.2\FSharp.Data.SqlClient.dll</HintPath>
3326
</Reference>
3427
</ItemGroup>
3528

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,20 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFramework>netcoreapp2.2</TargetFramework>
66
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
7-
8-
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
9-
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
107
</PropertyGroup>
11-
128
<ItemGroup>
139
<Reference Include="FSharp.Data.SqlClient">
14-
<HintPath>..\..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
10+
<HintPath>..\..\..\bin\netstandard2.2\FSharp.Data.SqlClient.dll</HintPath>
1511
</Reference>
1612
</ItemGroup>
17-
1813
<ItemGroup>
1914
<None Include="paket.references" />
2015
<Compile Include="Program.fs" />
2116
</ItemGroup>
2217
<ItemGroup>
2318
<None Include="paket.references" />
2419
</ItemGroup>
25-
26-
<ItemGroup />
27-
2820
<Import Project="..\..\..\.paket\Paket.Restore.targets" />
2921
</Project>

‎src/SqlClient/AssemblyInfo.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
66
[<assembly: AssemblyTitleAttribute("SqlClient")>]
77
[<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient")>]
88
[<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
9-
[<assembly: AssemblyVersionAttribute("2.0.5")>]
10-
[<assembly: AssemblyFileVersionAttribute("2.0.5")>]
9+
[<assembly: AssemblyVersionAttribute("2.1.0")>]
10+
[<assembly: AssemblyFileVersionAttribute("2.1.0")>]
1111
[<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
1212
do ()
1313

1414
module internal AssemblyVersionInformation =
1515
let [<Literal>] AssemblyTitle = "SqlClient"
1616
let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient"
1717
let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
18-
let [<Literal>] AssemblyVersion = "2.0.5"
19-
let [<Literal>] AssemblyFileVersion = "2.0.5"
18+
let [<Literal>] AssemblyVersion = "2.1.0"
19+
let [<Literal>] AssemblyFileVersion = "2.1.0"
2020
let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"

0 commit comments

Comments
 (0)