Final cherry pick for rel 0.3.0 (#623)

microsoft · Jun 19, 2024 · 25f5873 · 25f5873
1 parent 31f4b1b
commit 25f5873
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 40 deletions.
diff --git a/.pipelines/stages/jobs/steps/compliant/esrp_nuget.yml b/.pipelines/stages/jobs/steps/compliant/esrp_nuget.yml
@@ -5,12 +5,20 @@ parameters:
 
 steps:
 - ${{ if eq(parameters['DoEsrp'], 'true') }}:
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
     displayName: ${{ parameters.DisplayName }}
     inputs:
-      ConnectedServiceName: 'OnnxRuntime CodeSign 20190817'
+      ConnectedServiceName: 'esrp_release'
+      AppRegistrationClientId: '53d54d02-978d-4305-8572-583cf6711c4f'
+      AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+      AuthAKVName: 'buildkeyvault'
+      AuthCertName: '53d54d02-SSL-AutoRotate'
+      AuthSignCertName: '53d54d02-978d-4305-8572-583cf6711c4f'
       FolderPath: ${{ parameters.FolderPath }}
       Pattern: '*.nupkg'
+      SessionTimeout: 90
+      ServiceEndpointUrl: 'https://api.esrp.microsoft.com/api/v2'
+      MaxConcurrency: 25
       signConfigType: inlineSignParams
       inlineOperation: |
        [
@@ -19,13 +27,13 @@ steps:
                "operationSetCode": "NuGetSign",
                "parameters": [ ],
                "toolName": "sign",
-               "toolVersion": "1.0"
+               "toolVersion": "6.2.9304.0"
            },
            {
                "keyCode": "CP-401405",
                "operationSetCode": "NuGetVerify",
                "parameters": [ ],
                "toolName": "sign",
-               "toolVersion": "1.0"
+               "toolVersion": "6.2.9304.0"
            }
        ]
diff --git a/.pipelines/stages/jobs/steps/compliant/win-esrp-dll-step.yml b/.pipelines/stages/jobs/steps/compliant/win-esrp-dll-step.yml
@@ -16,43 +16,19 @@ parameters:
   default: '*.dll'
 
 steps:
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
   displayName: ${{ parameters.DisplayName }}
   condition: and(succeeded(), eq('${{ parameters.DoEsrp }}', true))
   continueOnError: true
   inputs:
-    ConnectedServiceName: 'OnnxRuntime CodeSign 20190817'
+    ConnectedServiceName: 'esrp_release'
+    AppRegistrationClientId: '53d54d02-978d-4305-8572-583cf6711c4f'
+    AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+    AuthAKVName: 'buildkeyvault'
+    AuthCertName: '53d54d02-SSL-AutoRotate'
+    AuthSignCertName: '53d54d02-978d-4305-8572-583cf6711c4f'
     FolderPath: ${{ parameters.FolderPath }}
     Pattern: ${{ parameters.Pattern }}
-    signConfigType: inlineSignParams
-    inlineOperation: |
-      [
-        {
-          "keyCode": "CP-230012",
-          "operationSetCode": "SigntoolSign",
-          "parameters": [
-            {
-              "parameterName": "OpusName",
-              "parameterValue": "Microsoft"
-            },
-            {
-              "parameterName": "OpusInfo",
-              "parameterValue": "http://www.microsoft.com"
-            },
-            {
-              "parameterName": "PageHash",
-              "parameterValue": "/NPH"
-            },
-            {
-              "parameterName": "FileDigest",
-              "parameterValue": "/fd sha256"
-            },
-            {
-              "parameterName": "TimeStamp",
-              "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-            }
-          ],
-          "toolName": "signtool.exe",
-          "toolVersion": "6.2.9304.0"
-        }
-      ]
+    SessionTimeout: 90
+    ServiceEndpointUrl: 'https://api.esrp.microsoft.com/api/v2'
+    MaxConcurrency: 25
diff --git a/nuget/Microsoft.ML.OnnxRuntimeGenAI.Managed.nuspec b/nuget/Microsoft.ML.OnnxRuntimeGenAI.Managed.nuspec
@@ -13,7 +13,8 @@
     <releaseNotes>Introducing the ONNX Runtime GenAI Library.</releaseNotes>
     <tags>ONNX;ONNX Runtime;ONNX Runtime Gen AI;Machine Learning</tags>
     <dependencies>
-      <group targetFramework="net8.0;netstandard2.0" />
+      <group targetFramework="net8.0" />
+      <group targetFramework="netstandard2.0" />
     </dependencies>
   </metadata>
   <files>

diff --git a/src/models/prompt_image_processor.cpp b/src/models/prompt_image_processor.cpp
@@ -76,7 +76,7 @@ std::unique_ptr<OrtValue> ProcessImagePrompt(const Generators::Tokenizer& tokeni
 std::unique_ptr<OrtValue> ProcessPixelValues(ortc::Tensor<float>* pixel_values, ONNXTensorElementDataType expected_type,
                                              Ort::Allocator& allocator) {
   if (!(expected_type == ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT || expected_type == ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16)) {
-    throw std::runtime_error("Expected pixel_values to be of type float or float16. Actual: " + expected_type);
+    throw std::runtime_error("Expected pixel_values to be of type float or float16. Actual: " + std::to_string(expected_type));
   }
   auto pixel_values_value = expected_type == ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT
                                 ? OrtValue::CreateTensor<float>(allocator, pixel_values->Shape())