upgrade to net6.0 (#693)

* upgrade to net6.0

* update release folder path

Co-authored-by: Dmitrii Korolev <dmkorolev@microsoft.com>

Author: DeagleGross

.azure-pipelines/main.yml

@@ -24,7 +24,7 @@ stages:
         steps:
           - task: UseDotNet@2
             inputs:
-              version: '3.1.x'
+              version: '6.0.x'
               performMultiLevelLookup: true
 
           - pwsh: |
@@ -72,7 +72,7 @@ stages:
 
           - pwsh: |
               New-Item '$(Build.ArtifactStagingDirectory)/build' -Type Directory
-              Get-ChildItem -Path 'src/ArmTemplates/bin/$(configuration)/netcoreapp3.1' -File | %{
+              Get-ChildItem -Path 'src/ArmTemplates/bin/$(configuration)/net6.0' -File | %{
                 Write-Host "Copy-Item -Path $_ -Destination '$(Build.ArtifactStagingDirectory)/build'"
                 Copy-Item -Path $_ -Destination '$(Build.ArtifactStagingDirectory)/build'
               }

.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

src/ArmTemplates/ArmTemplates.csproj

@@ -2,13 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ProjectGuid>{B5183465-2BC1-4206-9C9F-5AC9615AC941}</ProjectGuid>
     <LangVersion>latest</LangVersion>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>apim-templates</ToolCommandName>
     <Version>1.0.0</Version>
     <RootNamespace>$(SolutionName).$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,6 +28,7 @@
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.15.1" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

src/ArmTemplates/Dockerfile

@@ -0,0 +1,20 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base
+WORKDIR /app
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /src
+COPY ["src/ArmTemplates/ArmTemplates.csproj", "src/ArmTemplates/"]
+RUN dotnet restore "src/ArmTemplates/ArmTemplates.csproj"
+COPY . .
+WORKDIR "/src/src/ArmTemplates"
+RUN dotnet build "ArmTemplates.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "ArmTemplates.csproj" -c Release -o /app/publish
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "ArmTemplates.dll"]

src/ArmTemplates/Extractor/Utilities/Executable.cs

@@ -13,21 +13,21 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Extractor.Utilit
 {
     class Executable
     {
-        string _arguments;
-        string _exeName;
-        bool _shareConsole;
-        bool _streamOutput;
-        readonly bool _visibleProcess;
-        readonly string _workingDirectory;
+        readonly string arguments;
+        readonly string exeName;
+        bool shareConsole;
+        bool streamOutput;
+        readonly bool visibleProcess;
+        readonly string workingDirectory;
 
         public Executable(string exeName, string arguments = null, bool streamOutput = true, bool shareConsole = false, bool visibleProcess = false, string workingDirectory = null)
         {
-            this._exeName = exeName;
-            this._arguments = arguments;
-            this._streamOutput = streamOutput;
-            this._shareConsole = shareConsole;
-            this._visibleProcess = visibleProcess;
-            this._workingDirectory = workingDirectory;
+            this.exeName = exeName;
+            this.arguments = arguments;
+            this.streamOutput = streamOutput;
+            this.shareConsole = shareConsole;
+            this.visibleProcess = visibleProcess;
+            this.workingDirectory = workingDirectory;
         }
 
         public Process Process { get; private set; }
@@ -36,14 +36,14 @@ public async Task<int> RunAsync(Action<string> outputCallback = null, Action<str
         {
             var processInfo = new ProcessStartInfo
             {
-                FileName = _exeName,
-                Arguments = _arguments,
-                CreateNoWindow = !this._visibleProcess,
-                UseShellExecute = _shareConsole,
-                RedirectStandardError = _streamOutput,
-                RedirectStandardInput = _streamOutput,
-                RedirectStandardOutput = _streamOutput,
-                WorkingDirectory = this._workingDirectory ?? Environment.CurrentDirectory
+                FileName = exeName,
+                Arguments = arguments,
+                CreateNoWindow = !this.visibleProcess,
+                UseShellExecute = shareConsole,
+                RedirectStandardError = streamOutput,
+                RedirectStandardInput = streamOutput,
+                RedirectStandardOutput = streamOutput,
+                WorkingDirectory = this.workingDirectory ?? Environment.CurrentDirectory
             };
 
             try
@@ -59,7 +59,7 @@ public async Task<int> RunAsync(Action<string> outputCallback = null, Action<str
                 throw ex;
             }
 
-            if (this._streamOutput)
+            if (this.streamOutput)
             {
                 this.Process.OutputDataReceived += (s, e) => outputCallback?.Invoke(e.Data);
                 this.Process.BeginOutputReadLine();
@@ -71,13 +71,16 @@ public async Task<int> RunAsync(Action<string> outputCallback = null, Action<str
             var exitCodeTask = this.Process.WaitForExitAsync();
 
             if (timeout == null)
-                return await exitCodeTask;
+            {
+                await exitCodeTask;
+                return exitCodeTask.IsCompletedSuccessfully ? 0 : -1;
+            }
             else
             {
                 await Task.WhenAny(exitCodeTask, Task.Delay(timeout.Value));
 
                 if (exitCodeTask.IsCompleted)
-                    return exitCodeTask.Result;
+                    return exitCodeTask.IsCompletedSuccessfully ? 0 : -1;
                 else
                 {
                     this.Process.Kill();

src/ArmTemplates/Properties/launchSettings.json

@@ -2,6 +2,9 @@
   "profiles": {
     "apimtemplate": {
       "commandName": "Project"
+    },
+    "Docker": {
+      "commandName": "Docker"
     }
   }
 }

src/Dockerfile

@@ -12,8 +12,8 @@
 Follow this guide for manually building and running the application
 1. git clone repository
 2. navigate to repo root
-3. build application using `dotnet build src/ArmTemplates/ArmTemplates.csproj` (netcore3.1 must be installed)
-4. navigate to built binaries using `cd .\src\ArmTemplates\bin\Debug\netcoreapp3.1\`
+3. build application using `dotnet build src/ArmTemplates/ArmTemplates.csproj` (net6.0 must be installed. Visit [Download .NET 6.0](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) for more information)
+4. navigate to built binaries using `cd .\src\ArmTemplates\bin\Debug\net6.0\`
 5. run ` dotnet .\ArmTemplates.dll --help` to view all available commands
 6. Investigate possible commands to run and choose desired
 

src/README.md

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ProjectGuid>{7D0C17F8-C0F5-4678-A75F-EB1BE94E3A46}</ProjectGuid>
     <RootNamespace>$(SolutionName).$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.5.1" />
+    <PackageReference Include="FluentAssertions" Version="6.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.17.2" />
       <PackageReference Include="YamlDotNet" Version="11.2.1" />