Merge branch 'release/2.1.4xx'

dotnet · Jun 14, 2018 · 4487ccf · 4487ccf
2 parents 8534ae9 + 1ed3109
commit 4487ccf
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 12 deletions.
diff --git a/build.sh b/build.sh
@@ -11,7 +11,7 @@ done
 REPOROOT="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 source "$REPOROOT/scripts/common/_prettyprint.sh"
-export DOTNET_VERSION=2.1.300-preview2-008248
+export DOTNET_VERSION=2.1.300
 if [ -n "$DotNetCoreSdkDir" ]
 then
     export DOTNET_VERSION=$( ${DotNetCoreSdkDir}/dotnet --version )
@@ -33,7 +33,7 @@ then
     [ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR
 
     DOTNET_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh"
-    curl -sSL "$DOTNET_INSTALL_SCRIPT_URL" | bash /dev/stdin --verbose --version 2.1.300-preview2-008248
+    curl -sSL "$DOTNET_INSTALL_SCRIPT_URL" | bash /dev/stdin --verbose --version 2.1.300
 
     curl --retry 10 -s -SL -f --create-dirs -o $DOTNET_INSTALL_DIR/buildtools.tar.gz https://aspnetcore.blob.core.windows.net/buildtools/netfx/4.6.1/netfx.4.6.1.tar.gz
     [ -d "$DOTNET_INSTALL_DIR/buildtools/net461" ] || mkdir -p $DOTNET_INSTALL_DIR/buildtools/net461

diff --git a/build/WebSdkEnv.cmd b/build/WebSdkEnv.cmd
@@ -13,7 +13,7 @@ if not defined DOTNET_INSTALL_DIR (
 )
 
 if not defined DOTNET_VERSION (
-    set DOTNET_VERSION=2.1.300-preview2-008248
+    set DOTNET_VERSION=2.1.300
 )
 
 if not defined FeedTasksPackage (

diff --git a/dotnet-install_2.0.ps1 b/dotnet-install_2.0.ps1
@@ -62,7 +62,7 @@
 [cmdletbinding()]
 param(
    [string]$Channel="master",
-   [string]$Version="2.1.300-preview2-008248",
+   [string]$Version="2.1.300",
    [string]$InstallDir="<auto>",
    [string]$Architecture="<auto>",
    [switch]$SharedRuntime,

diff --git a/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Tasks/WebJobs/GenerateRunCommandFile.cs b/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/Tasks/WebJobs/GenerateRunCommandFile.cs
@@ -23,14 +23,7 @@ public override bool Execute()
             bool isRunCommandFilePresent = File.Exists(Path.Combine(ProjectDirectory, RunCommandFile));
             if (!isRunCommandFilePresent)
             {
-                string appName = Path.GetFileName(TargetPath);
-
-                string command = $"dotnet {appName}";
-                if (UseAppHost || string.Equals(Path.GetExtension(TargetPath), ".exe", StringComparison.OrdinalIgnoreCase))
-                {
-                    command = Path.ChangeExtension(appName, !string.IsNullOrWhiteSpace(ExecutableExtension) ? ExecutableExtension : null);
-                }
-
+                string command = WebJobsCommandGenerator.RunCommand(TargetPath, UseAppHost, ExecutableExtension);
                 File.WriteAllText(Path.Combine(WebJobsDirectory, RunCommandFile), command);
             }
 

diff --git a/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/WebJobsCommandGenerator.cs b/src/Publish/Microsoft.NET.Sdk.Publish.Tasks/WebJobsCommandGenerator.cs
@@ -0,0 +1,21 @@
+using System;
+using System.IO;
+
+namespace Microsoft.NET.Sdk.Publish.Tasks
+{
+    public static class WebJobsCommandGenerator
+    {
+        public static string RunCommand(string targetPath, bool useAppHost, string executableExtension)
+        {
+            string appName = Path.GetFileName(targetPath);
+
+            string command = $"dotnet {appName}";
+            if (useAppHost || string.Equals(Path.GetExtension(targetPath), ".exe", StringComparison.OrdinalIgnoreCase))
+            {
+                command = Path.ChangeExtension(appName, !string.IsNullOrWhiteSpace(executableExtension) ? executableExtension : null);
+            }
+
+            return $"{command} %*";
+        }
+    }
+}
diff --git a/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/WebJobsCommandGeneratorTests.cs b/test/Publish/Microsoft.NET.Sdk.Publish.Tasks.Tests/WebJobsCommandGeneratorTests.cs
@@ -0,0 +1,31 @@
+using Microsoft.NET.Sdk.Publish.Tasks;
+using Xunit;
+
+
+namespace Microsoft.Net.Sdk.Publish.Tasks.Tests
+{
+    public class WebJobsCommandGeneratorTests
+    {
+        [Theory]
+        [InlineData("c:\\test\\WebApplication1.dll", false, ".exe", "dotnet WebApplication1.dll %*")]
+
+        [InlineData("c:\\test\\WebApplication1.dll", true, ".exe", "WebApplication1.exe %*")]
+        [InlineData("c:\\test\\WebApplication1.dll", true, "", "WebApplication1 %*")]
+
+        [InlineData("c:\\test\\WebApplication1.exe", true, ".exe", "WebApplication1.exe %*")]
+        [InlineData("c:\\test\\WebApplication1.exe", false, ".exe", "WebApplication1.exe %*")]
+
+        [InlineData("c:\\test\\WebApplication1.dll", true, ".sh", "WebApplication1.sh %*")]
+        [InlineData("c:\\test\\WebApplication1.dll", false, ".sh", "dotnet WebApplication1.dll %*")]
+        public void WebJobsCommandGenerator_Generates_Correct_RunCmd(string targetPath, bool useAppHost, string executableExtension, string expected)
+        {
+            // Arrange
+
+            // Test
+            string generatedRunCommand = WebJobsCommandGenerator.RunCommand(targetPath, useAppHost, executableExtension);
+
+            // Assert
+            Assert.Equal(expected, generatedRunCommand);
+        }
+    }
+}