From 69bc8ce3c2caeab1fc816241d2c035f5e3af507d Mon Sep 17 00:00:00 2001
From: Changming Sun <chasun@microsoft.com>
Date: Wed, 12 Feb 2020 11:26:32 -0800
Subject: [PATCH] Upgrade protobuf to 3.11.3

---
 cgmanifest.json                                                 | 2 +-
 cmake/external/protobuf                                         | 2 +-
 cmake/patches/ngraph/ngraph_protobuf.patch                      | 2 +-
 .../Microsoft.ML.OnnxRuntime.EndToEndTests.csproj               | 2 +-
 .../Microsoft.ML.OnnxRuntime.Tests.csproj                       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cgmanifest.json b/cgmanifest.json
index 4e925e2d25..5936a2c425 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -247,7 +247,7 @@
          "component": {
             "type": "git",
             "git": {
-               "commitHash": "fe1790ca0df67173702f70d5646b82f48f412b99",
+               "commitHash": "498de9f761bef56a032815ee44b6e6dbe0892cc4",
                "repositoryUrl": "https://github.com/protocolbuffers/protobuf.git"
             }
          }
diff --git a/cmake/external/protobuf b/cmake/external/protobuf
index 7bb8b108d1..498de9f761 160000
--- a/cmake/external/protobuf
+++ b/cmake/external/protobuf
@@ -1 +1 @@
-Subproject commit 7bb8b108d16252d0ed053673d70ea6d2020ec7ff
+Subproject commit 498de9f761bef56a032815ee44b6e6dbe0892cc4
diff --git a/cmake/patches/ngraph/ngraph_protobuf.patch b/cmake/patches/ngraph/ngraph_protobuf.patch
index 57bf85a881..2ad4e87664 100644
--- a/cmake/patches/ngraph/ngraph_protobuf.patch
+++ b/cmake/patches/ngraph/ngraph_protobuf.patch
@@ -11,7 +11,7 @@ index 32217f5d6..d33e9c631 100644
  # This version of PROTOBUF is required by Microsoft ONNX Runtime.
  set(NGRAPH_PROTOBUF_GIT_REPO_URL "https://github.com/protocolbuffers/protobuf")
 -set(NGRAPH_PROTOBUF_GIT_TAG "v3.5.2")
-+set(NGRAPH_PROTOBUF_GIT_TAG "v3.11.2")
++set(NGRAPH_PROTOBUF_GIT_TAG "v3.11.3")
  
  if (WIN32)
      ExternalProject_Add(
diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj
index 19ba6724e8..dbbc528eb4 100644
--- a/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj
+++ b/csharp/test/Microsoft.ML.OnnxRuntime.EndToEndTests/Microsoft.ML.OnnxRuntime.EndToEndTests.csproj
@@ -13,7 +13,7 @@
     <PackageName Condition="'$(PackageName)' == ''">Microsoft.ML.OnnxRuntime</PackageName>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
+    <PackageReference Include="Google.Protobuf" Version="3.11.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="xunit" Version="2.4.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
diff --git a/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj b/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj
index 82af75a2d6..a04b5fcf90 100644
--- a/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj
+++ b/csharp/test/Microsoft.ML.OnnxRuntime.Tests/Microsoft.ML.OnnxRuntime.Tests.csproj
@@ -47,7 +47,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.Targets" Version="2.1.0"/>
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2"/>
-    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
+    <PackageReference Include="Google.Protobuf" Version="3.11.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />