From 4de5f1db62119059a398fad4b2c0a3de4e21fa0d Mon Sep 17 00:00:00 2001
From: Pranav Sharma <prs@microsoft.com>
Date: Mon, 17 Dec 2018 13:54:33 -0800
Subject: [PATCH 1/3] Adding the include folder for the C Windows pkg.

---
 .../Microsoft.ML.OnnxRuntime.csproj                  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
index 54c17cad3acb5..43737469eb0e8 100644
--- a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
+++ b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
@@ -5,7 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
-    <AssemblyOriginatorKeyFile>OnnxRuntime.snk</AssemblyOriginatorKeyFile>   
+    <AssemblyOriginatorKeyFile>OnnxRuntime.snk</AssemblyOriginatorKeyFile>
 
     <!--- packaging properties -->
     <PackageId>Microsoft.ML.OnnxRuntime</PackageId>
@@ -31,6 +31,12 @@
   <!--TODO: this works for single platform only. Need separate packaging scripts for multi-target packaging -->
   <!--TODO: Find a way to bundle the native symbol files properly -->
   <ItemGroup>
+    <None Include="$(OnnxRuntimeCsharpRoot)\..\include\**\*.*"
+          PackagePath="\build\native"
+          Pack="true"
+          CopyToOutputDirectory="Always"
+          Visible="false"
+    />
     <None Include="$(NativeBuildOutputDir)\onnxruntime.dll"
           PackagePath="\runtimes\win10-x64\native"
           Pack="true"
@@ -44,7 +50,7 @@
           CopyToOutputDirectory="Always"
           Visible="false"
     />
-    <None Include="$(NativeBuildOutputDir)\mkldnn.dll" 
+    <None Include="$(NativeBuildOutputDir)\mkldnn.dll"
           Condition="Exists('$(NativeBuildOutputDir)\mkldnn.dll')"
           PackagePath="\runtimes\win10-x64\native"
           Pack="true"
@@ -84,7 +90,7 @@
     <Exec Command="git rev-parse --short HEAD" ConsoleToMSBuild="true">
         <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitHashShort" />
     </Exec>
-    
+
     <PropertyGroup>
       <PackageVersion>@(MajorVersionNumber)</PackageVersion>
       <Version>$(PackageVersion)</Version>

From b676a11db808a08789e25140e90b2ffbaf1d97bb Mon Sep 17 00:00:00 2001
From: Pranav Sharma <prs@microsoft.com>
Date: Mon, 17 Dec 2018 18:56:36 -0800
Subject: [PATCH 2/3] Add import lib to the pkg

---
 .../Microsoft.ML.OnnxRuntime.csproj                         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
index 43737469eb0e8..ec902c46742c0 100644
--- a/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
+++ b/csharp/src/Microsoft.ML.OnnxRuntime/Microsoft.ML.OnnxRuntime.csproj
@@ -37,6 +37,12 @@
           CopyToOutputDirectory="Always"
           Visible="false"
     />
+    <None Include="$(NativeBuildOutputDir)\onnxruntime.lib"
+          PackagePath="\runtimes\win10-x64\native"
+          Pack="true"
+          CopyToOutputDirectory="Always"
+          Visible="false"
+    />
     <None Include="$(NativeBuildOutputDir)\onnxruntime.dll"
           PackagePath="\runtimes\win10-x64\native"
           Pack="true"

From 20e9f69248bd01a3d7f7cc6e8af10f382124130f Mon Sep 17 00:00:00 2001
From: Pranav Sharma <prs@microsoft.com>
Date: Tue, 18 Dec 2018 13:20:23 -0800
Subject: [PATCH 3/3] Disable csharp pretrained tests temporarily

---
 csharp/test/Microsoft.ML.OnnxRuntime.Tests/InferenceTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.Tests/InferenceTest.cs b/csharp/test/Microsoft.ML.OnnxRuntime.Tests/InferenceTest.cs
index 995c6acbb91d1..c6167b48dbd73 100644
--- a/csharp/test/Microsoft.ML.OnnxRuntime.Tests/InferenceTest.cs
+++ b/csharp/test/Microsoft.ML.OnnxRuntime.Tests/InferenceTest.cs
@@ -205,7 +205,7 @@ private void TestMultiThreads()
             session.Dispose();
         }
 
-        [Fact]
+        [Fact(Skip = "Disable temporarily")]
         private void TestPreTrainedModelsOpset7And8()
         {
             var opsets = new[] { "opset7", "opset8" };