Merge pull request #67 from khaneliman/feature/troubleshoot-docker-do…

…tnet-6 Feature/troubleshoot docker dotnet 6
khaneliman · Nov 11, 2021 · 5068345 · 5068345
2 parents 4370556 + ff3dc0b
commit 5068345
Show file tree

Hide file tree

Showing 9 changed files with 18,814 additions and 8,239 deletions.
diff --git a/.gitignore b/.gitignore
@@ -385,4 +385,5 @@ FodyWeavers.xsd
 
 # JetBrains Rider
 .idea/
-*.sln.iml
+*.sln.iml
+**/.angular/cache/*
diff --git a/WebApi/.config/dotnet-tools.json b/WebApi/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "6.0.0",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
diff --git a/WebApi/WebApi.csproj b/WebApi/WebApi.csproj
@@ -8,7 +8,7 @@
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
-	<!--<ContainerDevelopmentMode>Regular</ContainerDevelopmentMode>-->
+	<ContainerDevelopmentMode>Regular</ContainerDevelopmentMode>
 	<DockerfileFastModeStage>base</DockerfileFastModeStage>
   </PropertyGroup>