From f0b53e1f1bb59a26efc1da4ba98b52232a9ee6de Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Tue, 30 Jul 2019 10:33:34 -0700
Subject: [PATCH] set C# major version to 2, adjust expand_version.py

---
 build.yaml                                    |  1 +
 .../Grpc.Core.Api/VersionInfo.cs.template     |  4 ++--
 tools/buildgen/plugins/expand_version.py      | 24 +++++++++++--------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/build.yaml b/build.yaml
index e6d9ccac886..999c761056f 100644
--- a/build.yaml
+++ b/build.yaml
@@ -13,6 +13,7 @@ settings:
   '#09': Per-language overrides are possible with (eg) ruby_version tag here
   '#10': See the expand_version.py for all the quirks here
   core_version: 7.0.0
+  csharp_major_version: 2
   g_stands_for: gangnam
   version: 1.23.0-dev
 filegroups:
diff --git a/templates/src/csharp/Grpc.Core.Api/VersionInfo.cs.template b/templates/src/csharp/Grpc.Core.Api/VersionInfo.cs.template
index e94f8c296b6..a9b59a227fe 100644
--- a/templates/src/csharp/Grpc.Core.Api/VersionInfo.cs.template
+++ b/templates/src/csharp/Grpc.Core.Api/VersionInfo.cs.template
@@ -30,12 +30,12 @@
           /// <summary>
           /// Current <c>AssemblyVersion</c> attribute of gRPC C# assemblies
           /// </summary>
-          public const string CurrentAssemblyVersion = "1.0.0.0";
+          public const string CurrentAssemblyVersion = "${settings.csharp_version.major}.0.0.0";
 
           /// <summary>
           /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
           /// </summary>
-          public const string CurrentAssemblyFileVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}.0";
+          public const string CurrentAssemblyFileVersion = "${settings.csharp_version.major}.${settings.csharp_version.minor}.${settings.csharp_version.patch}.0";
 
           /// <summary>
           /// Current version of gRPC C#
diff --git a/tools/buildgen/plugins/expand_version.py b/tools/buildgen/plugins/expand_version.py
index a73446940da..02615f841fe 100755
--- a/tools/buildgen/plugins/expand_version.py
+++ b/tools/buildgen/plugins/expand_version.py
@@ -34,18 +34,20 @@ LANGUAGES = [
 
 class Version:
 
-    def __init__(self, s):
+    def __init__(self, version_str, override_major=None):
         self.tag = None
-        if '-' in s:
-            s, self.tag = s.split('-')
-        self.major, self.minor, self.patch = [int(x) for x in s.split('.')]
+        if '-' in version_str:
+            version_str, self.tag = version_str.split('-')
+        self.major, self.minor, self.patch = [int(x) for x in version_str.split('.')]
+        if override_major:
+            self.major = override_major
 
     def __str__(self):
         """Version string in a somewhat idiomatic style for most languages"""
-        s = '%d.%d.%d' % (self.major, self.minor, self.patch)
+        version_str = '%d.%d.%d' % (self.major, self.minor, self.patch)
         if self.tag:
-            s += '-%s' % self.tag
-        return s
+            version_str += '-%s' % self.tag
+        return version_str
 
     def pep440(self):
         """Version string in Python PEP440 style"""
@@ -105,11 +107,13 @@ def mako_plugin(dictionary):
   """
 
     settings = dictionary['settings']
-    master_version = Version(settings['version'])
+    version_str = settings['version']
+    master_version = Version(version_str)
     settings['version'] = master_version
     for language in LANGUAGES:
         version_tag = '%s_version' % language
+        override_major = settings.get('%s_major_version' % language, None)
         if version_tag in settings:
-            settings[version_tag] = Version(settings[version_tag])
+            settings[version_tag] = Version(settings[version_tag], override_major=override_major)
         else:
-            settings[version_tag] = master_version
+            settings[version_tag] = Version(version_str, override_major=override_major)