Merge branch 'master' of https://github.com/taori/Amusoft.VisualStudio.TemplateGenerator

Author: taori

azure-pipelines.yml

@@ -32,11 +32,11 @@ variables:
   - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
     value: 1
   - name: BUILD_PUBLISH_ARTIFACTS
-    value: ${{or(startsWith(variables['Build.SourceBranch'], 'refs/heads/releases/'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))}}
+    value: $[or(startsWith(variables['Build.SourceBranch'], 'refs/heads/releases/'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))]
   - name: BUILD_IS_RELEASE
-    value: ${{startsWith(variables['Build.SourceBranch'], 'refs/heads/releases/')}}
+    value: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/releases/')]
   - name: BUILD_IS_ALPHA
-    value: ${{eq(variables['Build.SourceBranch'], 'refs/heads/master')}}
+    value: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
 
 pool:
   vmImage: 'windows-2019'
@@ -108,6 +108,7 @@ jobs:
       targetType: 'inline'
       script: |
         mkdir $(Build.ArtifactStagingDirectory)\nupkg
+        Write-Host $(PackageVersion)
         Write-Host $(PackageVersionCLI)
         & dotnet pack $(Build.SourcesDirectory)\src\Generator.Client.CommandLine\Generator.Client.CommandLine.csproj -c $(buildConfiguration) -o $(Build.ArtifactStagingDirectory)\nupkg /p:PackAsTool=true /p:VersionPrefix=$(PackageVersionCLI) /p:SymbolPackageFormat=snupkg --include-symbols --version-suffix=beta
 
@@ -117,8 +118,13 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
+        dotnet --version
         mkdir $(Build.ArtifactStagingDirectory)\nupkg
+        Write-Host $(PackageVersion)
         Write-Host $(PackageVersionCLI)
+        $commandSample = "dotnet pack $(Build.SourcesDirectory)\src\Generator.Client.CommandLine\Generator.Client.CommandLine.csproj -c $(buildConfiguration) -o $(Build.ArtifactStagingDirectory)\nupkg /p:PackAsTool=true /p:VersionPrefix=$(PackageVersionCLI) /p:SymbolPackageFormat=snupkg --include-symbols --version-suffix=alpha"
+        Write-Host $commandSample
+        Invoke-Expression $commandSample
         & dotnet pack $(Build.SourcesDirectory)\src\Generator.Client.CommandLine\Generator.Client.CommandLine.csproj -c $(buildConfiguration) -o $(Build.ArtifactStagingDirectory)\nupkg /p:PackAsTool=true /p:VersionPrefix=$(PackageVersionCLI) /p:SymbolPackageFormat=snupkg --include-symbols --version-suffix=alpha
 
   - task: CopyFiles@2