Update azure-pipelines-publish-pypi.yml for Azure Pipelines

Correcting validation errors

Author: ianhelle

.azurepipelines/azure-pipelines-publish-pypi.yml

@@ -4,15 +4,25 @@
 name: 1ES-MSTICPy-Publish-$(date:yyyyMMdd)$(rev:.r)
 
 parameters:
-  Artifact: dist
-  Feed: testpypi
+  - name: Artifact
+    type: string
+    default: dist
+    displayName: Directory to store the built artifacts
+  - name: Feed
+    type: string
+    default: testpypi
+    displayName: The feed to publish to
+    values:
+      - testpypi
+      - pypi
 
 resources:
   repositories:
   - repository: msticpy
     name: microsoft/msticpy
-    type: git
+    type: github
     ref: main
+    endpoint: Microsoft
   - repository: 1ESPipelineTemplates
     type: git
     name: 1ESPipelineTemplates/1ESPipelineTemplates
@@ -25,44 +35,58 @@ extends:
       name: MSSecurity-1ES-Build-Agents-Pool
       image: MSSecurity-1ES-Windows-2022
       os: windows
-  variables:
-    - name: DistDir
-      value: $(Pipeline.Workspace)\${{ parameters.Artifact }}
-    - name: TWINE_PASSWORD
-      value: ${{ if eq(parameters.Feed, 'testpypi') }}${{ secrets.TEST_TWINE_PASSWORD }}${{ else }}${{ secrets.TWINE_PASSWORD }}
 
-  steps:
-  - checkout: self
-  
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '>=3.10'
-      architecture: 'x64'
-    displayName: 'Use latest Python'
+    stages:
+    - stage: publishTasks
+      displayName: PublishTasks
+      jobs:
+      - job: publishJob
+        displayName: PublishJob
+        variables:
+          - name: DistDir
+            value: $(Pipeline.Workspace)\${{ parameters.Artifact }}
+        steps:
+        - checkout: self
+        
+        - task: UsePythonVersion@0
+          inputs:
+            versionSpec: '>=3.10'
+            architecture: 'x64'
+          displayName: 'Use latest Python'
+
+        - powershell: python -m pip install --upgrade pip
+          displayName: 'Upgrade pip'
+        - powershell: python -m pip install --upgrade build twine
+          displayName: 'Install build and twine'
+        - powershell: python -m pip install --upgrade keyring artifacts-keyring
+          displayName: 'Install keyring and artifacts-keyring'
 
-  - powershell: python -m pip install --upgrade pip
-    displayName: 'Upgrade pip'
-  - powershell: python -m pip install --upgrade build twine
-    displayName: 'Install build and twine'
-  - powershell: python -m pip install --upgrade keyring artifacts-keyring
-    displayName: 'Install keyring and artifacts-keyring'
+        - powershell: python -m build --sdist --wheel --outdir "$(DistDir)"
+          displayName: 'Build package wheel and sdist'
 
-  - powershell: python -m build --sdist --wheel --outdir "$(DistDir)"
-    displayName: 'Build package wheel and sdist'
+        - task: PipAuthenticate@1
+          inputs:
+            artifactFeeds: 1ESToolsOrgFeed
+          displayName: 'Authenticate pip for internal feed'
 
-  - task: PipAuthenticate@1
-    inputs:
-      artifactFeeds: 1ESToolsOrgFeed
-    displayName: 'Authenticate pip for internal feed'
+        - task: TwineAuthenticate@1
+          inputs:
+            artifactFeed: ${{ parameters.Feed }}
+          displayName: 'Authenticate Twine for PyPI feed'
 
-  - task: TwineAuthenticate@1
-    inputs:
-      artifactFeed: ${{ parameters.Feed }}
-    displayName: 'Authenticate Twine for PyPI feed'
+        - powershell: python -m twine upload --skip-existing --verbose "$(DistDir)/*"
+          condition: eq('${{ parameters.Feed }}', 'testpypi')
+          displayName: 'Push to PyPI Test feed'
+          env:
+            TWINE_REPOSITORY: ${{ parameters.Feed }}
+            TWINE_USERNAME: __token__
+            TWINE_PASSWORD: $(TEST_TWINE_PASSWORD)
 
-  - powershell: python -m twine upload --skip-existing --verbose "$(DistDir)/*"
-    displayName: 'Push to PyPI feed'
-    env:
-      TWINE_REPOSITORY: ${{ parameters.Feed }}
-      TWINE_USERNAME: __token__
-      TWINE_PASSWORD: $(TWINE_PASSWORD)
+        - powershell: python -m twine upload --skip-existing --verbose "$(DistDir)/*"
+          condition: eq('${{ parameters.Feed }}', 'pypi')
+          displayName: 'Push to PyPI Test feed'
+          env:
+            TWINE_REPOSITORY: ${{ parameters.Feed }}
+            TWINE_USERNAME: __token__
+            TWINE_PASSWORD: $(TWINE_PASSWORD)
+        - powershell: echo Unrecognized feed "$( parameters.Feed )"