Merge branch 'develop' into 'master'

Develop See merge request company-projects/Meadow!29
MeadowSuite · Oct 1, 2018 · b2b8159 · b2b8159
2 parents 74e1aa1 + f4f9486
commit b2b8159
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/images/meadow-icon-256x256.png b/images/meadow-icon-256x256.png
diff --git a/src/Meadow.CoverageReport/Views/UnitTestOutcomeView.cshtml b/src/Meadow.CoverageReport/Views/UnitTestOutcomeView.cshtml
@@ -70,7 +70,7 @@
                                 <span class="test-outcome-icon test-outcome-icon-fail">✗</span>
                             }
                             <span class="test-outcome-test-name">@testOutcome.TestName</span>
-                            <span class="test-outcome-duration">(@(Math.Round(testOutcome.Duration.TotalSeconds, 2))s)</span>
+                            <span class="test-outcome-duration">(@(Math.Round(testOutcome.Duration.TotalMilliseconds))ms)</span>
                         </div>
                     }
                 </div>

diff --git a/src/Meadow.DebugAdapterServer/Meadow.DebugAdapterServer.csproj b/src/Meadow.DebugAdapterServer/Meadow.DebugAdapterServer.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Shared.VsCodeDebugProtocol" Version="15.8.20719.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Portable.Microsoft.VisualStudio.Shared.VsCodeDebugProtocol" Version="15.8.20719.13" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Meadow.VSCode.Debugger/package.json b/src/Meadow.VSCode.Debugger/package.json
@@ -1,7 +1,7 @@
 {
   "name": "solidity-debugger",
   "displayName": "Solidity Debugger",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Debugger for Solidity smart contracts - powered by the Meadow testing and development tool suite",
   "categories": [
     "Debuggers"
@@ -28,6 +28,7 @@
   "extensionDependencies": [
     "ms-vscode.csharp"
   ],
+  "icon": "https://github.com/MeadowSuite/Meadow/raw/master/images/meadow-icon-256x256.png?raw=true",
   "preview": true,
   "private": true,
   "scripts": {