Skip to content

Commit 60c2f53

Browse files
smoothdevelopersmoothdeveloper
committed
* upgrade Rezoom.SQL.Test.fsproj to new SDK
* add solution items to .sln
1 parent 94bdb97 commit 60c2f53

File tree

2 files changed

+22
-248
lines changed

2 files changed

+22
-248
lines changed

‎src/Rezoom.SQL.Test/Rezoom.SQL.Test.fsproj‎

Lines changed: 5 additions & 241 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>aa699897-f692-4ed0-9865-98b6b4c713db</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>Rezoom.SQL.Test</RootNamespace>
11-
<AssemblyName>Rezoom.SQL.Test</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
4+
<TargetFrameworks>net45;</TargetFrameworks>
145
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<Name>Rezoom.SQL.Test</Name>
166
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<Tailcalls>false</Tailcalls>
22-
<OutputPath>bin\Debug\</OutputPath>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<WarningLevel>3</WarningLevel>
25-
<DocumentationFile>bin\Debug\Rezoom.SQL.Test.XML</DocumentationFile>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<Tailcalls>true</Tailcalls>
31-
<OutputPath>bin\Release\</OutputPath>
32-
<DefineConstants>TRACE</DefineConstants>
33-
<WarningLevel>3</WarningLevel>
34-
<DocumentationFile>bin\Release\Rezoom.SQL.Test.XML</DocumentationFile>
35-
</PropertyGroup>
36-
<PropertyGroup>
37-
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
38-
</PropertyGroup>
39-
<Choose>
40-
<When Condition="'$(VisualStudioVersion)' == '11.0'">
41-
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
42-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
43-
</PropertyGroup>
44-
</When>
45-
<Otherwise>
46-
<PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
47-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
48-
</PropertyGroup>
49-
</Otherwise>
50-
</Choose>
51-
<Import Project="$(FSharpTargetsPath)" />
52-
<Choose>
53-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
54-
<PropertyGroup>
55-
<__paket__NETStandard_Library_targets>netstandard2.0\NETStandard.Library</__paket__NETStandard_Library_targets>
56-
</PropertyGroup>
57-
</When>
58-
</Choose>
597
<ItemGroup>
608
<Content Include="app.config" />
619
<Compile Include="AssemblyInfo.fs" />
@@ -89,199 +37,15 @@
8937
<Content Include="paket.references" />
9038
</ItemGroup>
9139
<ItemGroup>
92-
<ProjectReference Include="..\Rezoom.SQL.Compiler\Rezoom.SQL.Compiler.fsproj">
93-
<Name>Rezoom.SQL.Compiler</Name>
94-
<Project>{87fcd04a-1f90-4d53-a428-cf5f5c532a22}</Project>
95-
<Private>True</Private>
96-
</ProjectReference>
40+
<ProjectReference Include="..\Rezoom.SQL.Compiler\Rezoom.SQL.Compiler.fsproj" />
9741
<Reference Include="mscorlib" />
9842
<Reference Include="System" />
9943
<Reference Include="System.ComponentModel.DataAnnotations" />
10044
<Reference Include="System.Configuration" />
10145
<Reference Include="System.Core" />
10246
<Reference Include="System.Data" />
10347
<Reference Include="System.Numerics" />
104-
<ProjectReference Include="..\Rezoom.SQL.Mapping\Rezoom.SQL.Mapping.fsproj">
105-
<Name>Rezoom.SQL.Mapping</Name>
106-
<Project>{6b6a06c5-157a-4fe3-8b4c-2a1ae6a15333}</Project>
107-
<Private>True</Private>
108-
</ProjectReference>
48+
<ProjectReference Include="..\Rezoom.SQL.Mapping\Rezoom.SQL.Mapping.fsproj" />
10949
</ItemGroup>
110-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
111-
Other similar extension points exist, see Microsoft.Common.targets.
112-
<Target Name="BeforeBuild">
113-
</Target>
114-
<Target Name="AfterBuild">
115-
</Target>
116-
-->
117-
<Import Project="..\..\.paket\paket.targets" />
118-
<Choose>
119-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
120-
<ItemGroup>
121-
<Reference Include="FSharp.Core">
122-
<HintPath>..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
123-
<Private>True</Private>
124-
<Paket>True</Paket>
125-
</Reference>
126-
</ItemGroup>
127-
</When>
128-
</Choose>
129-
<Choose>
130-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
131-
<ItemGroup>
132-
<Reference Include="FsUnit.NUnit">
133-
<HintPath>..\..\packages\FsUnit\lib\net45\FsUnit.NUnit.dll</HintPath>
134-
<Private>True</Private>
135-
<Paket>True</Paket>
136-
</Reference>
137-
</ItemGroup>
138-
</When>
139-
</Choose>
140-
<Choose>
141-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
142-
<ItemGroup>
143-
<Reference Include="LicenseToCIL">
144-
<HintPath>..\..\packages\LicenseToCIL\lib\net45\LicenseToCIL.dll</HintPath>
145-
<Private>True</Private>
146-
<Paket>True</Paket>
147-
</Reference>
148-
</ItemGroup>
149-
</When>
150-
</Choose>
151-
<Choose>
152-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
153-
<ItemGroup>
154-
<Reference Include="nunit.framework">
155-
<HintPath>..\..\packages\NUnit\lib\net45\nunit.framework.dll</HintPath>
156-
<Private>True</Private>
157-
<Paket>True</Paket>
158-
</Reference>
159-
</ItemGroup>
160-
</When>
161-
</Choose>
162-
<Choose>
163-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
164-
<ItemGroup>
165-
<Reference Include="Rezoom">
166-
<HintPath>..\..\packages\Rezoom\lib\net45\Rezoom.dll</HintPath>
167-
<Private>True</Private>
168-
<Paket>True</Paket>
169-
</Reference>
170-
</ItemGroup>
171-
</When>
172-
</Choose>
173-
<Choose>
174-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
175-
<ItemGroup>
176-
<Reference Include="System.Console">
177-
<HintPath>..\..\packages\System.Console\lib\net46\System.Console.dll</HintPath>
178-
<Private>True</Private>
179-
<Paket>True</Paket>
180-
</Reference>
181-
</ItemGroup>
182-
</When>
183-
</Choose>
184-
<Choose>
185-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
186-
<ItemGroup>
187-
<Reference Include="System.IO">
188-
<HintPath>..\..\packages\System.IO\lib\net462\System.IO.dll</HintPath>
189-
<Private>True</Private>
190-
<Paket>True</Paket>
191-
</Reference>
192-
</ItemGroup>
193-
</When>
194-
</Choose>
195-
<Choose>
196-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
197-
<ItemGroup>
198-
<Reference Include="System.Linq">
199-
<HintPath>..\..\packages\System.Linq\lib\net463\System.Linq.dll</HintPath>
200-
<Private>True</Private>
201-
<Paket>True</Paket>
202-
</Reference>
203-
</ItemGroup>
204-
</When>
205-
</Choose>
206-
<Choose>
207-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
208-
<ItemGroup>
209-
<Reference Include="System.Linq.Expressions">
210-
<HintPath>..\..\packages\System.Linq.Expressions\lib\net463\System.Linq.Expressions.dll</HintPath>
211-
<Private>True</Private>
212-
<Paket>True</Paket>
213-
</Reference>
214-
</ItemGroup>
215-
</When>
216-
</Choose>
217-
<Choose>
218-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
219-
<ItemGroup>
220-
<Reference Include="System.Reflection">
221-
<HintPath>..\..\packages\System.Reflection\lib\net462\System.Reflection.dll</HintPath>
222-
<Private>True</Private>
223-
<Paket>True</Paket>
224-
</Reference>
225-
</ItemGroup>
226-
</When>
227-
</Choose>
228-
<Choose>
229-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
230-
<ItemGroup>
231-
<Reference Include="System.ComponentModel.Composition">
232-
<Paket>True</Paket>
233-
</Reference>
234-
<Reference Include="System.Runtime">
235-
<HintPath>..\..\packages\System.Runtime\lib\net462\System.Runtime.dll</HintPath>
236-
<Private>True</Private>
237-
<Paket>True</Paket>
238-
</Reference>
239-
</ItemGroup>
240-
</When>
241-
</Choose>
242-
<Choose>
243-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
244-
<ItemGroup>
245-
<Reference Include="System.Runtime.Extensions">
246-
<HintPath>..\..\packages\System.Runtime.Extensions\lib\net462\System.Runtime.Extensions.dll</HintPath>
247-
<Private>True</Private>
248-
<Paket>True</Paket>
249-
</Reference>
250-
</ItemGroup>
251-
</When>
252-
</Choose>
253-
<Choose>
254-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
255-
<ItemGroup>
256-
<Reference Include="System.Text.RegularExpressions">
257-
<HintPath>..\..\packages\System.Text.RegularExpressions\lib\net463\System.Text.RegularExpressions.dll</HintPath>
258-
<Private>True</Private>
259-
<Paket>True</Paket>
260-
</Reference>
261-
</ItemGroup>
262-
</When>
263-
</Choose>
264-
<Choose>
265-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
266-
<ItemGroup>
267-
<Reference Include="System.Threading.Thread">
268-
<HintPath>..\..\packages\System.Threading.Thread\lib\net46\System.Threading.Thread.dll</HintPath>
269-
<Private>True</Private>
270-
<Paket>True</Paket>
271-
</Reference>
272-
</ItemGroup>
273-
</When>
274-
</Choose>
275-
<Choose>
276-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2')">
277-
<ItemGroup>
278-
<Reference Include="System.Threading.ThreadPool">
279-
<HintPath>..\..\packages\System.Threading.ThreadPool\lib\net46\System.Threading.ThreadPool.dll</HintPath>
280-
<Private>True</Private>
281-
<Paket>True</Paket>
282-
</Reference>
283-
</ItemGroup>
284-
</When>
285-
</Choose>
286-
<Import Project="..\..\packages\NETStandard.Library\build\$(__paket__NETStandard_Library_targets).targets" Condition="Exists('..\..\packages\NETStandard.Library\build\$(__paket__NETStandard_Library_targets).targets')" Label="Paket" />
50+
<Import Project="..\..\.paket\Paket.Restore.targets" />
28751
</Project>

‎src/Rezoom.SQL.sln‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.9
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28721.148
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{EF6B3A49-8E78-4B54-9086-B794213C7D95}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{EF6B3A49-8E78-4B54-9086-B794213C7D95}"
77
ProjectSection(SolutionItems) = preProject
8+
..\.deployment = ..\.deployment
9+
..\.gitignore = ..\.gitignore
10+
..\.travis.yml = ..\.travis.yml
11+
..\LICENSE.txt = ..\LICENSE.txt
812
..\paket.dependencies = ..\paket.dependencies
13+
..\paket.lock = ..\paket.lock
14+
..\README.md = ..\README.md
15+
..\SUMMARY.md = ..\SUMMARY.md
916
EndProjectSection
1017
EndProject
1118
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3CFAC282-AFAA-4B7A-879F-D2BDF9EC631B}"
1219
EndProject
13-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Rezoom.SQL.Mapping", "Rezoom.SQL.Mapping/Rezoom.SQL.Mapping.fsproj", "{6B6A06C5-157A-4FE3-8B4C-2A1AE6A15333}"
20+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Rezoom.SQL.Mapping", "Rezoom.SQL.Mapping\Rezoom.SQL.Mapping.fsproj", "{6B6A06C5-157A-4FE3-8B4C-2A1AE6A15333}"
1421
EndProject
15-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Rezoom.SQL.Test", "Rezoom.SQL.Test/Rezoom.SQL.Test.fsproj", "{AA699897-F692-4ED0-9865-98B6B4C713DB}"
22+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Rezoom.SQL.Test", "Rezoom.SQL.Test\Rezoom.SQL.Test.fsproj", "{AA699897-F692-4ED0-9865-98B6B4C713DB}"
1623
EndProject
17-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Rezoom.SQL.Provider", "Rezoom.SQL.Provider/Rezoom.SQL.Provider.fsproj", "{7B1765CB-23F8-419A-9CC6-3DA319ED066F}"
24+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Rezoom.SQL.Provider", "Rezoom.SQL.Provider\Rezoom.SQL.Provider.fsproj", "{7B1765CB-23F8-419A-9CC6-3DA319ED066F}"
1825
EndProject
19-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Rezoom.SQL.Compiler", "Rezoom.SQL.Compiler/Rezoom.SQL.Compiler.fsproj", "{87FCD04A-1F90-4D53-A428-CF5F5C532A22}"
26+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Rezoom.SQL.Compiler", "Rezoom.SQL.Compiler\Rezoom.SQL.Compiler.fsproj", "{87FCD04A-1F90-4D53-A428-CF5F5C532A22}"
2027
EndProject
2128
Global
2229
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,4 +54,7 @@ Global
4754
GlobalSection(NestedProjects) = preSolution
4855
{AA699897-F692-4ED0-9865-98B6B4C713DB} = {3CFAC282-AFAA-4B7A-879F-D2BDF9EC631B}
4956
EndGlobalSection
57+
GlobalSection(ExtensibilityGlobals) = postSolution
58+
SolutionGuid = {F398DF91-80CD-49F4-AB10-5AD3C1D3688D}
59+
EndGlobalSection
5060
EndGlobal

0 commit comments

Comments
 (0)