Update StackifyLib signed and unsigned

Author: homiedopie

azure-pipelines.yml

@@ -66,6 +66,31 @@ stages:
               ConnectedServiceName: 514ed7d6-3846-4422-8013-af27483dd22c
               KeyVaultName: keyvault-build-resources
               RunAsPreJob: true
+          - task: DotNetCoreCLI@2
+            displayName: dotnet restore
+            inputs:
+              command: restore
+              projects: |
+                Src\StackifyLib\*.csproj
+                Src\StackifyLib.AspNetCore\*.csproj
+                Src\StackifyLib.CoreLogger\*.csproj
+                Src\StackifyLib.log4net\*.csproj
+                Src\Nlog.Targets.Stackify\*.csproj
+                Src\NLog.Web.Stackify\*.csproj
+                Src\StackifyLib.StackifyTraceListener\*.csproj
+          - ${{ if eq(parameters['Build StackifyLib'], true) }}:
+              - task: DotNetCoreCLI@2
+                displayName: dotnet build
+                inputs:
+                  projects: |
+                    Src\StackifyLib\*.csproj
+                  arguments: '-c $(BuildConfiguration)'
+              - task: DotNetCoreCLI@2
+                displayName: dotnet pack unsigned stackify lib
+                inputs:
+                  command: pack
+                  searchPatternPack: Src\StackifyLib\*.csproj;
+                  nobuild: true
           - ${{ if eq(parameters['Build StackifyLib Signed'], true) }}:
               - task: DownloadSecureFile@1
                 name: SNK
@@ -94,32 +119,12 @@ stages:
                     (gc $_) -replace ([regex]::Escape("//[assembly: AssemblyKeyFile")), "[assembly: AssemblyKeyFile" | Set-Content $_.FullName -Encoding utf8
                   }
                 displayName: Uncoment signing attribute
-          - task: DotNetCoreCLI@2
-            displayName: dotnet restore
-            inputs:
-              command: restore
-              projects: |
-                Src\StackifyLib\*.csproj
-                Src\StackifyLib.AspNetCore\*.csproj
-                Src\StackifyLib.CoreLogger\*.csproj
-                Src\StackifyLib.log4net\*.csproj
-                Src\Nlog.Targets.Stackify\*.csproj
-                Src\NLog.Web.Stackify\*.csproj
-                Src\StackifyLib.StackifyTraceListener\*.csproj
-          - ${{ if eq(parameters['Build StackifyLib'], true) }}:
               - task: DotNetCoreCLI@2
-                displayName: dotnet build
-                inputs:
-                  projects: |
-                    Src\StackifyLib\*.csproj
-                  arguments: '-c $(BuildConfiguration)'
-              - task: DotNetCoreCLI@2
-                displayName: dotnet pack signed stackify lib
+                displayName: dotnet pack unsigned stackify lib
                 inputs:
                   command: pack
                   searchPatternPack: Src\StackifyLib\*.csproj;
                   nobuild: true
-          - ${{ if eq(parameters['Build StackifyLib Signed'], true) }}:
               - task: DotNetCoreCLI@2
                 displayName: Install NuGetKeyVaultSignTool
                 continueOnError: true
@@ -137,7 +142,7 @@ stages:
                 enabled: False
                 inputs:
                   targetType: inline
-                  script: "$files = @(Get-ChildItem -Path . -File -Filter *.nupkg)\n\nforeach($file in $files) {\n  $BaseFilename = $file.BaseName\n  $BaseFilenameSplit = $file.BaseName.Split(\".\")\n  $LastVersionDigit = \"\"\n  $NewFilenameBase = \"\"\n  $PackageVersion = \"\"\n  $IsBeta = \"False\"\n  if ($BaseFilename.contains(\"beta\")) {\n    $IsBeta = \"True\"\n    $LastVersionDigit = $file.BaseName.Substring($BaseFilename.length - 6,1)\n  }\n  else {\n    $LastVersionDigit = $file.BaseName.Substring($BaseFilename.length - 1)\n  }\n  foreach($namePart in $BaseFilenameSplit) {\n    if (!$namePart.contains(\"beta\") -and $namePart -notmatch \"^\\d+$\") {\n      $NewFilenameBase = $NewFilenameBase + $namePart + \".\"\n    } else {\n      # check for beta\n      if ($namePart.contains(\"beta\")) {\n        $PackageVersion = $PackageVersion + $namePart.Substring(0,1)\n      } else {\n        $PackageVersion = $PackageVersion + $namePart\n      }\n      # check length to append a .\n      if ($namePart -notmatch $LastVersionDigit) {\n        $PackageVersion = $PackageVersion + \".\"\n      }\n    }\n  }\n  \n  # check beta\n  $FinalFilenameBase = \"\"\n  if ($IsBeta -match \"True\") {\n    $FinalFilenameBase = $NewFilenameBase + \"snk.\" + $PackageVersion + \"-beta\"\n  } else {\n    $FinalFilenameBase = $NewFilenameBase + \"snk.\" + $PackageVersion\n  }\n  $FinalFilename = $FinalFilenameBase + $file.Extension\n  Copy-Item -Path $file -NewName $FinalFilename\n}"
+                  script: "$files = @(Get-ChildItem -Path . -File -Filter *.nupkg)\n\nforeach($file in $files) {\n  $BaseFilename = $file.BaseName\n  $BaseFilenameSplit = $file.BaseName.Split(\".\")\n  $LastVersionDigit = \"\"\n  $NewFilenameBase = \"\"\n  $PackageVersion = \"\"\n  $IsBeta = \"False\"\n  if ($BaseFilename.contains(\"beta\")) {\n    $IsBeta = \"True\"\n    $LastVersionDigit = $file.BaseName.Substring($BaseFilename.length - 6,1)\n  }\n  else {\n    $LastVersionDigit = $file.BaseName.Substring($BaseFilename.length - 1)\n  }\n  foreach($namePart in $BaseFilenameSplit) {\n    if (!$namePart.contains(\"beta\") -and $namePart -notmatch \"^\\d+$\") {\n      $NewFilenameBase = $NewFilenameBase + $namePart + \".\"\n    } else {\n      # check for beta\n      if ($namePart.contains(\"beta\")) {\n        $PackageVersion = $PackageVersion + $namePart.Substring(0,1)\n      } else {\n        $PackageVersion = $PackageVersion + $namePart\n      }\n      # check length to append a .\n      if ($namePart -notmatch $LastVersionDigit) {\n        $PackageVersion = $PackageVersion + \".\"\n      }\n    }\n  }\n  \n  # check beta\n  $FinalFilenameBase = \"\"\n  if ($IsBeta -match \"True\") {\n    $FinalFilenameBase = $NewFilenameBase + \"snk.\" + $PackageVersion + \"-beta\"\n  } else {\n    $FinalFilenameBase = $NewFilenameBase + \"snk.\" + $PackageVersion\n  }\n  $FinalFilename = $FinalFilenameBase + $file.Extension\n  Rename-Item -Path $file -NewName $FinalFilename\n}"
                   workingDirectory: $(Build.ArtifactStagingDirectory)
               - task: PublishPipelineArtifact@1
                 displayName: Publish Signed Artifact