follow 0b2c4ac

Author: tianleiwu

tools/ci_build/github/azure-pipelines/dml-nuget-packaging.yml

@@ -77,8 +77,11 @@ extends:
         NuPackScript: |
           python -m pip install setuptools
           msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} /p:CurrentData=$(BuildDate) /p:CurrentTime=$(BuildTime)
+          if errorlevel 1 exit /b 1
           copy $(Build.SourcesDirectory)\csharp\src\Microsoft.ML.OnnxRuntime\bin\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
-          copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\*.nupkg $(Build.ArtifactStagingDirectory)
+          if errorlevel 1 exit /b 1
+          powershell -Command "$$isRelease = [System.Convert]::ToBoolean('${{ parameters.IsReleaseBuild }}'); $$pkg = Get-ChildItem $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\Microsoft.ML.OnnxRuntime.DirectML.*.nupkg | Where-Object { $$_.Name -notlike '*symbols*' -and (($$isRelease -and $$_.Name -notlike '*-dev*') -or (-not $$isRelease -and $$_.Name -like '*-dev*')) } | Select-Object -First 1; if ($$pkg) { Copy-Item $$pkg.FullName $(Build.ArtifactStagingDirectory) } else { Write-Error 'No matching nupkg found'; exit 1 }"
+          if errorlevel 1 exit /b 1
           mkdir $(Build.ArtifactStagingDirectory)\testdata
           copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
 
@@ -97,9 +100,12 @@ extends:
         NuPackScript: |
           python -m pip install setuptools
           msbuild $(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj /p:Configuration=RelWithDebInfo /p:TargetArchitecture=arm64 /t:CreatePackage /p:OrtPackageId=Microsoft.ML.OnnxRuntime.DirectML /p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
+          if errorlevel 1 exit /b 1
           cd $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\
-          powershell -Command \"Get-ChildItem Microsoft.ML.OnnxRuntime.DirectML.*.nupkg -ErrorAction Stop | Sort-Object {$_.Name.Length} | Select-Object -First 1 | Rename-Item -NewName win-dml-arm64.zip\"
+          powershell -Command "$$isRelease = [System.Convert]::ToBoolean('${{ parameters.IsReleaseBuild }}'); $$pkg = Get-ChildItem Microsoft.ML.OnnxRuntime.DirectML.*.nupkg | Where-Object { $$_.Name -notlike '*symbols*' -and (($$isRelease -and $$_.Name -notlike '*-dev*') -or (-not $$isRelease -and $$_.Name -like '*-dev*')) } | Select-Object -First 1; if ($$pkg) { Rename-Item -Path $$pkg.FullName -NewName win-dml-arm64.zip } else { Write-Error 'No matching nupkg found'; exit 1 }"
+          if errorlevel 1 exit /b 1
           copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\win-dml-arm64.zip $(Build.ArtifactStagingDirectory)
+          if errorlevel 1 exit /b 1
           mkdir $(Build.ArtifactStagingDirectory)\testdata
           copy $(Build.BinariesDirectory)\RelWithDebInfo\RelWithDebInfo\custom_op_library.* $(Build.ArtifactStagingDirectory)\testdata
 

tools/ci_build/github/azure-pipelines/templates/validate-package.yml

@@ -4,6 +4,7 @@ parameters:
   PackageType: ''
   PackageName: ''
   PackagePath: ''
+  IsReleaseBuild: false
   ScriptPath: '$(Build.SourcesDirectory)/tools/nuget/validate_package.py'
   workingDirectory: "$(Build.BinariesDirectory)"
 
@@ -17,5 +18,5 @@ steps:
       displayName: 'Validate Package'
       inputs:
         scriptPath: '${{parameters.ScriptPath}}'
-        arguments: '--package_type ${{parameters.PackageType}} --package_name ${{parameters.PackageName}} --package_path ${{parameters.PackagePath}} --platforms_supported ${{parameters.PlatformsSupported}} --verify_nuget_signing ${{parameters.VerifyNugetSigning}}'
+        arguments: '--package_type ${{parameters.PackageType}} --package_name ${{parameters.PackageName}} --package_path ${{parameters.PackagePath}} --platforms_supported ${{parameters.PlatformsSupported}} --verify_nuget_signing ${{parameters.VerifyNugetSigning}} --is_release_build ${{parameters.IsReleaseBuild}}'
         workingDirectory: ${{parameters.workingDirectory}}

tools/nuget/validate_package.py

@@ -67,6 +67,10 @@ def parse_arguments():
         "--verify_nuget_signing",
         help="Flag indicating if Nuget package signing is to be verified. Only accepts 'true' or 'false'",
     )
+    parser.add_argument(
+        "--is_release_build",
+        help="Flag indicating if validating a release build or dev build. Only accepts 'true' or 'false'",
+    )
 
     return parser.parse_args()
 
@@ -285,7 +289,14 @@ def validate_zip(args):
 
 def validate_nuget(args):
     files = glob.glob(os.path.join(args.package_path, args.package_name))
-    nuget_packages_found_in_path = [i for i in files if i.endswith(".nupkg") and "Managed" not in i]
+    is_release_build = args.is_release_build and args.is_release_build.lower() == "true"
+    nuget_packages_found_in_path = [
+        i
+        for i in files
+        if i.endswith(".nupkg")
+        and "Managed" not in i
+        and ((is_release_build and "-dev" not in i) or (not is_release_build and "-dev" in i))
+    ]
     if len(nuget_packages_found_in_path) != 1:
         print("Nuget packages found in path: ")
         print(nuget_packages_found_in_path)