diff --git a/Directory.Build.props b/Directory.Build.props
index 6657629..486565d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -28,11 +28,20 @@
     <PackageOutputPath>$(ArtifactsPath)/packages</PackageOutputPath>
   </PropertyGroup>
 
+  <!-- ZIP / source-archive builds have no .git folder; disable SourceLink queries to avoid warnings. -->
+  <PropertyGroup Condition="!Exists('$(MSBuildThisFileDirectory).git')">
+    <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
+    <EnableSourceLink>false</EnableSourceLink>
+    <EmbedUntrackedSources>false</EmbedUntrackedSources>
+  </PropertyGroup>
+
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <!-- Normalize path separators so Windows ZIP checkouts match /samples/ detection. -->
+    <_NormalizedProjectDir>$([System.String]::Copy('$(MSBuildProjectDirectory)').Replace('\', '/'))</_NormalizedProjectDir>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or $(MSBuildProjectName.EndsWith('.Tests')) or $(MSBuildProjectName.Contains('.Benchmarks')) or $(MSBuildProjectDirectory.Contains('/samples/')) or $(MSBuildProjectDirectory.Contains('\\samples\\'))">
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true' or $(MSBuildProjectName.EndsWith('.Tests')) or $(MSBuildProjectName.EndsWith('.Sample')) or $(MSBuildProjectName.Contains('.Benchmarks')) or $(_NormalizedProjectDir.Contains('/samples/')) or $(_NormalizedProjectDir.Contains('/benchmarks/')) or $(_NormalizedProjectDir.Contains('/tests/'))">
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);CS1591;CA1707;CA1812;CA1515;CA1050;IDE0005</NoWarn>
   </PropertyGroup>
diff --git a/samples/FunctionFoundry.Data.Sample/Program.cs b/samples/FunctionFoundry.Data.Sample/Program.cs
index 2a2861b..891d688 100644
--- a/samples/FunctionFoundry.Data.Sample/Program.cs
+++ b/samples/FunctionFoundry.Data.Sample/Program.cs
@@ -1,4 +1,3 @@
-using System.Text;
 using FunctionFoundry.Data;
 
 string tempDir = Path.Combine(Path.GetTempPath(), "ff-data-sample-" + Guid.NewGuid().ToString("N"));