Update to recommended Dev process for aspnetcore3+Vue and switch to i…

…mproved theme (#256)

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
     "appPort": [2525, 8080],
-    "extensions": ["ms-vscode.csharp"]
+    "extensions": ["ms-vscode.csharp", "formulahendry.dotnet-test-explorer", "msjsdiag.debugger-for-chrome", "ms-azuretools.vscode-docker", "dbaeumer.vscode-eslint", "octref.vetur"]
 
 }

.gitignore

@@ -28,7 +28,7 @@ Obj/
 
 # Visual Studio 2015 cache/options directory
 .vs/
-/wwwroot/dist/
+Rnwood.Smtp4dev/wwwroot/*
 
 /yarn.lock
 

.vscode/launch.json

@@ -11,13 +11,12 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Rnwood.Smtp4dev/bin/Debug/netcoreapp2.2/Rnwood.Smtp4dev.dll",
-            "args": ["--smtpport=2525", "--server.urls=8080"],
+            "program": "${workspaceFolder}/Rnwood.Smtp4dev/bin/Debug/netcoreapp3.1/Rnwood.Smtp4dev.dll",
             "cwd": "${workspaceFolder}/Rnwood.Smtp4dev",
             "stopAtEntry": false,
             "internalConsoleOptions": "openOnSessionStart",
             "launchBrowser": {
-                "enabled": false,
+                "enabled": true,
                 "args": "${auto-detect-url}",
                 "windows": {
                     "command": "cmd.exe",
@@ -32,30 +31,13 @@
             },
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceFolder}/Views"
             }
         },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",
             "request": "attach",
             "processId": "${command:pickProcess}"
-        },
-        {
-            "name": "Debug in Chrome",
-            "type": "chrome",
-            "request": "launch",
-            "url": "http://localhost:28261",
-            "webRoot": "${workspaceFolder}/dist/",
-            "sourceMaps": true
-        }
-    ],
-    "compounds": [
-        {
-            "name": ".NET Core Launch (web) AND Debug in Chrome",
-            "configurations": [".NET Core Launch (web)", "Debug in Chrome"]
         }
     ]
 }

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+  "eslint.lintTask.enable": true,
+  "eslint.validate": [
+    "typescript",
+    "vue"
+  ],
+  "eslint.workingDirectories": [
+    "Rnwood.Smtp4dev/ClientApp"
+  ],
+  "npm.includeDirectories": [
+    "Rnwood.Smtp4dev/ClientApp"
+  ]
+}

Dockerfile.windows

@@ -33,11 +33,6 @@ COPY *.sln .
 COPY Rnwood.Smtp4dev/*.csproj ./Rnwood.Smtp4dev/
 RUN dotnet restore Rnwood.Smtp4dev
 
-COPY Rnwood.Smtp4dev/npm-shrinkwrap.json ./Rnwood.Smtp4dev/
-COPY Rnwood.Smtp4dev/package.json ./Rnwood.Smtp4dev/
-WORKDIR /app/Rnwood.Smtp4dev
-RUN npm install
-
 # copy everything else and build app
 
 WORKDIR /app
@@ -60,4 +55,4 @@ ENV ASPNETCORE_URLS=http://+:80 \
 DOTNET_RUNNING_IN_CONTAINER=true
 
 WORKDIR /dotnet
-ENTRYPOINT ["dotnet", "/app/Rnwood.Smtp4dev.dll"]
+ENTRYPOINT ["dotnet", "/app/Rnwood.Smtp4dev.dll"]

Rnwood.Smtp4dev.Tests/E2E/E2ETests.cs

@@ -142,7 +142,7 @@ private void RunE2ETest(Action<IWebDriver, Uri, int> test)
 
 			if (string.IsNullOrEmpty(mainModule))
 			{
-				mainModule = Path.GetFullPath("../../../../Rnwood.Smtp4dev/bin/Debug/netcoreapp2.2/Rnwood.Smtp4dev.dll");
+				mainModule = Path.GetFullPath("../../../../Rnwood.Smtp4dev/bin/Debug/netcoreapp3.1/Rnwood.Smtp4dev.dll");
 			}
 
 			CancellationToken timeout = new CancellationTokenSource(TimeSpan.FromSeconds(60)).Token;

Rnwood.Smtp4dev.Tests/Rnwood.Smtp4dev.Tests.csproj

@@ -10,8 +10,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-
     <PackageReference Include="MailKit" Version="2.5.1" />
     <PackageReference Include="MedallionShell" Version="1.6.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

Rnwood.Smtp4dev/ApiModel/Message.cs

@@ -99,20 +99,15 @@ private MessageEntitySummary HandleMimeEntity(MimeEntity entity)
                    Attachments = new List<AttachmentSummary>(),
                    Warnings = new List<MessageWarning>(),
                    Size = e.ToString().Length,
+                   IsAttachment = (e.ContentDisposition?.Disposition != "inline" && !string.IsNullOrEmpty(fileName)) || e.ContentDisposition?.Disposition == "attachment",
                    MimeEntity = e
                };
 
                if (p != null)
                {
                    p.ChildParts.Add(result);
 
-
-
-
-
-                   bool isAttachment = (e.ContentDisposition?.Disposition != "inline" && !string.IsNullOrEmpty(fileName)) || e.ContentDisposition?.Disposition == "attachment";
-
-                   if (isAttachment)
+                   if (result.IsAttachment)
                    {
                        if (e.ContentDisposition?.Disposition != "attachment")
                        {

Rnwood.Smtp4dev/ApiModel/MessageEntitySummary.cs

@@ -22,6 +22,8 @@ public class MessageEntitySummary
 
         public int Size { get; set; }
 
+        public bool IsAttachment{ get; set;}
+
         [JsonIgnore]
         internal MimeEntity MimeEntity { get; set; }
     }