Merge branch 'master' of https://github.com/Azure/azure-sdk-for-python into azure_purview_catalog

* 'master' of https://github.com/Azure/azure-sdk-for-python: (109 commits)
  [Tables] Adds support for AzureNamedKeyCredential (Azure#18456)
  [Tables] delete_entity takes an entity instead of row and partition key (Azure#18269)
  [Tables] Removed TableEntity attribute wrapper (Azure#18489)
  [EventHub&ServiceBus] Bump uAMQP dependency (Azure#17942)
  [ServiceBus] add keyword override support to update_ methods in mgmt module (Azure#18210)
  Add compatibility switch to disable CAE (Azure#18148)
  Service Bus Named Key Credential (Azure#18471)
  Change to use dynamic resource connection string for chat tests and identity samples (Azure#18502)
  Increase dependency (Azure#18500)
  show detailed error (Azure#18229)
  prerelease (Azure#18507)
  [Container Registry] addressing issues (Azure#18486)
  update per_call_policies & per_retry_policies (Azure#18406)
  Eh named key (Azure#18292)
  [Tables] Updating EntityProperty (Azure#18177)
  [Service Bus] fix async auth test (Azure#18499)
  [communication] Live Testing - Introduce CloudConfig into test.yml  (Azure#18469)
  Release azure-servicefabric 8.0 (Azure#18488)
  [Communication]: Updated test_search_available_phone_numbers_with_invalid_country_code async test to be consistent with sync test (Azure#18466)
  [Container Registry] DeleteRepositoryResult Changed (Azure#18443)
  ...

Author: iscai-msft

common/smoketest/smoke-test.yml

@@ -1,4 +1,4 @@
 jobs:
-  - template: /eng/pipelines/templates/jobs/smoke-test.yml
+  - template: /eng/pipelines/templates/jobs/smoke.tests.yml
     parameters:
       Daily: true

eng/.docsettings.yml

@@ -9,6 +9,7 @@ omitted_paths:
   - sdk/**/samples/*
   - sdk/identity/azure-identity/tests/*
   - sdk/**/tests/perfstress_tests/*
+  - sdk/nspkg/*
 
 language: python
 root_check_enabled: True
@@ -23,19 +24,9 @@ required_readme_sections:
 
 known_presence_issues:
   - ['HISTORY.rst','#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-knowledge-nspkg/HISTORY.rst','#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-language-nspkg/HISTORY.rst','#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-nspkg/HISTORY.rst','#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-search-nspkg/HISTORY.rst','#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-vision-nspkg/HISTORY.rst','#4554']
-  - ['sdk/core/azure-nspkg/HISTORY.rst','#4554']
-  - ['sdk/keyvault/azure-keyvault-nspkg/HISTORY.rst','#4554']
   - ['sdk/template/azure-template/HISTORY.rst','#4554']
-  - ['sdk/storage/azure-storage-nspkg/HISTORY.rst', '#4554']
-  - ['sdk/textanalytics/azure-ai-nspkg/HISTORY.rst', '#4554']
   # Converted from README.rst to README.md
   - ['sdk/batch/azure-batch/README.md', '#4554']
-  - ['sdk/core/azure-nspkg/README.md', '#4554']
   - ['sdk/core/azure-common/README.md', '#4554']
   - ['sdk/core/azure/README.md', '#4554']
   - ['sdk/core/azure-servicemanagement-legacy/README.md', '#4554']
@@ -50,102 +41,75 @@ known_content_issues:
   - ['sdk/synapse/azure-synapse-artifacts/README.md', '#4554']
   - ['sdk/synapse/azure-synapse-monitoring/README.md', '#4554']
   - ['sdk/synapse/azure-synapse-managedprivateendpoints/README.md', '#4554']
-  - ['sdk/synapse/azure-synapse-nspkg/README.md', '#4554']
-  - ['sdk/security/azure-security-nspkg/README.md', '#4554']
   - ['sdk/anomalydetector/azure-ai-anomalydetector/README.md', '#4554']
   - ['sdk/metricsadvisor/azure-ai-metricsadvisor/README.md', '#4554']
   - ['sdk/applicationinsights/azure-applicationinsights/README.md', '#4554']
   - ['sdk/batch/azure-batch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-anomalydetector/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-formrecognizer/README.md', '#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-knowledge-nspkg/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-language-luis/README.md', '#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-language-nspkg/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-language-spellcheck/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-language-textanalytics/README.md', '#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-nspkg/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-personalizer/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-autosuggest/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-customimagesearch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-customsearch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-entitysearch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-imagesearch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-newssearch/README.md', '#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-search-nspkg/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-videosearch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-visualsearch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-search-websearch/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-vision-computervision/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-vision-contentmoderator/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-vision-customvision/README.md', '#4554']
   - ['sdk/cognitiveservices/azure-cognitiveservices-vision-face/README.md', '#4554']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-vision-nspkg/README.md', '#4554']
   - ['sdk/core/azure/README.md', '#4554']
   - ['sdk/core/azure-common/README.md', '#4554']
-  - ['sdk/core/azure-nspkg/README.md', '#4554']
   - ['sdk/core/azure-servicemanagement-legacy/README.md', '#4554']
   - ['sdk/eventgrid/azure-eventgrid/README.md', '#4554']
   - ['sdk/graphrbac/azure-graphrbac/README.md', '#4554']
   - ['sdk/loganalytics/azure-loganalytics/README.md', '#4554']
-  - ['sdk/schemaregistry/azure-schemaregistry/swagger/README.md', '#4554']
   - ['sdk/servicebus/azure-servicebus/README.md', '#4554']
-  - ['sdk/servicebus/azure-servicebus/swagger/README.md', '#4554']
   - ['sdk/servicebus/azure-servicebus/tests/perf_tests/README.md', '#4554']
   - ['sdk/servicefabric/azure-servicefabric/README.md', '#4554']
-  - ['sdk/storage/azure-storage-nspkg/README.md', '#4554']
   - ['sdk/storage/azure-storage-blob/swagger/README.md', '#4554']
   - ['sdk/storage/azure-storage-file-datalake/swagger/README.md', '#4554']
   - ['sdk/storage/azure-storage-file-share/swagger/README.md', '#4554']
   - ['sdk/storage/azure-storage/README.md', '#4554']
-  - ['sdk/storage/azure-storage-nspkg/README.rst', '#4554']
   - ['sdk/storage/azure-storage-queue/swagger/README.md', '#4554']
   - ['sdk/storage/README.md', '#4554']
   - ['sdk/textanalytics/azure-ai-textanalytics/samples/README.md', '#4554']
-  - ['sdk/monitor/azure-monitor-opentelemetry-exporter/swagger/README.md', '#4554']
   - ['sdk/monitor/azure-monitor-opentelemetry-exporter/README.md', '#4554']
   - ['sdk/digitaltwins/azure-digitaltwins-core/swagger/README.md', '#4554']
   - ['sdk/textanalytics/azure-ai-textanalytics/swagger/README.md', '#4554']
-  - ['sdk/media/azure-media-nspkg/README.md', '#4554']
+
   - ['sdk/containerregistry/azure-containerregistry/swagger/README.md', '#4554']
   - ['sdk/appconfiguration/azure-appconfiguration/swagger/README.md', '#4554']
 
-  # nspckg and common.
-  - ['sdk/appconfiguration/azure-appconfiguration/README.md', 'nspkg and common']
-  - ['sdk/appconfiguration/azure-appconfiguration/samples/README.md', 'nspkg and common']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-knowledge-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-language-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-search-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/cognitiveservices/azure-cognitiveservices-vision-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/core/azure/README.rst', 'nspkg and common']
-  - ['sdk/core/azure-common/README.rst', 'nspkg and common']
-  - ['sdk/core/azure-core/README.md', 'nspkg and common']
-  - ['sdk/core/azure-core/samples/README.md', 'nspkg and common']
-  - ['sdk/core/azure-mgmt-datalake-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/core/azure-mgmt-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/core/azure-nspkg/README.rst', 'nspkg and common']
-  - ['sdk/keyvault/azure-keyvault-nspkg/README.md', 'nspkg and common']
-  - ['sdk/mixedreality/azure-mixedreality-nspkg/README.md', 'nspkg and common']
-  - ['sdk/search/azure-search-nspkg/README.md', 'nspkg and common']
-  - ['sdk/search/azure-search-documents/README.md', 'nspkg and common']
-  - ['sdk/storage/azure-storage-blob/samples/README.md', 'nspkg and common']
-  - ['sdk/storage/azure-storage-file-datalake/samples/README.md', 'nspkg and common']
-  - ['sdk/storage/azure-storage-blob-changefeed/samples/README.md', 'nspkg and common']
-  - ['sdk/storage/azure-storage-file-share/samples/README.md', 'nspkg and common']
-  - ['sdk/storage/azure-storage-queue/samples/README.md', 'nspkg and common']
-  - ['sdk/textanalytics/azure-ai-nspkg/README.md', 'nspkg and common']
-  - ['sdk/translation/azure-ai-translation-nspkg/README.md', 'nspkg and common']
-  - ['sdk/eventhub/azure-eventhub/samples/README.md', 'nspkg and common']
-  - ['sdk/tables/azure-data-nspkg/README.md', 'nspkg and common']
-  - ['sdk/cosmos/README.md', 'nspkg and common']
-  - ['sdk/communication/azure-communication-nspkg/README.md', 'nspkg and common']
-  - ['sdk/iot/azure-iot-nspkg/README.md', 'nspkg and common']
+  # common.
+  - ['sdk/appconfiguration/azure-appconfiguration/README.md', 'common']
+  - ['sdk/appconfiguration/azure-appconfiguration/samples/README.md', 'common']
+  - ['sdk/core/azure/README.rst', 'common']
+  - ['sdk/core/azure-common/README.rst', 'common']
+  - ['sdk/core/azure-core/README.md', 'common']
+  - ['sdk/core/azure-core/samples/README.md', 'common']
+  - ['sdk/search/azure-search-documents/README.md', 'common']
+  - ['sdk/storage/azure-storage-blob/samples/README.md', 'common']
+  - ['sdk/storage/azure-storage-file-datalake/samples/README.md', 'common']
+  - ['sdk/storage/azure-storage-blob-changefeed/samples/README.md', 'common']
+  - ['sdk/storage/azure-storage-file-share/samples/README.md', 'common']
+  - ['sdk/storage/azure-storage-queue/samples/README.md', 'common']
+  - ['sdk/eventhub/azure-eventhub/samples/README.md', 'common']
+  - ['sdk/cosmos/README.md', 'common']
+  - ['sdk/iot/azure-iot-nspkg/README.md', 'common']
   # HISTORY.rst
   - ['sdk/core/azure/HISTORY.rst','nspkg and common']
   - ['sdk/digitaltwins/azure-digitaltwins-nspkg/README.md', 'nspkg and common']
-
+  - ['sdk/nspkg/azure-messaging-nspkg/README.md', '#4554']
+  - ['sdk/signalr/azure-mgmt-signalr/README.md', '#4554']
+  - ['sdk/webpubsub/azure-messaging-webpubsubservice/README.md', '#4554']
   # root readme
   - ['README.md', 'root readme']
 
@@ -155,6 +119,18 @@ known_content_issues:
   - ['doc/dev/mgmt/README.md', 'dev readme']
   - ['doc/dev/README.md', dev readme']
   - ['doc/README.md', 'dev readme']
+
+  # swagger files
+  - ['sdk/schemaregistry/azure-schemaregistry/swagger/README.md', '#4554']
+  - ['sdk/servicebus/azure-servicebus/swagger/README.md', '#4554']
+  - ['sdk/storage/azure-storage-blob/swagger/README.md', '#4554']
+  - ['sdk/storage/azure-storage-file-datalake/swagger/README.md', '#4554']
+  - ['sdk/storage/azure-storage-file-share/swagger/README.md', '#4554']
+  - ['sdk/storage/azure-storage-queue/swagger/README.md', '#4554']
+  - ['sdk/monitor/azure-monitor-opentelemetry-exporter/swagger/README.md', '#4554']
+  - ['sdk/digitaltwins/azure-digitaltwins-core/swagger/README.md', '#4554']
+  - ['sdk/textanalytics/azure-ai-textanalytics/swagger/README.md', '#4554']
+  - ['sdk/appconfiguration/azure-appconfiguration/swagger/README.md', '#4554']
 package_indexing_exclusion_list:
   - 'azure-sdk-tools'
   - 'azure-template'

eng/autorest_req.txt

@@ -4,5 +4,6 @@ pytest-cov==2.8.1
 pytest-asyncio==0.12.0; python_version >= '3.5'
 isodate==0.6.0
 msrest==0.6.14
-aiohttp==3.6.2
-wheel==0.34.2
+wheel==0.34.2
+GitPython==3.1.14
+aiohttp==3.6.2; python_version >= '3.6'

eng/common/pipelines/templates/steps/daily-dev-build-variable.yml

@@ -22,3 +22,7 @@ steps:
     echo "##vso[task.setvariable variable=SetDevVersion]$setDailyDevBuild"
   displayName: "Setup Versioning Properties"
   condition: eq(variables['SetDevVersion'], '')
+- pwsh: |
+    echo "##vso[task.setvariable variable=SetDevVersion;isOutput=true]$(SetDevVersion)"
+  name: VersioningProperties
+  displayName: "Export Versioning Properties"

eng/common/pipelines/templates/steps/prepare-pipelines.yml

@@ -16,7 +16,7 @@ parameters:
 
 steps:
   - template: install-pipeline-generation.yml
-
+  - template: /eng/common/pipelines/templates/steps/set-default-branch.yml
   # This covers our public repos.
   - ${{ if not(endsWith(parameters.Repository, '-pr'))}}:
     - script: >
@@ -30,7 +30,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention ci
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         ${{parameters.CIConventionOptions}}
@@ -48,7 +48,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention up
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         ${{parameters.UPConventionOptions}}
@@ -66,7 +66,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention tests
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         ${{parameters.TestsConventionOptions}}
@@ -88,7 +88,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention ci
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         --no-schedule
@@ -107,7 +107,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention up
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         --no-schedule
@@ -126,7 +126,7 @@ steps:
         --repository ${{parameters.Repository}}
         --convention tests
         --agentpool Hosted
-        --branch refs/heads/master
+        --branch refs/heads/$(DefaultBranch)
         --patvar PATVAR
         --debug
         --no-schedule

eng/common/pipelines/templates/steps/sparse-checkout.yml

@@ -24,15 +24,13 @@ steps:
     - pwsh: |
         git clone --no-checkout --filter=tree:0 git://github.com/${{ repo.Name }} .
         git sparse-checkout init
-        git sparse-checkout set eng
+        $paths = ('${{ convertToJson(parameters.Paths) }}' | ConvertFrom-Json) -Join ' '
+        Invoke-Expression -Command "git sparse-checkout set eng $paths"
+        Write-Host "Set sparse checkout paths to:"
+        Get-Content .git/info/sparse-checkout
       displayName: Init sparse checkout ${{ repo.Name }}
       workingDirectory: ${{ coalesce(repo.WorkingDirectory, format('{0}/{1}', '$(System.DefaultWorkingDirectory)', repo.Name)) }}
 
-    - ${{ each path in parameters.Paths }}:
-      - pwsh: git sparse-checkout add ${{ path }}
-        displayName: Add sparse checkout path ${{ path }}
-        workingDirectory: ${{ coalesce(repo.WorkingDirectory, format('{0}/{1}', '$(System.DefaultWorkingDirectory)', repo.Name)) }}
-
     - pwsh: git checkout ${{ repo.Commitish }}
       displayName: Sparse checkout at ${{ repo.Commitish }}
       workingDirectory: ${{ coalesce(repo.WorkingDirectory, format('{0}/{1}', '$(System.DefaultWorkingDirectory)', repo.Name)) }}

eng/common/scripts/ChangeLog-Operations.ps1

@@ -2,7 +2,7 @@
 . "${PSScriptRoot}\logging.ps1"
 . "${PSScriptRoot}\SemVer.ps1"
 
-$RELEASE_TITLE_REGEX = "(?<releaseNoteTitle>^\#+.*(?<version>\b\d+\.\d+\.\d+([^0-9\s][^\s:]+)?)(\s+(?<releaseStatus>\(.*\)))?)"
+$RELEASE_TITLE_REGEX = "(?<releaseNoteTitle>^\#+\s+(?<version>$([AzureEngSemanticVersion]::SEMVER_REGEX))(\s+(?<releaseStatus>\(.+\))))"
 $CHANGELOG_UNRELEASED_STATUS = "(Unreleased)"
 $CHANGELOG_DATE_FORMAT = "yyyy-MM-dd"
 
@@ -120,7 +120,17 @@ function Confirm-ChangeLogEntry {
     else {
       $status = $changeLogEntry.ReleaseStatus.Trim().Trim("()")
       try {
-        [DateTime]$status
+        $releaseDate = [DateTime]$status
+        if ($status -ne ($releaseDate.ToString($CHANGELOG_DATE_FORMAT)))
+        {
+          LogError "Date must be in the format $($CHANGELOG_DATE_FORMAT)"
+          return $false
+        }
+        if (((Get-Date).AddMonths(-1) -gt $releaseDate) -or ($releaseDate -gt (Get-Date).AddMonths(1)))
+        {
+          LogError "The date must be within +/- one month from today."
+          return $false
+        }
       }
       catch {
           LogError "Invalid date [ $status ] passed as status for Version [$($changeLogEntry.ReleaseVersion)]."
@@ -212,4 +222,4 @@ function Set-ChangeLogContent {
   }
 
   Set-Content -Path $ChangeLogLocation -Value $changeLogContent
-}
+}

eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1

@@ -142,6 +142,8 @@ function FindPackageWorkItem($lang, $packageName, $version, $outputCommand = $tr
   $fields += "PackageBetaVersions"
   $fields += "PackageGAVersion"
   $fields += "PackagePatchVersions"
+  $fields += "Generated"
+  $fields += "RoadmapState"
 
   $fieldList = ($fields | ForEach-Object { "[$_]"}) -join ", "
   $query = "SELECT ${fieldList} FROM WorkItems WHERE [Work Item Type] = 'Package'"
@@ -295,13 +297,14 @@ function UpdatePackageWorkItemReleaseState($id, $state, $releaseType, $outputCom
   return UpdateWorkItem -id $id -state $state -fields $fields -outputCommand $outputCommand
 }
 
-function FindOrCreateClonePackageWorkItem($lang, $pkg, $verMajorMinor, $outputCommand = $false)
+function FindOrCreateClonePackageWorkItem($lang, $pkg, $verMajorMinor, $allowPrompt = $false, $outputCommand = $false)
 {
   $workItem = FindPackageWorkItem -lang $lang -packageName $pkg.Package -version $verMajorMinor -includeClosed $true -outputCommand $outputCommand
 
   if (!$workItem) {
     $latestVersionItem = FindLatestPackageWorkItem -lang $lang -packageName $pkg.Package -outputCommand $outputCommand
     $assignedTo = "me"
+    $extraFields = @()
     if ($latestVersionItem) {
       Write-Verbose "Copying data from latest matching [$($latestVersionItem.id)] with version $($latestVersionItem.fields["Custom.PackageVersionMajorMinor"])"
       if ($latestVersionItem.fields["System.AssignedTo"]) {
@@ -312,14 +315,33 @@ function FindOrCreateClonePackageWorkItem($lang, $pkg, $verMajorMinor, $outputCo
       if (!$pkg.RepoPath -and $pkg.RepoPath -ne "NA" -and $pkg.fields["Custom.PackageRepoPath"]) {
         $pkg.RepoPath = $pkg.fields["Custom.PackageRepoPath"]
       }
+
+      $extraFields += "`"Generated=" + $latestVersionItem.fields["Custom.Generated"] + "`""
+      $extraFields += "`"RoadmapState=" +  $latestVersionItem.fields["Custom.RoadmapState"] + "`""
+    }
+
+    if ($allowPrompt) {
+      if (!$pkg.DisplayName) {
+        Write-Host "We need a package display name to be used in various places and it should be consistent across languages for similar packages."
+        while (($readInput = Read-Host -Prompt "Input the display name") -eq "") { }
+        $packageInfo.DisplayName = $readInput
+      }
+
+      if (!$pkg.ServiceName) {
+        Write-Host "We need a package service name to be used in various places and it should be consistent across languages for similar packages."
+        while (($readInput = Read-Host -Prompt "Input the service name") -eq "") { }
+        $packageInfo.ServiceName = $readInput
+      }
     }
-    $workItem = CreateOrUpdatePackageWorkItem $lang $pkg $verMajorMinor -existingItem $null -assignedTo $assignedTo -outputCommand $outputCommand
+
+
+    $workItem = CreateOrUpdatePackageWorkItem $lang $pkg $verMajorMinor -existingItem $null -assignedTo $assignedTo -extraFields $extraFields -outputCommand $outputCommand
   }
 
   return $workItem
 }
 
-function CreateOrUpdatePackageWorkItem($lang, $pkg, $verMajorMinor, $existingItem, $assignedTo = $null, $outputCommand = $true)
+function CreateOrUpdatePackageWorkItem($lang, $pkg, $verMajorMinor, $existingItem, $assignedTo = $null, $extraFields = $null, $outputCommand = $true)
 {
   if (!$lang -or !$pkg -or !$verMajorMinor) {
     Write-Host "Cannot create or update because one of lang, pkg or verMajorMinor aren't set. [$lang|$($pkg.Package)|$verMajorMinor]"
@@ -343,6 +365,10 @@ function CreateOrUpdatePackageWorkItem($lang, $pkg, $verMajorMinor, $existingIte
   $fields += "`"ServiceName=${serviceName}`""
   $fields += "`"PackageRepoPath=${pkgRepoPath}`""
 
+  if ($extraFields) {
+    $fields += $extraFields
+  }
+
   if ($existingItem)
   {
     $changedField = $null