Migrate to ASP NETCore 3.1

Kudu.Console/Kudu.Console.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <TieredCompilation>true</TieredCompilation>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>kudu</AssemblyName>
   </PropertyGroup>
 
+  <PropertyGroup>
+   <IsTransformWebConfigDisabled>true</IsTransformWebConfigDisabled>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="XmlSettings" Version="0.1.3" />
   </ItemGroup>
@@ -32,7 +34,4 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU1701</NoWarn>
   </PropertyGroup>
-  <PropertyGroup>
-    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-  </PropertyGroup>
 </Project>

Kudu.Console/Program.cs

@@ -211,7 +211,7 @@ private static int PerformDeploy(
                 finally
                 {
                     System.Console.WriteLine("Deployment Logs : '"+
-                        env.AppBaseUrlPrefix+ "/newui/jsonviewer?view_url=/api/deployments/" +
+                        env.AppBaseUrlPrefix+ "/jsonviewer?view_url=/api/deployments/" +
                         gitRepository.GetChangeSet(settingsManager.GetBranch()).Id+"/log'");
                 }
             }
@@ -279,17 +279,14 @@ private static IEnvironment GetEnvironment(string siteRoot, string requestId)
             string binPath = System.Environment.GetEnvironmentVariable("SCM_BIN_PATH");
             if (string.IsNullOrWhiteSpace(binPath))
             {
-                // CORE TODO Double check. Process.GetCurrentProcess() always gets the dotnet.exe process,
-                // so changed to Assembly.GetEntryAssembly().Location
                 binPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
             }
 
-            // CORE TODO Handing in a null IHttpContextAccessor (and KuduConsoleFullPath) again
             return new Kudu.Core.Environment(root,
                 EnvironmentHelper.NormalizeBinPath(binPath),
                 repositoryPath,
                 requestId,
-                Path.Combine(AppContext.BaseDirectory, "KuduConsole", "kudu.dll"),
+                Path.Combine(AppContext.BaseDirectory, "KuduConsole", "kudu"),
                 null,
                 new FileSystemPathProvider(new NullMeshPersistentFileSystem()));
         }

Kudu.Contracts/IEnvironment.cs

@@ -29,7 +29,7 @@ public interface IEnvironment
         string FunctionsPath { get; }           // e.g. /site/wwwroot
         string AppBaseUrlPrefix { get; }        // e.g. siteName.azurewebsites.net
         string RequestId { get; }               // e.g. x-arr-log-id or x-ms-request-id header value
-        string KuduConsoleFullPath { get; }     // e.g. KuduConsole/kudu.dll
+        string KuduConsoleFullPath { get; }     // e.g. KuduConsole/kudu
         string SitePackagesPath { get; }        // e.g. /data/SitePackages
         bool IsOnLinuxConsumption { get; }      // e.g. True on Linux Consumption. False on App Service.
     }

Kudu.Contracts/Kudu.Contracts.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
   <PropertyGroup>

Kudu.Core/Infrastructure/ZipArchiveExtensions.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.IO.Abstractions;
 using System.IO.Compression;
+using System.Threading.Tasks;
 using Kudu.Contracts.Tracing;
 using Kudu.Core.Helpers;
 using Kudu.Core.Tracing;
@@ -45,7 +46,7 @@ private static void InternalAddDirectory(ZipArchive zipArchive, DirectoryInfoBas
                 else
                 {
                     var entry = zipArchive.AddFile((FileInfoBase)info, tracer, directoryNameInArchive);
-                    files?.Add(entry);
+                    files?.Add(entry.Result);
                 }
             }
 
@@ -61,13 +62,13 @@ private static string ForwardSlashCombine(string part1, string part2)
             return Path.Combine(part1, part2).Replace('\\', '/');
         }
 
-        public static ZipArchiveEntry AddFile(this ZipArchive zipArchive, string filePath, ITracer tracer, string directoryNameInArchive = "")
+        public static async Task<ZipArchiveEntry> AddFile(this ZipArchive zipArchive, string filePath, ITracer tracer, string directoryNameInArchive = "")
         {
             var fileInfo = new FileInfoWrapper(new FileInfo(filePath));
-            return zipArchive.AddFile(fileInfo, tracer, directoryNameInArchive);
+            return await zipArchive.AddFile(fileInfo, tracer, directoryNameInArchive);
         }
 
-        public static ZipArchiveEntry AddFile(this ZipArchive zipArchive, FileInfoBase file, ITracer tracer, string directoryNameInArchive)
+        public static async Task<ZipArchiveEntry> AddFile(this ZipArchive zipArchive, FileInfoBase file, ITracer tracer, string directoryNameInArchive)
         {
             Stream fileStream = null;
             try
@@ -90,7 +91,7 @@ public static ZipArchiveEntry AddFile(this ZipArchive zipArchive, FileInfoBase f
 
                 using (Stream zipStream = entry.Open())
                 {
-                    fileStream.CopyTo(zipStream);
+                    await fileStream.CopyToAsync(zipStream);
                 }
                 return entry;
             }

Kudu.Core/Kudu.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
   <PropertyGroup>

Kudu.Core/SourceControl/Git/KnownEnvironment.cs

@@ -22,7 +22,7 @@ internal static class KnownEnvironment
         // Command to launch the post receive hook for dynamic install
         // CORE NOTE modified the script to run "dotnet," assuming EXEPATH points
         // to a framework-dependent Core app.
-        public static string KUDUCOMMAND_DYNAMICINSTALL = "dotnet \"$" + EXEPATH + "\" " +
+        public static string KUDUCOMMAND_DYNAMICINSTALL = "\"$" + EXEPATH + "\" " +
                                            "\"$" + APPPATH + "\" " +
                                            "\"$" + MSBUILD + "\" " +
                                            "\"$" + DEPLOYER + "\"";

Kudu.Services.Web/Kudu.Services.Web.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TieredCompilation>true</TieredCompilation>
   </PropertyGroup>
   <!-- Supressing Net Core migration warnings-->
@@ -24,11 +24,11 @@
   <ItemGroup>
     <PackageReference Include="AspNetCore.RouteAnalyzer" Version="0.5.3" />
     <PackageReference Include="log4net" Version="2.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Proxy" />
     <PackageReference Include="Microsoft.Diagnostics.Runtime" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
     <PackageReference Include="XmlSettings" Version="0.1.3" />
   </ItemGroup>
@@ -46,6 +46,32 @@
     <Folder Include="wwwroot\Content\Styles\" />
     <Folder Include="wwwroot\Content\Scripts\" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Update="Pages\bash.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Pages\OldBash\LinuxBashConsole.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Pages\OldBash\WindowsBashConsole.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Pages\Env.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Pages\Index.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Update="Pages\_Layout.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
   <!-- Run updateNodeModules to install kuduscript -->  
   <Target Name="PutNodeModulesInBinDir" AfterTargets="Build">    
 	  <Exec Command="$(ProjectDir)\updateNodeModules.cmd &quot;$(PublishDir)&quot;" Condition="'$(OS)' == 'Windows_NT' AND  '$(Configuration)'=='Release'" />
@@ -57,8 +83,8 @@
     <Message Text="%0a%0aBuilding KuduConsole%0a" Importance="high" />
     <Exec Command="dotnet build ../Kudu.Console -o $(MSBuildProjectDirectory)/$(PublishDir)..\KuduConsole" Condition="'$(Configuration)' == 'Debug' AND '$(OS)' == 'Windows_NT'" />
     <Exec Command="dotnet build ../Kudu.Console -o $(OutputPath)/KuduConsole" Condition="'$(Configuration)' == 'Debug' AND '$(OS)' != 'Windows_NT'" />
-    <Exec Command="dotnet publish ..\Kudu.Console --configuration Release -o $(PublishDir)\KuduConsole" Condition="'$(Configuration)' == 'Release' AND '$(OS)' == 'Windows_NT'" />
-    <Exec Command="dotnet publish ../Kudu.Console --configuration Release -o $(PublishDir)/KuduConsole" Condition="'$(Configuration)' == 'Release' AND '$(OS)' != 'Windows_NT'" />
+    <Exec Command="dotnet publish ..\Kudu.Console -r linux-x64 --self-contained --configuration Release -p:PublishSingleFile=false -p:PublishTrimmed=true -o $(PublishDir)\KuduConsole" Condition="'$(Configuration)' == 'Release' AND '$(OS)' == 'Windows_NT'" />
+    <Exec Command="dotnet publish ../Kudu.Console -r linux-x64 --self-contained --configuration Release -p:PublishSingleFile=false -p:PublishTrimmed=true -o $(PublishDir)/KuduConsole" Condition="'$(Configuration)' == 'Release' AND '$(OS)' != 'Windows_NT'" />
   </Target>
   <Target Name="ChangeScriptPermissionsForLinux" AfterTargets="publish">
     <Message Text="%0a%0aSetting Permissions for Kudu Script(s)%0a" Importance="high" />

Kudu.Services.Web/KuduWebUtil.cs

@@ -31,7 +31,7 @@ namespace Kudu.Services.Web
 {
     internal static class KuduWebUtil
     {
-        private const string KuduConsoleFilename = "kudu.dll";
+        private const string KuduConsoleFilename = "kudu";
         private const string KuduConsoleRelativePath = "KuduConsole";
 
         private static Dictionary<string, IOperationLock> _namedLocks;
@@ -236,7 +236,7 @@ internal static void MigrateToNetCorePatch(IEnvironment environment)
                     // Dynamic Install should just contain dotnet
                     if (fileText.Contains("benv") && fileText.Contains("dotnet") && isRunningOnAzure)
                     {
-                        FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("benv dotnet=2.2", "dotnet"));
+                        FileSystemHelpers.WriteAllText(gitPostReceiveHookFile, fileText.Replace("benv dotnet=2.2 dotnet", ""));
                     }
                 }
 
@@ -311,7 +311,7 @@ internal static ILogger GetDeploymentLogger(IServiceProvider serviceProvider)
         /// Returns a specified environment configuration as the current webapp's
         /// default configuration during the runtime.
         /// </summary>
-        internal static IEnvironment GetEnvironment(IHostingEnvironment hostingEnvironment,
+        internal static IEnvironment GetEnvironment(IWebHostEnvironment hostingEnvironment,
             IFileSystemPathProvider fileSystemPathsProvider,
             IDeploymentSettingsManager settings = null,
             IHttpContextAccessor httpContextAccessor = null)

Kudu.Services.Web/Pages/DebugConsole/LinuxConsole.cshtml

@@ -1,6 +1,6 @@
 @{
     ViewData["Title"] = "Diagnostic Console";
-    Layout = "~/Pages/_Layout.cshtml";
+    Layout = "~/Pages/_Layout.Legacy.cshtml";
 }
 
 <head>

Kudu.Services.Web/Pages/DebugConsole/WindowsConsole.cshtml

@@ -1,6 +1,6 @@
 @{
     ViewData["Title"] = "Diagnostic Console";
-    Layout = "~/Pages/_Layout.cshtml";
+    Layout = "~/Pages/_Layout.Legacy.cshtml";
 }
 
 <head>

Kudu.Services.Web/Pages/Error.cshtml

@@ -4,7 +4,9 @@
     ViewData["Title"] = "Error";
 }
 
-<h1 class="text-danger">Error.</h1>
+    <h1 class="text-danger">
+        <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>&nbsp;Error.
+    </h1>
 <h2 class="text-danger">An error occurred while processing your request.</h2>
 
 @if (Model.ShowRequestId)