Merge branch 'main' of github.com:sk593/vscode-dapr into stopApp-micr…

…osoft#81

package.json

@@ -13,7 +13,9 @@
 		"ui"
 	],
 	"engines": {
-		"vscode": "^1.54.0"
+		"dapr-cli": ">=1.0",
+		"dapr-runtime": ">=1.0",
+		"vscode": "^1.57.0"
 	},
 	"categories": [
 		"Debuggers",
@@ -33,6 +35,7 @@
 		"onCommand:vscode-dapr.applications.publish-message",
 		"onCommand:vscode-dapr.applications.stop-app",
 		"onCommand:vscode-dapr.help.getStarted",
+		"onCommand:vscode-dapr.help.installDapr",
 		"onCommand:vscode-dapr.help.readDocumentation",
 		"onCommand:vscode-dapr.help.reportIssue",
 		"onCommand:vscode-dapr.help.reviewIssues",
@@ -80,6 +83,11 @@
 				"title": "%vscode-dapr.help.getStarted.title%",
 				"category": "Dapr"
 			},
+			{
+				"command": "vscode-dapr.help.installDapr",
+				"title": "%vscode-dapr.help.installDapr.title%",
+				"category": "Dapr"
+			},
 			{
 				"command": "vscode-dapr.help.readDocumentation",
 				"title": "%vscode-dapr.help.readDocumentation.title%",
@@ -435,7 +443,24 @@
 					"icon": "assets/images/dapr.svg"
 				}
 			]
-		}
+		},
+		"viewsWelcome": [
+			{
+				"view": "vscode-dapr.views.applications",
+				"contents": "%vscode-dapr.views.applications.contents.notInitialized%",
+				"when": "vscode-dapr.views.applications.state == 'notInitialized'"
+			},
+			{
+				"view": "vscode-dapr.views.applications",
+				"contents": "%vscode-dapr.views.applications.contents.notInstalled%",
+				"when": "vscode-dapr.views.applications.state == 'notInstalled'"
+			},
+			{
+				"view": "vscode-dapr.views.applications",
+				"contents": "%vscode-dapr.views.applications.contents.notRunning%",
+				"when": "vscode-dapr.views.applications.state == 'notRunning'"
+			}
+		]
 	},
 	"scripts": {
 		"clean": "gulp clean",
@@ -457,8 +482,9 @@
 		"@types/mocha": "^8.2.2",
 		"@types/node": "^12.20.1",
 		"@types/ps-list": "^6.2.1",
+		"@types/semver": "^7.3.6",
 		"@types/terser-webpack-plugin": "^5.0.2",
-		"@types/vscode": "^1.54.0",
+		"@types/vscode": "^1.57.0",
 		"@types/webpack": "^4.41.26",
 		"@types/which": "^2.0.1",
 		"@typescript-eslint/eslint-plugin": "^4.19.0",
@@ -486,6 +512,7 @@
 		"fs-extra": "^9.1.0",
 		"handlebars": "^4.7.7",
 		"ps-list": "^7.2.0",
+		"semver": "^5.7.1",
 		"vscode-azureextensionui": "^0.40.0",
 		"vscode-nls": "^5.0.0"
 	}

package.nls.json

@@ -10,11 +10,16 @@
 
     "vscode-dapr.help.readDocumentation.title": "Read Documentation",
     "vscode-dapr.help.getStarted.title": "Get Started",
+    "vscode-dapr.help.installDapr.title": "Install Dapr",
     "vscode-dapr.help.reportIssue.title": "Report Issue",
     "vscode-dapr.help.reviewIssues.title": "Review Issues",
     "vscode-dapr.tasks.scaffoldDaprComponents.title": "Scaffold Dapr Components",
     "vscode-dapr.tasks.scaffoldDaprTasks.title": "Scaffold Dapr Tasks",
+
     "vscode-dapr.views.applications.name": "Applications",
+    "vscode-dapr.views.applications.contents.notInitialized": "A compatible version of the Dapr runtime has not been found. You may need to install a more recent version.\n[Install Latest Dapr](command:vscode-dapr.help.installDapr)",
+    "vscode-dapr.views.applications.contents.notInstalled": "A compatible version of the Dapr CLI has not been found. You may need to install a more recent version.\n[Install Latest Dapr](command:vscode-dapr.help.installDapr)",
+    "vscode-dapr.views.applications.contents.notRunning": "No Dapr applications are running.",
     "vscode-dapr.views.help.name": "Help and Feedback",
 
     "vscode-dapr.view-containers.dapr-explorer.title": "Dapr",

src/commands/help/installDapr.ts

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import { UserInput } from '../../services/userInput';
+
+export function installDapr(ui: UserInput): Thenable<boolean> {
+    return ui.openExternal('https://aka.ms/vscode-dapr-install-dapr');
+}
+
+const createInstallDaprCommand = (ui: UserInput) => (): Thenable<boolean> => installDapr(ui);
+
+export default createInstallDaprCommand;