diff --git a/Libraries/Directory.Build.targets b/Libraries/Directory.Build.targets
new file mode 100644
index 00000000..7d5f7f8e
--- /dev/null
+++ b/Libraries/Directory.Build.targets
@@ -0,0 +1,10 @@
+<Project>
+	<!--https://github.com/dotnet/Nerdbank.GitVersioning/issues/409#issuecomment-823362561-->
+	<Target Name="AddNuGetPackageVersionToThisAssembly"
+			DependsOnTargets="GetBuildVersion"
+			BeforeTargets="GenerateAssemblyNBGVVersionInfo">
+		<ItemGroup>
+			<AdditionalThisAssemblyFields Include="NuGetPackageVersion" String="$(NuGetPackageVersion)" />
+		</ItemGroup>
+	</Target>
+</Project>
\ No newline at end of file
diff --git a/Libraries/Microsoft.Teams.Apps/App.cs b/Libraries/Microsoft.Teams.Apps/App.cs
index 08de5488..b79c664b 100644
--- a/Libraries/Microsoft.Teams.Apps/App.cs
+++ b/Libraries/Microsoft.Teams.Apps/App.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System.Reflection;
-
 using Microsoft.Teams.Api;
 using Microsoft.Teams.Api.Activities;
 using Microsoft.Teams.Api.Auth;
@@ -46,8 +44,7 @@ internal string UserAgent
     {
         get
         {
-            var version = ThisAssembly.AssemblyFileVersion;
-            version ??= "0.0.0";
+            var version = ThisAssembly.NuGetPackageVersion ?? "0.0.0";
             return $"teams.net[apps]/{version}";
         }
     }