From 6c7489a04399fb203d140b7f33b2dfc089760f38 Mon Sep 17 00:00:00 2001
From: Lindsey Volta <lindseyvolta@google.com>
Date: Tue, 2 Jun 2026 12:46:16 +0000
Subject: [PATCH 1/2] Update formatter to handle plus signs in emails with
 Google domains

---
 Google.Ads.DataManager.Util/src/UserDataFormatter.cs |  1 +
 .../tests/UserDataFormatterTests.cs                  | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/Google.Ads.DataManager.Util/src/UserDataFormatter.cs b/Google.Ads.DataManager.Util/src/UserDataFormatter.cs
index 25bb474..019012a 100644
--- a/Google.Ads.DataManager.Util/src/UserDataFormatter.cs
+++ b/Google.Ads.DataManager.Util/src/UserDataFormatter.cs
@@ -122,6 +122,7 @@ public string FormatEmailAddress(string emailAddress)
 
             if (domain == "gmail.com" || domain == "googlemail.com")
             {
+                username = username.Split('+')[0];
                 username = PeriodPattern.Replace(username, "");
             }
 
diff --git a/Google.Ads.DataManager.Util/tests/UserDataFormatterTests.cs b/Google.Ads.DataManager.Util/tests/UserDataFormatterTests.cs
index 91bef15..ccd29e1 100644
--- a/Google.Ads.DataManager.Util/tests/UserDataFormatterTests.cs
+++ b/Google.Ads.DataManager.Util/tests/UserDataFormatterTests.cs
@@ -32,6 +32,10 @@ public void TestFormatEmailAddress_ValidInputs()
                 _formatter.FormatEmailAddress("QuinnY@EXAMPLE.com"),
                 Is.EqualTo("quinny@example.com")
             );
+            Assert.That(
+                _formatter.FormatEmailAddress("user.name+NYC@Example.com"),
+                Is.EqualTo("user.name+nyc@example.com")
+            );
         }
 
         [Test]
@@ -61,6 +65,14 @@ public void TestFormatEmailAddress_GmailVariations()
                 _formatter.FormatEmailAddress("j.e.f..ferson.Loves.hiking@googlemail.com"),
                 Is.EqualTo("jeffersonloveshiking@googlemail.com")
             );
+            Assert.That(
+                _formatter.FormatEmailAddress("Cloudy.SanFrancisco+shopping@gmail.com"),
+                Is.EqualTo("cloudysanfrancisco@gmail.com")
+            );
+            Assert.That(
+                _formatter.FormatEmailAddress("Cloudy.SanFrancisco+shopping@googlemail.com"),
+                Is.EqualTo("cloudysanfrancisco@googlemail.com")
+            );
         }
 
         [Test]

From f1adc9118768cb926e785e1b8748f955f6eaf98e Mon Sep 17 00:00:00 2001
From: Lindsey Volta <lindseyvolta@google.com>
Date: Tue, 2 Jun 2026 15:21:30 +0000
Subject: [PATCH 2/2] Bump util version to 0.2.0

---
 .../src/Google.Ads.DataManager.Util.csproj                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Google.Ads.DataManager.Util/src/Google.Ads.DataManager.Util.csproj b/Google.Ads.DataManager.Util/src/Google.Ads.DataManager.Util.csproj
index 2ca0878..69b47d1 100644
--- a/Google.Ads.DataManager.Util/src/Google.Ads.DataManager.Util.csproj
+++ b/Google.Ads.DataManager.Util/src/Google.Ads.DataManager.Util.csproj
@@ -9,7 +9,7 @@
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <PackageId>Google.Ads.DataManager.Util</PackageId>
-    <Version>0.1.0</Version>
+    <Version>0.2.0</Version>
     <Authors>Google</Authors>
     <Description>A library to help with common tasks for the Google Ads Data Manager API.</Description>
     <PackageTags>Google Ads Data Manager API</PackageTags>