Publish plugin to public UPM feed

Pipelines/Templates/Package.yaml

@@ -83,11 +83,6 @@ jobs:
     displayName: Copy .npmrc for Public Feed
     inputs:
       script: copy $(Build.SourcesDirectory)\Tools\PublicFeed.npmrc $(Build.SourcesDirectory)\Source\Plugins\IsacPluginGenerator\Assets\Microsoft.SpatialAudio.Spatializer.Unity\.npmrc
-  - task: npmAuthenticate@0
-    displayName: Public NPM Feed Authentication
-    inputs:
-      workingFile: Source\Plugins\IsacPluginGenerator\Assets\Microsoft.SpatialAudio.Spatializer.Unity\.npmrc
-      customEndpoint: 'AIPMR SC MixedReality-Unity-Packages'
   - script: python tools\upm_package.py -s $(Pipeline.Workspace) -o "$(Pipeline.Workspace)\npm" -v $(ProductVersion)
     displayName: Build Public NPM Package
   - task: PublishBuildArtifacts@1
@@ -101,6 +96,6 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: 'Publish NPM Package to Build Artifacts'
     inputs:
-      PathtoPublish: '$(Pipeline.Workspace)\npm'
+      PathtoPublish: '$(Build.SourcesDirectory)\Source\Plugins\IsacPluginGenerator\Assets\Microsoft.SpatialAudio.Spatializer.Unity\'
       ArtifactName: 'NpmPackage'
 

Pipelines/Templates/Publish.yaml

@@ -16,6 +16,20 @@ jobs:
         - script: echo Syncing Source
         - checkout: self
           submodules: true
+        - script: echo Downloading NPM Artifacts
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifactName: 'NpmPackage'
+            buildType: 'current'
+            targetPath: '$(Pipeline.Workspace)\npm'
+        - task: npmAuthenticate@0
+          displayName: Public NPM Feed Authentication
+          inputs:
+            workingFile: '$(Pipeline.Workspace)\npm\.npmrc'
+            customEndpoint: 'AIPMR SC MixedReality-Unity-Packages'
+        - script: npm publish $(Pipeline.Workspace)\npm
+          displayName: Publish NPM Package to Public UPM Feed
+
         - script: echo Downloading Nuget Artifacts
         - task: DownloadPipelineArtifact@2
           inputs:

Source/Plugins/IsacPluginGenerator/Assets/Microsoft.SpatialAudio.Spatializer.Unity/.npmrc

@@ -1,3 +1,3 @@
-registry=https://pkgs.dev.azure.com/aipmr/MixedReality-Unity-Packages/_packaging/Unity-packages/npm/registry/
+registry=https://microsoft.pkgs.visualstudio.com/Analog/_packaging/MixedReality-UPM-Internal/npm/registry/
 
 always-auth=true

Source/Plugins/IsacPluginGenerator/Assets/Microsoft.SpatialAudio.Spatializer.Unity/package.json

@@ -4,6 +4,7 @@
   "version": "%version%",
   "unity": "2019.4",
   "description": "Audio Spatializer for HoloLens and Windows Mixed Reality applications",
+  "msftFeatureCategory": "Spatial Audio",
   "keywords": [
     "microsoft",
     "mixed",

Tools/upm_package.py

@@ -20,45 +20,65 @@ def main():
     parser.add_argument("-o", "--output", help="Output location, will use default build/npm location if unspecified", type=str.lower)
     parser.add_argument("-v", "--version", help="Semantic version string for the package", type=str.lower)
     parser.add_argument("-p", "--publish", help="Publish the package to NPM feed", action='store_true')
+    parser.add_argument("-t", "--tarball", help="Publish specified tarball", type=str.lower)
+    parser.add_argument("-d", "--dryrun", help="Simulate publishing without pushing", action='store_true')
     args = parser.parse_args()
 
-    # Copy plugin binaries to project location
-    if not args.stage:
-        stage.stage_binaries()
-    else:
-        stage.stage_binaries(args.stage)
+    if not args.tarball:
+        # Copy plugin binaries to project location
+        if not args.stage:
+            stage.stage_binaries()
+        else:
+            stage.stage_binaries(args.stage)
 
-    git_root = oshelpers.fixpath(githelpers.get_root())
+        git_root = oshelpers.fixpath(githelpers.get_root())
 
-    # Default output path is under build/unity
-    npm_package_location = oshelpers.fixpath(git_root, constants.build_root, "npm")
-    if args.output:
-        npm_package_location = args.output
+        # Default output path is under build/unity
+        npm_package_location = oshelpers.fixpath(git_root, constants.build_root, "npm")
+        if args.output:
+            npm_package_location = args.output
 
-    if not os.path.isdir(npm_package_location):
-        os.mkdir(npm_package_location)
+        if not os.path.isdir(npm_package_location):
+            os.mkdir(npm_package_location)
 
-    unity_project_full_path = oshelpers.fixpath(git_root, constants.unity_project_dir, "Assets", constants.spatializer_plugin_name)
-    npm_package_full_path = oshelpers.fixpath(npm_package_location, constants.spatializer_plugin_name + "." + args.version)
-    # Specify the package version before packing
-    result = subprocess.run(["cmd", "/c", "npm version", args.version, "--allow-same-version"], cwd=unity_project_full_path)
-    local_copy = False
-    if args.publish:
-        npm_command = ["cmd", "/c", "npm publish"]
-    else:
-        local_copy = True
-        npm_command = ["cmd", "/c", "npm pack"]
-    result = subprocess.run(npm_command, cwd=unity_project_full_path)
-    if (result.returncode != 0):
-        print("Package generation failed!")
-        print(result.stdout)
-        print(result.stderr)
+        unity_project_full_path = oshelpers.fixpath(git_root, constants.unity_project_dir, "Assets", constants.spatializer_plugin_name)
+        # Specify the package version before packing
+        result = subprocess.run(["cmd", "/c", "npm version", args.version, "--allow-same-version"], cwd=unity_project_full_path)
+        local_copy = False
+        if args.publish:
+            npm_command = ["cmd", "/c", "npm publish", "--dry-run" if args.dryrun else ""]
+        else:
+            local_copy = True
+            npm_command = ["cmd", "/c", "npm pack"]
+        print(npm_command)
+        result = subprocess.run(npm_command, cwd=unity_project_full_path)
+        if (result.returncode != 0):
+            print("Package generation failed!")
+            print(result.stdout)
+            print(result.stderr)
+        else:
+            if local_copy:
+                npm_package_full_path = oshelpers.fixpath(unity_project_full_path, constants.spatializer_npm_package_name + "-" + args.version + ".tgz")
+                shutil.move(npm_package_full_path, npm_package_location)
+                print("Package successfully generated: " + npm_package_full_path)
+                for file in os.listdir(npm_package_location):
+                    if file.endswith(".tgz"):
+                        print("Package successfully moved to " + oshelpers.fixpath(npm_package_location, file))
+            else:
+                print("Package successfully published")
     else:
-        if local_copy:
-            shutil.move(oshelpers.fixpath(unity_project_full_path, constants.spatializer_npm_package_name + "-" + args.version + ".tgz"), npm_package_location)
-            print("Package successfully generated: " + npm_package_full_path)
+        if not os.path.exists(args.tarball):
+            print("Can't find tarball " + args.tarball)
+            exit
+        npm_command = ["cmd", "/c", "npm publish", args.tarball, "--dry-run" if args.dryrun else ""]
+        print(npm_command)
+        result = subprocess.run(npm_command)
+        if (result.returncode != 0):
+            print("Package generation failed!")
+            print(result.stdout)
+            print(result.stderr)
         else:
-            print("Package successfully published")
+            print("Published tarball!")
 
 if __name__ == '__main__':
     main()