Fixing up things I broke on Windows.

yreynhout · yreynhout · commit c5b269faee31 · 2017-12-05T10:40:47.000+01:00
diff --git a/src/Projac.Recipes/EventStoreIntegration/Usage.cs b/src/Projac.Recipes/EventStoreIntegration/Usage.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#if NET46 || NET462
+using System;
 using System.Configuration;
 using System.Data;
 using System.Linq;
@@ -200,3 +201,4 @@ [Name] NVARCHAR(MAX) NOT NULL,
         }
     }
 }
+#endif
diff --git a/src/Projac.Recipes/Projac.Recipes.csproj b/src/Projac.Recipes/Projac.Recipes.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>Projac.Recipes</AssemblyName>
     <AssemblyTitle>Projac.Recipes</AssemblyTitle>
     <TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net46</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net452;net46;net462</TargetFrameworks>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <RootNamespace>Projac.Recipes</RootNamespace>
     <DebugSymbols>true</DebugSymbols>
@@ -41,7 +41,7 @@
     <ProjectReference Include="..\Projac.SqlClient\Projac.SqlClient.csproj" />
     <ProjectReference Include="..\Projac.SQLite\Projac.SQLite.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net462' ">
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Configuration" />
@@ -55,14 +55,18 @@
   <ItemGroup>
     <PackageReference Include="CompareNETObjects" Version="3.09.0.0" />
     <PackageReference Include="ElasticSearch.Net" Version="5.5.0" />
-    <PackageReference Include="EventStore.Client.Embedded" Version="4.0.3" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="RavenDB.Embedded" Version="3.5.4" />
-    <PackageReference Include="SqlStreamStore" Version="1.1.1" />
     <PackageReference Include="StackExchange.Redis" Version="1.2.6" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.105.2" />
     <PackageReference Include="WindowsAzure.Storage" Version="8.5.0" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <PackageReference Include="SqlStreamStore" Version="1.1.1" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net462' ">
+    <PackageReference Include="EventStore.Client.Embedded" Version="4.0.3" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
diff --git a/src/Projac.Recipes/SqlStreamStoreIntegration/Usage.cs b/src/Projac.Recipes/SqlStreamStoreIntegration/Usage.cs
@@ -1,3 +1,4 @@
+#if NET462
 using System;
 using System.Configuration;
 using System.Data;
@@ -174,3 +175,4 @@ [Name] NVARCHAR(MAX) NOT NULL,
         }
     }
 }
+#endif
diff --git a/src/Projac.SQLite.Tests/SQLiteParameterValueStub.cs b/src/Projac.SQLite.Tests/SQLiteParameterValueStub.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Data.Common;
 using System.Data.SQLite;
+using Projac.Sql;
 
 namespace Projac.SQLite.Tests
 {
diff --git a/src/Projac.SQLite.Tests/SQLiteSyntaxTestCases.cs b/src/Projac.SQLite.Tests/SQLiteSyntaxTestCases.cs
@@ -2,6 +2,7 @@
 using System.Data;
 using System.Data.Common;
 using NUnit.Framework;
+using Projac.Sql;
 using Projac.SQLite;
 
 namespace Projac.SQLite.Tests
diff --git a/src/Projac.SQLite.Tests/SQLiteSyntaxTests.Compose.cs b/src/Projac.SQLite.Tests/SQLiteSyntaxTests.Compose.cs
@@ -3,6 +3,7 @@
 using System.Data;
 using System.Data.Common;
 using NUnit.Framework;
+using Projac.Sql;
 
 namespace Projac.SQLite.Tests
 {
diff --git a/src/Projac.SQLite.Tests/SQLiteSyntaxTests.NonQueryStatement.cs b/src/Projac.SQLite.Tests/SQLiteSyntaxTests.NonQueryStatement.cs
@@ -1,6 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using Projac.Sql;
 
 namespace Projac.SQLite.Tests
 {
diff --git a/src/Projac.SQLite.Tests/SQLiteSyntaxTests.QueryStatement.cs b/src/Projac.SQLite.Tests/SQLiteSyntaxTests.QueryStatement.cs
@@ -1,6 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using Projac.Sql;
 
 namespace Projac.SQLite.Tests
 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+#if NET46 \|\| NET462`
	`2`	`+using System;`
`2`	`3`	`using System.Configuration;`
`3`	`4`	`using System.Data;`
`4`	`5`	`using System.Linq;`
`@@ -200,3 +201,4 @@ [Name] NVARCHAR(MAX) NOT NULL,`
`200`	`201`	`}`
`201`	`202`	`}`
`202`	`203`	`}`
	`204`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if NET462`
`1`	`2`	`using System;`
`2`	`3`	`using System.Configuration;`
`3`	`4`	`using System.Data;`
`@@ -174,3 +175,4 @@ [Name] NVARCHAR(MAX) NOT NULL,`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`	`}`
	`178`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Data.Common;`
`3`	`3`	`using System.Data.SQLite;`
	`4`	`+using Projac.Sql;`
`4`	`5`
`5`	`6`	`namespace Projac.SQLite.Tests`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Data;`
`4`	`4`	`using System.Data.Common;`
`5`	`5`	`using NUnit.Framework;`
	`6`	`+using Projac.Sql;`
`6`	`7`
`7`	`8`	`namespace Projac.SQLite.Tests`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using NUnit.Framework;`
	`4`	`+using Projac.Sql;`
`4`	`5`
`5`	`6`	`namespace Projac.SQLite.Tests`
`6`	`7`	`{`