From b3d637e5b9d5f3cf78756d1d97fb5d06a8762dd5 Mon Sep 17 00:00:00 2001
From: "Shah Asaduzzaman (ASAD)" <shahasad@microsoft.com>
Date: Thu, 29 Aug 2019 10:51:57 -0700
Subject: [PATCH 1/4] added test tools to the nuget. added current date in the
 uploaded blob prefix

---
 .../Microsoft.ML.OnnxRuntime.csproj                | 14 ++++++++++++++
 .../github/azure-pipelines/nuget/templates/cpu.yml | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
index 7c96c5690dce2..be6cca8b86e1d 100644
--- a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
+++ b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
@@ -119,6 +119,20 @@
           Pack="true"
           Visible="false"
     />
+    <!-- Some tools to be packaged in nightly build only, should not be released -->
+    <!-- These are copied to the runtimes folder for coveniennce of loading with the dlls -->
+    <None Include="$(NativeBuildOutputDir)\onnxruntime_perf_test.exe"
+          Condition="('$(IsReleaseBuild)' != 'true') And ($(TargetArchitecture)=='x64') And Exists('$(NativeBuildOutputDir)\onnxruntime_perf_test.exe')"
+          PackagePath="\runtimes\win-$(TargetArchitecture)\native"
+          Pack="true"
+          Visible="false"
+    />
+    <None Include="$(NativeBuildOutputDir)\onnx_test_runner.exe"
+          Condition="('$(IsReleaseBuild)' != 'true') And ($(TargetArchitecture)=='x64') And Exists('$(NativeBuildOutputDir)\onnx_test_runner.exe')"
+          PackagePath="\runtimes\win-$(TargetArchitecture)\native"
+          Pack="true"
+          Visible="false"
+    />
 
   </ItemGroup>
 
diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
index 72377b20683ef..7f3aa87f1e532 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
@@ -177,6 +177,15 @@ jobs:
       downloadPath: $(Build.BinariesDirectory)/nuget-artifact/final-package
       gitCommitHash: $(OnnxRuntimeGitCommitHashShort)  
 
+
+  - task: PowerShell@2
+    displayName: 'Get Current Date'
+    inputs:
+      targetType: 'inline'
+      script: |
+          $date = $(Get-Date -Format "yyyy-MM-dd")
+          Write-Host "##vso[task.setvariable variable=CurrentDate]$date"
+
   - task: AzureFileCopy@3
     displayName: 'Copy Signed NuGet Package to Blob Store'
     condition: ne(variables['IsReleaseBuild'], 'true') # rlease build has a different package naming scheme
@@ -186,4 +195,5 @@ jobs:
       destination: azureBlob
       storage: ortpackages
       containerName: ortpackages
+      blobPrefix: '$(CurrentDate)/'
 

From b239968601014a4973c9899925e98f6798c5e058 Mon Sep 17 00:00:00 2001
From: "Shah Asaduzzaman (ASAD)" <shahasad@microsoft.com>
Date: Thu, 29 Aug 2019 10:56:18 -0700
Subject: [PATCH 2/4] removed master branch condition for testing

---
 tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
index 7f3aa87f1e532..c2bc0cf8dc5a5 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
@@ -164,7 +164,9 @@ jobs:
     # So, all the copy/publish jobs are being run on hosted agent
     # TODO: install the desired azureps on our VMs or use later bugfixed version of AzureFileCopy   
     demands: azureps
-  condition: and (${{ parameters.DoEsrp }}, eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+#  condition: and (${{ parameters.DoEsrp }}, eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+#  remove master condition for testing
+  condition: (${{ parameters.DoEsrp }})
   dependsOn:
   - NuGet_Test_Win
   - NuGet_Test_Linux

From c6545d7aad497e92a1fcc3864e4a0fcb297a94a5 Mon Sep 17 00:00:00 2001
From: "Shah Asaduzzaman (ASAD)" <shahasad@microsoft.com>
Date: Thu, 29 Aug 2019 10:58:10 -0700
Subject: [PATCH 3/4] removed master branch condition for testing

---
 tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
index c2bc0cf8dc5a5..80c13a647571b 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
@@ -166,7 +166,7 @@ jobs:
     demands: azureps
 #  condition: and (${{ parameters.DoEsrp }}, eq(variables['Build.SourceBranch'], 'refs/heads/master'))
 #  remove master condition for testing
-  condition: (${{ parameters.DoEsrp }})
+  condition: ${{ parameters.DoEsrp }}
   dependsOn:
   - NuGet_Test_Win
   - NuGet_Test_Linux

From c0888c3c6dad19e9d14b7405bb9d878b93fa4d21 Mon Sep 17 00:00:00 2001
From: "Shah Asaduzzaman (ASAD)" <shahasad@microsoft.com>
Date: Thu, 29 Aug 2019 13:31:16 -0700
Subject: [PATCH 4/4] add back master branch condition

---
 tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
index 80c13a647571b..7f3aa87f1e532 100644
--- a/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget/templates/cpu.yml
@@ -164,9 +164,7 @@ jobs:
     # So, all the copy/publish jobs are being run on hosted agent
     # TODO: install the desired azureps on our VMs or use later bugfixed version of AzureFileCopy   
     demands: azureps
-#  condition: and (${{ parameters.DoEsrp }}, eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-#  remove master condition for testing
-  condition: ${{ parameters.DoEsrp }}
+  condition: and (${{ parameters.DoEsrp }}, eq(variables['Build.SourceBranch'], 'refs/heads/master'))
   dependsOn:
   - NuGet_Test_Win
   - NuGet_Test_Linux