Merge branch 'dev'

src/Azure.Functions.Cli/Actions/AzureActions/PublishFunctionAppAction.cs

@@ -279,11 +279,6 @@ private async Task PublishFunctionApp(Site functionApp, GitIgnoreParser ignorePa
 
             // For dedicated linux apps, we do not support run from package right now
             var isFunctionAppDedicatedLinux = functionApp.IsLinux && !functionApp.IsDynamic && !functionApp.IsElasticPremium;
-            if (isFunctionAppDedicatedLinux && RunFromPackageDeploy && PublishBuildOption != BuildOption.Remote)
-            {
-                ColoredConsole.WriteLine("Assuming --nozip (do not run from package) for publishing to Linux dedicated plan.");
-                RunFromPackageDeploy = false;
-            }
 
             // For Python linux apps, we do not support --build remote with --build-native-deps flag
             if (PublishBuildOption == BuildOption.Remote && BuildNativeDeps)
@@ -399,7 +394,7 @@ private async Task HandleLinuxDedicatedPublish(Func<Task<Stream>> zipStreamFacto
             if (PublishBuildOption != BuildOption.Remote)
             {
                 await EnsureNoKuduLiteBuildSettings(functionApp);
-                await PublishZipDeploy(functionApp, zipStreamFactory);
+                await PublishRunFromPackageLocal(functionApp, zipStreamFactory);
                 return;
             }
 
@@ -637,8 +632,8 @@ public async Task<DeployStatus> PerformServerSideBuild(Site functionApp, Func<Ta
         {
             if (string.IsNullOrEmpty(functionApp.ScmUri))
             {
-                throw new CliException($"Your function app {functionApp.SiteName} does not support remote build. " + 
-                    "To enable remote build, please update your function app to the latest verison by recreating it.");
+                throw new CliException("Remote build is a new feature added to function apps. " +
+                    $"Your function app {functionApp.SiteName} does not support remote build as it was created before August 1st, 2019.");
             }
 
             using (var handler = new ProgressMessageHandler(new HttpClientHandler()))

src/Azure.Functions.Cli/Actions/LocalActions/InitAction.cs

@@ -144,7 +144,7 @@ public override async Task RunAsync()
 
         private async Task InitDockerFileOnly()
         {
-            await WriteDockerfile(GlobalCoreToolsSettings.CurrentWorkerRuntime);
+            await WriteDockerfile(GlobalCoreToolsSettings.CurrentWorkerRuntime, Csx);
         }
 
         private async Task InitFunctionAppProject()
@@ -181,7 +181,7 @@ private async Task InitFunctionAppProject()
             }
             if (InitDocker)
             {
-                await WriteDockerfile(workerRuntime);
+                await WriteDockerfile(workerRuntime, Csx);
             }
         }
 
@@ -301,11 +301,18 @@ private static async Task WriteLocalSettingsJson(WorkerRuntime workerRuntime)
             await WriteFiles("local.settings.json", localSettingsJsonContent);
         }
 
-        private static async Task WriteDockerfile(WorkerRuntime workerRuntime)
+        private static async Task WriteDockerfile(WorkerRuntime workerRuntime, bool csx)
         {
             if (workerRuntime == Helpers.WorkerRuntime.dotnet)
             {
-                await WriteFiles("Dockerfile", await StaticResources.DockerfileDotNet);
+                if (csx)
+                {
+                    await WriteFiles("Dockerfile", await StaticResources.DockerfileCsxDotNet);
+                }
+                else
+                {
+                    await WriteFiles("Dockerfile", await StaticResources.DockerfileDotNet);
+                }
             }
             else if (workerRuntime == Helpers.WorkerRuntime.node)
             {

src/Azure.Functions.Cli/Azure.Functions.Cli.csproj

@@ -30,6 +30,9 @@
     <EmbeddedResource Include="StaticResources\ExtensionsProj.csproj.template">
       <LogicalName>$(AssemblyName).ExtensionsProj.csproj</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="StaticResources\Dockerfile.csx.dotnet">
+      <LogicalName>$(AssemblyName).Dockerfile.csx.dotnet</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="StaticResources\Dockerfile.dotnet">
       <LogicalName>$(AssemblyName).Dockerfile.dotnet</LogicalName>
     </EmbeddedResource>
@@ -111,7 +114,7 @@
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.3" />
     <PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker" Version="0.1.152-preview" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="2.0.12641" />
-    <PackageReference Include="Microsoft.Azure.Functions.PythonWorkerRunEnvironments" Version="1.0.0-beta20190801.11" />
+    <PackageReference Include="Microsoft.Azure.Functions.PythonWorkerRunEnvironments" Version="1.0.0-beta20190816.7" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="YamlDotNet" Version="6.0.0" />
   </ItemGroup>

src/Azure.Functions.Cli/Helpers/KuduLiteDeploymentHelpers.cs

@@ -65,15 +65,23 @@ public static async Task<DeployStatus> WaitForDedicatedBuildToComplete(HttpClien
             ColoredConsole.Write("Remote build in progress, please wait");
             while (true)
             {
-                var json = await InvokeRequest<IDictionary<string, bool>>(client, HttpMethod.Get, "/api/isdeploying");
-                bool isDeploying = json["value"];
-                if (!isDeploying)
+                var json = await InvokeRequest<IDictionary<string, string>>(client, HttpMethod.Get, "/api/isdeploying");
+
+                if (bool.TryParse(json["value"], out bool isDeploying))
+                {
+                    if (!isDeploying)
+                    {
+                        string deploymentId = await GetLatestDeploymentId(client, functionApp, restrictedToken: null);
+                        DeployStatus status = await GetDeploymentStatusById(client, functionApp, restrictedToken: null, id: deploymentId);
+                        ColoredConsole.Write($"done{Environment.NewLine}");
+                        return status;
+                    }
+                }
+                else
                 {
-                    string deploymentId = await GetLatestDeploymentId(client, functionApp, restrictedToken: null);
-                    DeployStatus status = await GetDeploymentStatusById(client, functionApp, restrictedToken: null, id: deploymentId);
-                    ColoredConsole.Write($"done{Environment.NewLine}");
-                    return status;
+                    throw new CliException($"Expected \"value\" from /api/isdeploying endpoing to be a boolean. Actual: {json["value"]}");
                 }
+
                 ColoredConsole.Write(".");
                 await Task.Delay(5000);
             }

src/Azure.Functions.Cli/Helpers/WorkerRuntimeLanguageHelper.cs

@@ -81,9 +81,6 @@ public static class WorkerRuntimeLanguageHelper
                     case WorkerRuntime.powershell:
                         workerToDisplayStrings[wr] = "powershell (preview)";
                         break;
-                    case WorkerRuntime.python:
-                        workerToDisplayStrings[wr] = "python (preview)";
-                        break;
                     default:
                         workerToDisplayStrings[wr] = wr.ToString();
                         break;

src/Azure.Functions.Cli/StaticResources/Dockerfile.csx.dotnet

@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/azure-functions/dotnet:2.0
+ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
+    AzureFunctionsJobHost__Logging__Console__IsEnabled=true
+
+COPY . /home/site/wwwroot

src/Azure.Functions.Cli/StaticResources/StaticResources.cs

@@ -31,6 +31,8 @@ private static async Task<string> GetValue(string name)
 
         public static Task<string> DockerfileDotNet => GetValue("Dockerfile.dotnet");
 
+        public static Task<string> DockerfileCsxDotNet => GetValue("Dockerfile.csx.dotnet");
+
         public static Task<string> DockerfilePython => GetValue("Dockerfile.python");
 
         public static Task<string> DockerfileNode => GetValue("Dockerfile.node");

test/Azure.Functions.Cli.Tests/E2E/InitTests.cs

@@ -136,6 +136,25 @@ public Task init_with_Dockerfile(string workerRuntime)
             }, _output);
         }
 
+        [Fact]
+        public Task init_with_Dockerfile_for_csx()
+        {
+            return CliTester.Run(new RunConfiguration
+            {
+                Commands = new[] { $"init . --worker-runtime dotnet --docker --csx" },
+                CheckFiles = new[]
+                {
+                    new FileResult
+                    {
+                        Name = "Dockerfile",
+                        ContentNotContains = new[] { "dotnet publish" },
+                        ContentContains = new[] { $"FROM mcr.microsoft.com/azure-functions/dotnet:2.0" }
+                    }
+                },
+                OutputContains = new[] { "Dockerfile" }
+            }, _output);
+        }
+
         [Fact]
         public Task init_csx_app()
         {
@@ -293,6 +312,29 @@ public Task init_docker_only_for_existing_project(string workerRuntime)
             }, _output);
         }
 
+        [Fact]
+        public Task init_docker_only_for_csx_project()
+        {
+            return CliTester.Run(new RunConfiguration
+            {
+                Commands = new[]
+                {
+                    $"init . --worker-runtime dotnet --csx",
+                    $"init . --docker-only --csx",
+                },
+                CheckFiles = new[]
+                {
+                    new FileResult
+                    {
+                        Name = "Dockerfile",
+                        ContentNotContains = new[] { "dotnet publish" },
+                        ContentContains = new[] { $"FROM mcr.microsoft.com/azure-functions/dotnet:2.0" }
+                    }
+                },
+                OutputContains = new[] { "Dockerfile" }
+            }, _output);
+        }
+
         [Fact]
         public Task init_docker_only_no_project()
         {