Merge branch 'master' into pr/infin8x/41

# Conflicts: # action.yml
actions · Nov 12, 2019 · ff633a5 · ff633a5
2 parents a3e2a47 + 154c08a
commit ff633a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/action.yml b/action.yml
@@ -1,9 +1,9 @@
-name: 'Setup Dotnet environment'
-description: 'Setup a dotnet environment and add it to the PATH, set up proxy support, and set up authentication to private package sources like GPR.'
+name: 'Setup .NET Core SDK'
+description: 'Set up a specific version of the .NET Core SDK, add the command-line tools to the PATH and set up authentication to private package sources like GitHub Packages.'
 author: 'GitHub'
 inputs: 
   dotnet-version:
-    description: 'SDK version to use. E.g. 2.2.104'
+    description: 'SDK version to use. Example: 2.2.104'
   source-url:
     description: 'Optional package source for which to set up authentication. Will consult any existing NuGet.config in the root of the repo and provide a temporary NuGet.config using the NUGET_AUTH_TOKEN environment variable as a ClearTextPassword'
   owner:

diff --git a/package-lock.json b/package-lock.json