Skip to content

Commit 907dd6a

Browse files
committed
Ditched paket for the time being. Got all projects compiling (except recipes). Got all test projects to pass tests.
1 parent 8260d81 commit 907dd6a

24 files changed

+83
-769
lines changed

.vscode/launch.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
// Use IntelliSense to find out which attributes exist for C# debugging
3+
// Use hover for the description of the existing attributes
4+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": ".NET Core Launch (console)",
9+
"type": "coreclr",
10+
"request": "launch",
11+
"preLaunchTask": "build",
12+
// If you have changed target frameworks, make sure to update the program path.
13+
"program": "${workspaceRoot}/src/Projac.Tests/bin/Debug/netcoreapp2.0/Projac.Tests.dll",
14+
"args": [],
15+
"cwd": "${workspaceRoot}/src/Projac.Tests",
16+
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
17+
"console": "internalConsole",
18+
"stopAtEntry": false,
19+
"internalConsoleOptions": "openOnSessionStart"
20+
},
21+
{
22+
"name": ".NET Core Attach",
23+
"type": "coreclr",
24+
"request": "attach",
25+
"processId": "${command:pickProcess}"
26+
}
27+
]
28+
}

.vscode/tasks.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "0.1.0",
3+
"command": "dotnet",
4+
"isShellCommand": true,
5+
"args": [],
6+
"tasks": [
7+
{
8+
"taskName": "build",
9+
"args": [
10+
"${workspaceRoot}/src/Projac.Tests/Projac.Tests.csproj"
11+
],
12+
"isBuildCommand": true,
13+
"problemMatcher": "$msCompile"
14+
}
15+
]
16+
}

paket.dependencies

Lines changed: 0 additions & 16 deletions
This file was deleted.

paket.lock

Lines changed: 0 additions & 726 deletions
This file was deleted.

src/All.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Projac.SqlClient", "Projac.
1616
EndProject
1717
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Projac.SQLite", "Projac.SQLite\Projac.SQLite.csproj", "{34265EC4-8462-489E-ACFB-387A8D369525}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recipes", "Recipes\Recipes.csproj", "{E87B6569-3455-451D-A101-373D086CFF8B}"
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Projac.Recipes", "Projac.Recipes\Projac.Recipes.csproj", "{E87B6569-3455-451D-A101-373D086CFF8B}"
2020
EndProject
2121
Global
2222
GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Projac.SQLite.Tests/Projac.SQLite.Tests.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<Reference Include="System.Core" />
2222
<Reference Include="System.Data" />
2323
<Reference Include="Microsoft.CSharp" />
24+
<PackageReference Include="System.Data.SQLite.Core.MSIL" Version="1.0.105.2" />
25+
<PackageReference Include="NUnit" Version="3.8.0" />
26+
<PackageReference Include="NUnit3TestAdapter" Version="3.8" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2428
</ItemGroup>
25-
<Import Project="..\..\.paket\Paket.Restore.targets" />
2629
</Project>

src/Projac.SQLite.Tests/paket.references

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/Projac.SQLite/Projac.SQLite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
<Reference Include="System.Core" />
2929
<Reference Include="System.Data" />
3030
<Reference Include="Microsoft.CSharp" />
31+
<PackageReference Include="System.Data.SQLite.Core.MSIL" Version="1.0.105.2" />
3132
</ItemGroup>
32-
<Import Project="..\..\.paket\Paket.Restore.targets" />
3333
</Project>

src/Projac.SQLite/paket.references

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Projac.Sql.Tests/Executors/SqlCommandExecutorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ await sut.ExecuteScalarAsync(null, CancellationToken.None),
164164
Throws.ArgumentNullException);
165165
}
166166

167-
#if NETSTANDARD2_0
167+
#if NETCOREAPP2_0
168168
private static SqlCommandExecutor SutFactory()
169169
{
170170
return new SqlCommandExecutor(System.Data.SqlClient.SqlClientFactory.Instance, "");

0 commit comments

Comments
 (0)