Merge branch 'master' into global-json

lib/setup-dotnet.js

@@ -27,6 +27,9 @@ function run() {
             // If not supplied then task is still used to setup proxy, auth, etc...
             //
             let version = core.getInput('version');
+            if (!version) {
+              version = core.getInput('dotnet-version');
+            }
             if (!version) {
                 // Try to fall back to global.json
                 core.debug('No version found, trying to find version from global.json');