fix

Author: kennethchoe

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+ "version": 1,
+ "isRoot": true,
+ "tools": {
+ "cake.tool": {
+ "version": "1.1.0",
+ "commands": [
+ "dotnet-cake"
+ ]
+ }
+ }
+}

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
 "dockerfile": "Dockerfile",
 "args": { 
 // Update 'VARIANT' to pick a .NET Core version: 2.1, 3.1, 5.0
-"VARIANT": "5.0",
+"VARIANT": "3.1",
 // Options
 "INSTALL_NODE": "true",
 "NODE_VERSION": "lts/*",
@@ -51,7 +51,7 @@
 // "mounts": [ "source=${env:HOME}${env:USERPROFILE}/.aspnet/https,target=/home/vscode/.aspnet/https,type=bind" ],
 
 // Use 'postCreateCommand' to run commands after the container is created.
-// "postCreateCommand": "dotnet restore",
+"postCreateCommand": "dotnet tool restore && dotnet restore src/sql-crawler.sln",
 
 // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 "remoteUser": "vscode"

.github/workflows/docker.yml

@@ -22,7 +22,7 @@ jobs:
 
  - name: Build Docker Image
  run: |
- pwsh build.ps1 --target  Build-Docker
+ dotnet cake --target Build-Docker
 
  - name: Push Docker Image
  run: |

.vscode/launch.json

@@ -0,0 +1,34 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": ".NET Core Launch (web)",
+ "type": "coreclr",
+ "request": "launch",
+ "preLaunchTask": "build",
+ "program": "${workspaceFolder}/src/SqlCrawler.Web/bin/Debug/netcoreapp3.1/SqlCrawler.Web.dll",
+ "args": [],
+ "cwd": "${workspaceFolder}/src/SqlCrawler.Web",
+ "stopAtEntry": false,
+ "serverReadyAction": {
+ "action": "openExternally",
+ "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
+ },
+ "env": {
+ "ASPNETCORE_ENVIRONMENT": "Development"
+ },
+ "sourceFileMap": {
+ "/Views": "${workspaceFolder}/Views"
+ }
+ },
+ {
+ "name": ".NET Core Attach",
+ "type": "coreclr",
+ "request": "attach",
+ "processId": "${command:pickProcess}"
+ }
+ ]
+}

.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "build",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "build",
+ "${workspaceFolder}/src/SqlCrawler.Web/SqlCrawler.Web.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "publish",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "publish",
+ "${workspaceFolder}/src/SqlCrawler.Web/SqlCrawler.Web.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ },
+ {
+ "label": "watch",
+ "command": "dotnet",
+ "type": "process",
+ "args": [
+ "watch",
+ "run",
+ "${workspaceFolder}/src/SqlCrawler.Web/SqlCrawler.Web.csproj",
+ "/property:GenerateFullPaths=true",
+ "/consoleloggerparameters:NoSummary"
+ ],
+ "problemMatcher": "$msCompile"
+ }
+ ]
+}

build.cake

@@ -1,17 +1,17 @@
 #addin nuget:?package=Cake.Npm&version=0.17.0
 
 var name = "sql-crawler";
-var solution = "./src/" + name + ".sln";
+var solution = Directory("./src") + File(name + ".sln");
 var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
 var version = Argument("PackageVersion", "1.0.0.0");
 
-var buildDir = Directory(".\\src\\SqlCrawler.Web\\bin") + Directory(configuration);
+var buildDir = Directory("./src/SqlCrawler.Web/bin") + Directory(configuration);
 
 Task("SetVersion")
  .Does(() =>
 {
- var propsFile = "./src/Directory.build.props";
+ var propsFile = Directory("./src") + File("Directory.build.props");
  Information(version);
  XmlPoke(propsFile, "//Version", version);
 });
@@ -31,7 +31,7 @@ Task("Restore-NuGet-Packages")
 Task("Build-Vue")
  .Does(() =>
 {
- var vuePath = ".\\src\\vue";
+ var vuePath = Directory("src/vue");
  NpmInstall(new NpmInstallSettings {WorkingDirectory = vuePath});
  NpmRunScript(new NpmRunScriptSettings {WorkingDirectory = vuePath, ScriptName = "build"});
 });
@@ -61,7 +61,7 @@ Task("Build-Docker")
  .IsDependentOn("Build-Vue")
  .Does(() =>
 {
- var srcDirectory = Directory(".\\src");
+ var srcDirectory = Directory("./src");
  var exitCode = StartProcess("docker", "build " + srcDirectory + " -t kennethchoe/" + name);
  if (exitCode != 0)
  throw new Exception("Failed.");
@@ -92,7 +92,7 @@ Task("Publish")
  .Does(() =>
 {
  CleanDirectory("./output");
- var publishPath = "./output/publish/";
+ var publishPath = Directory("./output/publish/");
  var settings = new DotNetCorePublishSettings
  {
  Configuration = configuration,
@@ -101,10 +101,10 @@ Task("Publish")
 
  DotNetCorePublish(solution, settings);
 
- var packagePath = "./output/package/";
+ var packagePath = Directory("./output/package");
  CleanDirectory(packagePath);
- Zip(publishPath, packagePath + "latestPackage.zip", publishPath + "**/*");
- CopyFile(packagePath + "latestPackage.zip", packagePath + name + " " + version + ".zip");
+ Zip(publishPath, packagePath + File("latestPackage.zip"), publishPath + Directory("**/*"));
+ CopyFile(packagePath + File("latestPackage.zip"), packagePath + File(name + " " + version + ".zip"));
 });
 
 RunTarget(target);