Update csc.json

This reverts commit c61e78b585.

.github/csc.json

@@ -4,14 +4,15 @@
             "owner": "csc",
             "pattern": [
                 {
-                    "regexp": "^([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(error|warning|info)\\s+(CS\\d+)\\s*:\\s*(.*)$",
+                    "regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+|\\d+,\\d+|\\d+,\\d+,\\d+,\\d+)\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)(\\[(.+)\\/([^\\/]+)\\])$",
                     "file": 1,
                     "location": 2,
                     "severity": 3,
                     "code": 4,
-                    "message": 5
+                    "message": 5,
+                    "fromPath": 7
                 }
             ]
         }
     ]
-}
+}

.gitignore

@@ -1,7 +1,92 @@
-# runtime dependencies are checked in
+# Explicitly not ignoring node_modules so that they are included in package downloaded by runner
-# dev dependencies are *not* checked in
+!node_modules/
-node_modules/.bin
+__tests__/runner/*
-node_modules/typescript
+
-node_modules/@types
+# Rest of the file pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
-node_modules/prettier
+# Logs
-__tests__/runner/*
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/

action.yml

@@ -7,6 +7,7 @@ inputs:
 # Deprecated option, do not use. Will not be supported after October 1, 2019
   version:
     description: 'Deprecated. Use dotnet-version instead. Will not be supported after October 1, 2019'
+    deprecationMessage: 'The version property will not be supported after October 1, 2019. Use dotnet-version instead'
 runs:
   using: 'node12'
   main: 'lib/setup-dotnet.js'

lib/installer.js

@@ -72,6 +72,8 @@ class DotnetCoreInstaller {
             else {
                 console.log('Using cached tool');
             }
+            // Need to set this so that .NET Core global tools find the right locations.
+            core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..'));
             // Prepend the tools path. instructs the agent to prepend for future tasks
             core.addPath(toolPath);
         });

src/installer.ts

@@ -58,6 +58,9 @@ export class DotnetCoreInstaller {
       console.log('Using cached tool');
     }
 
+    // Need to set this so that .NET Core global tools find the right locations.
+    core.exportVariable('DOTNET_ROOT', path.join(toolPath, '../..'));
+
     // Prepend the tools path. instructs the agent to prepend for future tasks
     core.addPath(toolPath);
   }
@@ -171,6 +174,7 @@ export class DotnetCoreInstaller {
       this.version,
       this.arch
     );
+
     console.log('Successfully installed', this.version);
     return cachedDir;
   }