diff --git a/Directory.Build.props b/Directory.Build.props
index bfbb339eb..fbd923f20 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -52,6 +52,10 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
   <PropertyGroup>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
@@ -108,7 +112,6 @@
   <Import Project="$(BuildSysDir)\$(TargetFramework).props" Condition="'$(TargetFramework)' != ''" />
 
   <PropertyGroup>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1573;1591</NoWarn>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/src/dlr b/src/dlr
index 0ab814a8c..6510e1274 160000
--- a/src/dlr
+++ b/src/dlr
@@ -1 +1 @@
-Subproject commit 0ab814a8c06e56dd077f3fff11abd0d60a24bf7f
+Subproject commit 6510e1274f6f80a70d014d2d4508cf2deb9c4896