diff --git a/MicrosoftConfigurationBuilders.msbuild b/MicrosoftConfigurationBuilders.msbuild
index 2e04097..ec43f96 100644
--- a/MicrosoftConfigurationBuilders.msbuild
+++ b/MicrosoftConfigurationBuilders.msbuild
@@ -1,6 +1,4 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="tools\MicrosoftConfigurationBuilders.settings.targets"/>  
-
   <ItemGroup>
     <AssemblyProject Include="src\Base\Base.csproj" />
     <AssemblyProject Include="src\Environment\Environment.csproj" />
diff --git a/MicrosoftConfigurationBuilders.sln b/MicrosoftConfigurationBuilders.sln
index 7f1f465..2bc702f 100644
--- a/MicrosoftConfigurationBuilders.sln
+++ b/MicrosoftConfigurationBuilders.sln
@@ -33,6 +33,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "test\Microsoft.Conf
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{91E7BC05-1980-48F2-B3F4-CE56EB3D114F}"
 	ProjectSection(SolutionItems) = preProject
+		tools\MicrosoftConfigurationBuilders.settings.targets = tools\MicrosoftConfigurationBuilders.settings.targets
 		README.md = README.md
 	EndProjectSection
 EndProject
diff --git a/clean.cmd b/clean.cmd
index 7377063..f5ff54c 100644
--- a/clean.cmd
+++ b/clean.cmd
@@ -38,5 +38,8 @@ if not defined MSBUILDEXE (
 :BUILD
 	REM %MSBUILDEXE% "%~dp0\MicrosoftConfigurationBuilders.msbuild" /t:Clean %logOptions% /v:d /maxcpucount /nodeReuse:false %*
 	%MSBUILDEXE% "%~dp0\MicrosoftConfigurationBuilders.msbuild" /t:Clean %logOptions% /v:diag /maxcpucount /nodeReuse:false %*
+	del /F msbuild.log
+	del /F msbuild.wrn
+	del /F msbuild.err
 
 endlocal
diff --git a/samples/SampleWebApp/SampleWebApp.csproj b/samples/SampleWebApp/SampleWebApp.csproj
index c117a8a..290c7fe 100644
--- a/samples/SampleWebApp/SampleWebApp.csproj
+++ b/samples/SampleWebApp/SampleWebApp.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
-  <Import Project="..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
+  <Import Project="..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,8 +44,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Web.DynamicData" />
@@ -134,8 +134,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.1.0\build\Microsoft.Net.Compilers.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.7\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Net.Compilers.2.8.0\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/samples/SampleWebApp/Web.config b/samples/SampleWebApp/Web.config
index 22c81fe..3d49faa 100644
--- a/samples/SampleWebApp/Web.config
+++ b/samples/SampleWebApp/Web.config
@@ -1,63 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   https://go.microsoft.com/fwlink/?LinkId=169433
   -->
 <configuration>
   <configSections>
-    <section name="configBuilders" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false"/>
+    <section name="configBuilders" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false" />
   </configSections>
 
   <configBuilders>
     <builders>
-      <add name="Environment" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=1.0.0.0, Culture=neutral"/>
+      <add name="Environment" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=1.0.0.0, Culture=neutral" />
       <!-- <add name="Environment" mode="Expand" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=1.0.0.0, Culture=neutral"/> -->
-      <add name="Secrets" userSecretsFile="~/App_Data/secrets.xml" mode="Greedy" type="Microsoft.Configuration.ConfigurationBuilders.UserSecretsConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.UserSecrets, Version=1.0.0.0, Culture=neutral"/>
-      <add name="SimpleJson" jsonFile="~/App_Data/settings.json" ignoreMissingFile="true" type="Microsoft.Configuration.ConfigurationBuilders.SimpleJsonConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Json, Version=1.0.0.0, Culture=neutral"/>
+      <add name="Secrets" userSecretsFile="~/App_Data/secrets.xml" mode="Greedy" type="Microsoft.Configuration.ConfigurationBuilders.UserSecretsConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.UserSecrets, Version=1.0.0.0, Culture=neutral" />
+      <add name="SimpleJson" jsonFile="~/App_Data/settings.json" ignoreMissingFile="true" type="Microsoft.Configuration.ConfigurationBuilders.SimpleJsonConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Json, Version=1.0.0.0, Culture=neutral" />
     </builders>
   </configBuilders>
 
   <appSettings configBuilders="Environment,SimpleJson,Secrets">
-    <add key="WINDIR" value="Will be replaced by 'Environment' in Strict and Greedy modes."/>
-    <add key="SYSTEMDRIVE" value="Will initally be replaced by 'Environment' in Strict and Greedy modes... but then superceded by 'Secrets' in the same modes."/>
-    <add key="Value_Replaced_By_Environment_In_Expand_Mode" value="${WINDIR}"/>
-    <add key="ARCHITECTURE" value="Will be replaced by 'Environment' in Strict/Greedy modes IFF prefix='PROCESSOR_' AND stripPrefix='true'"/>
-    <add key="PROCESSOR_ARCHITECTURE" value="Will be left untouched by 'Environment' in Strict/Greedy modes  if IFF prefix='PROCESSOR_' AND stripPrefix='true'"/>
-    <add key="jsonSetting1" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes."/>
-    <add key="Value_Replaced_By_SimpleJson_In_Expand_Mode" value="${jsonSetting1}"/>
-    <add key="appSettings:jsonSubSetting2" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes."/>
-    <add key="jsonSubSetting2" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
-    <add key="jsonSub:subSetting3" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
-    <add key="jsonConnectionString1" value="WILL be replaced by 'SimpleJson' in 'Flat' jsonMode."/>
-    <add key="jsonConnectionString2" value="WILL NOT be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
-    <add key="jsonCustomSetting1" value="Will be replaced by 'SimpleJson' with prefix='customSettings:' and stripPrefix='true'."/>
+    <add key="WINDIR" value="Will be replaced by 'Environment' in Strict and Greedy modes." />
+    <add key="SYSTEMDRIVE" value="Will initally be replaced by 'Environment' in Strict and Greedy modes... but then superceded by 'Secrets' in the same modes." />
+    <add key="Value_Replaced_By_Environment_In_Expand_Mode" value="${WINDIR}" />
+    <add key="ARCHITECTURE" value="Will be replaced by 'Environment' in Strict/Greedy modes IFF prefix='PROCESSOR_' AND stripPrefix='true'" />
+    <add key="PROCESSOR_ARCHITECTURE" value="Will be left untouched by 'Environment' in Strict/Greedy modes  if IFF prefix='PROCESSOR_' AND stripPrefix='true'" />
+    <add key="jsonSetting1" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes." />
+    <add key="Value_Replaced_By_SimpleJson_In_Expand_Mode" value="${jsonSetting1}" />
+    <add key="appSettings:jsonSubSetting2" value="Will be replaced by 'SimpleJson' in Strict and Greedy modes." />
+    <add key="jsonSubSetting2" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
+    <add key="jsonSub:subSetting3" value="Will be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
+    <add key="jsonConnectionString1" value="WILL be replaced by 'SimpleJson' in 'Flat' jsonMode." />
+    <add key="jsonConnectionString2" value="WILL NOT be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
+    <add key="jsonCustomSetting1" value="Will be replaced by 'SimpleJson' with prefix='customSettings:' and stripPrefix='true'." />
   </appSettings>
 
   <connectionStrings configBuilders="SimpleJson">
-    <add name="jsonConnectionString1" connectionString="Will be replaced by 'SimpleJson' in 'Flat' AND 'Sectional' jsonModes, but with different values."/>
-    <add name="connectionStrings:jsonConnectionString1" connectionString="Will only be replaced by 'SimpleJson' in 'Flat' jsonMode."/>
-    <add name="jsonConnectionString2" connectionString="Will only be replaced by 'SimpleJson' in 'Sectional' jsonMode."/>
-    <add name="customSettings:jsonConnectionString2" connectionString="Will be replaced by 'SimpleJson' in 'Flat' jsonMode."/>
+    <add name="jsonConnectionString1" connectionString="Will be replaced by 'SimpleJson' in 'Flat' AND 'Sectional' jsonModes, but with different values." />
+    <add name="connectionStrings:jsonConnectionString1" connectionString="Will only be replaced by 'SimpleJson' in 'Flat' jsonMode." />
+    <add name="jsonConnectionString2" connectionString="Will only be replaced by 'SimpleJson' in 'Sectional' jsonMode." />
+    <add name="customSettings:jsonConnectionString2" connectionString="Will be replaced by 'SimpleJson' in 'Flat' jsonMode." />
   </connectionStrings>
 
   <system.web>
-    <compilation debug="true" targetFramework="4.7.1"/>
-    <httpRuntime targetFramework="4.7.1"/>
+    <compilation debug="true" targetFramework="4.7.1" />
+    <httpRuntime targetFramework="4.7.1" />
   </system.web>
 
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
-    </compilers>
-  </system.codedom>
-
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
-				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>
+	<system.codedom>
+		<compilers>
+			<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+			<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.8.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
+		</compilers>
+	</system.codedom>
 </configuration>
diff --git a/samples/SampleWebApp/packages.config b/samples/SampleWebApp/packages.config
index 7597903..dbdad58 100644
--- a/samples/SampleWebApp/packages.config
+++ b/samples/SampleWebApp/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.7" targetFramework="net471" />
-  <package id="Microsoft.Net.Compilers" version="2.1.0" targetFramework="net471" developmentDependency="true" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.8" targetFramework="net471" />
+  <package id="Microsoft.Net.Compilers" version="2.8.0" targetFramework="net471" developmentDependency="true" />
 </packages>
\ No newline at end of file
diff --git a/src/Azure/Azure.csproj b/src/Azure/Azure.csproj
index 9913306..14a7c1f 100644
--- a/src/Azure/Azure.csproj
+++ b/src/Azure/Azure.csproj
@@ -42,8 +42,8 @@
     <Reference Include="Microsoft.Azure.KeyVault.WebKey, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.7\lib\net452\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Services.AppAuthentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.0\lib\net452\Microsoft.Azure.Services.AppAuthentication.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Services.AppAuthentication, Version=1.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\lib\net452\Microsoft.Azure.Services.AppAuthentication.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.19.2.6005, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.19.2\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -75,6 +75,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -83,5 +84,15 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets" Condition="Exists('..\..\packages\Microsoft.Azure.Services.AppAuthentication.1.0.1\build\Microsoft.Azure.Services.AppAuthentication.targets')" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Azure/app.config b/src/Azure/app.config
new file mode 100644
index 0000000..2de3c5c
--- /dev/null
+++ b/src/Azure/app.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.19.2.6005" newVersion="3.19.2.6005" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/src/Azure/packages.config b/src/Azure/packages.config
index 87eef07..be01044 100644
--- a/src/Azure/packages.config
+++ b/src/Azure/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Microsoft.Azure.KeyVault" version="2.3.2" targetFramework="net471" />
   <package id="Microsoft.Azure.KeyVault.WebKey" version="2.0.7" targetFramework="net471" />
-  <package id="Microsoft.Azure.Services.AppAuthentication" version="1.0" targetFramework="net471" />
+  <package id="Microsoft.Azure.Services.AppAuthentication" version="1.0.1" targetFramework="net471" />
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.19.2" targetFramework="net471" />
   <package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net471" />
   <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.10" targetFramework="net471" />
diff --git a/src/Base/Base.csproj b/src/Base/Base.csproj
index f0bc6c4..f1af37b 100644
--- a/src/Base/Base.csproj
+++ b/src/Base/Base.csproj
@@ -47,4 +47,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Environment/Environment.csproj b/src/Environment/Environment.csproj
index d6f57e0..d2f161c 100644
--- a/src/Environment/Environment.csproj
+++ b/src/Environment/Environment.csproj
@@ -51,4 +51,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Json/Json.csproj b/src/Json/Json.csproj
index 0f464ae..36877bd 100644
--- a/src/Json/Json.csproj
+++ b/src/Json/Json.csproj
@@ -57,4 +57,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/UserSecrets/UserSecrets.csproj b/src/UserSecrets/UserSecrets.csproj
index 5f05fea..f2c3c48 100644
--- a/src/UserSecrets/UserSecrets.csproj
+++ b/src/UserSecrets/UserSecrets.csproj
@@ -51,4 +51,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\cleanup.targets" />
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <FilesToSign Include="$(TargetPath)" Condition="'$(SignAssembly)' == 'true'">
+        <Authenticode>Microsoft</Authenticode>
+        <StrongName>MsSharedLib72</StrongName>
+      </FilesToSign>
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj
index a8a813a..df90762 100644
--- a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj
+++ b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec
index 9dfe320..cc0e884 100644
--- a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec
+++ b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec
@@ -18,8 +18,8 @@
 
     <dependencies>
       <dependency id="Microsoft.Configuration.ConfigurationBuilders.Base" version="[$NuGetPackageVersion$]" />
-      <dependency id="Microsoft.Azure.KeyVault" version="2.3" />
-      <dependency id="Microsoft.Azure.Services.AppAuthentication" version="1.0" />
+      <dependency id="Microsoft.Azure.KeyVault" version="2.3.2" />
+      <dependency id="Microsoft.Azure.Services.AppAuthentication" version="1.0.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/packages/ConfigurationBuilders.Azure.nupkg/content/Net471/config.uninstall.xdt b/src/packages/ConfigurationBuilders.Azure.nupkg/content/Net471/config.uninstall.xdt
index e819a78..6f46c21 100644
--- a/src/packages/ConfigurationBuilders.Azure.nupkg/content/Net471/config.uninstall.xdt
+++ b/src/packages/ConfigurationBuilders.Azure.nupkg/content/Net471/config.uninstall.xdt
@@ -7,12 +7,12 @@
     </builders>
   </configBuilders>
 
-  <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
-
   <configSections>
     <section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
   </configSections>
 
   <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
 
+  <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
+
 </configuration>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj b/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj
index 2aa9510..2b7b90a 100644
--- a/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj
+++ b/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Base.nupkg/content/Net471/config.uninstall.xdt b/src/packages/ConfigurationBuilders.Base.nupkg/content/Net471/config.uninstall.xdt
index 930a600..dab1571 100644
--- a/src/packages/ConfigurationBuilders.Base.nupkg/content/Net471/config.uninstall.xdt
+++ b/src/packages/ConfigurationBuilders.Base.nupkg/content/Net471/config.uninstall.xdt
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
 
-  <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
-
   <configSections>
     <section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
   </configSections>
 
   <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
 
+  <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
+
 </configuration>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj b/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj
index 13ec77c..88c7b63 100644
--- a/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj
+++ b/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.install.xdt b/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.install.xdt
index 52a07f9..839136e 100644
--- a/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.install.xdt
+++ b/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.install.xdt
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
 
+  <configSections xdt:Transform="InsertBefore(/configuration/*[1])" />
+  <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
+    <section name="configBuilders" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false"/>
+  </configSections>
+  <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
   <configBuilders xdt:Transform="InsertAfter(/configuration/configSections)" />
   <configBuilders xdt:Locator="XPath(/configuration/configBuilders[last()])">
     <builders xdt:Transform="InsertIfMissing">
diff --git a/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.uninstall.xdt b/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.uninstall.xdt
index b7efb86..bb9224a 100644
--- a/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.uninstall.xdt
+++ b/src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.uninstall.xdt
@@ -7,6 +7,12 @@
     </builders>
   </configBuilders>
 
+  <configSections>
+    <section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
+  </configSections>
+
+  <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
   <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
 
 </configuration>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj b/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj
index 7e994d1..17fa9e1 100644
--- a/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj
+++ b/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj
@@ -36,4 +36,14 @@
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.Json.nupkg/content/Net471/config.uninstall.xdt b/src/packages/ConfigurationBuilders.Json.nupkg/content/Net471/config.uninstall.xdt
index cee4015..16a32e0 100644
--- a/src/packages/ConfigurationBuilders.Json.nupkg/content/Net471/config.uninstall.xdt
+++ b/src/packages/ConfigurationBuilders.Json.nupkg/content/Net471/config.uninstall.xdt
@@ -7,12 +7,12 @@
     </builders>
   </configBuilders>
 
-  <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
-
   <configSections>
     <section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
   </configSections>
 
   <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
 
+  <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
+
 </configuration>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj
index 9b5bea7..272d14a 100644
--- a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj
+++ b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj
@@ -43,9 +43,35 @@
         <NuGetContent Include="build\Net471\$(NuGetPackageId).targets">
           <Destination>build\Net471\$(NuGetPackageId).targets</Destination>
         </NuGetContent>
-        <NuGetContent Include="tools\Net471\*.ps1">
+        <NuGetContent Include="tools\Net471\*.ps1" Condition="'$(SignAssembly)' != 'true'">
+          <Destination>tools\Net471\</Destination>
+        </NuGetContent>
+        <NuGetContent Include="tools\Net471\signed\*.ps1" Condition="'$(SignAssembly)' == 'true'">
           <Destination>tools\Net471\</Destination>
         </NuGetContent>
     </ItemGroup>
     <Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
+    <Target Name="SignPowerShellScript" Condition=" '$(SignAssembly)' == 'true' " AfterTargets="BeforeBuild">
+      <ItemGroup>
+        <OriginalScriptFiles Include="$(MSBuildThisFileDirectory)\tools\Net471\*.ps1" />
+      </ItemGroup>
+      <Copy SourceFiles="@(OriginalScriptFiles)" DestinationFolder="$(MSBuildThisFileDirectory)\tools\Net471\signed" SkipUnchangedFiles="true" />
+      <ItemGroup>
+        <ScriptFilesToSign Include="$(MSBuildThisFileDirectory)\tools\Net471\signed\*.ps1">
+          <Authenticode>Microsoft400</Authenticode>
+        </ScriptFilesToSign>
+      </ItemGroup>
+      <SignFiles Files="@(ScriptFilesToSign)" Type="$(SignType)" BinariesDirectory="$(MSBuildThisFileDirectory)\tools\Net471\signed"
+          IntermediatesDirectory="$(MSBuildThisFileDirectory)\tools\Net471" ESRPSigning="$(ESRPSigning)" UseBearerToken="$(UseBearerToken)" />
+  </Target>
+  <Target Name="AfterBuild">
+      <PropertyGroup>
+        <OutDir>$(PackageOutputDir)</OutDir>
+      </PropertyGroup>
+      <ItemGroup>
+        <FilesToSign Include="$(NuGetPackTargetFile)" Condition="'$(SignAssembly)' == 'true'">
+          <Authenticode>NuGet</Authenticode>
+        </FilesToSign>
+      </ItemGroup>
+    </Target>
 </Project>
\ No newline at end of file
diff --git a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.install.xdt b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.install.xdt
index 5b6865a..4bd2b40 100644
--- a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.install.xdt
+++ b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.install.xdt
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
 
-  <configBuilders xdt:Transform="InsertAfter(/configuration/configSections)" />
+  <configSections xdt:Transform="InsertBefore(/configuration/*[1])" />
+  <configSections xdt:Locator="XPath(/configuration/configSections[last()])">
+    <section name="configBuilders" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false"/>
+  </configSections>
+  <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
 
   <!-- Always configure for ${UserSecretsId}, since the VS dev scenario is the target use case for this feature -->
+  <configBuilders xdt:Transform="InsertAfter(/configuration/configSections)" />
   <configBuilders xdt:Locator="XPath(/configuration/configBuilders[last()])">
     <builders xdt:Transform="InsertIfMissing">
       <add name="Secrets" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" userSecretsId="${UserSecretsId}" type="Microsoft.Configuration.ConfigurationBuilders.UserSecretsConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.UserSecrets, Version=$version$, Culture=neutral" />
diff --git a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.uninstall.xdt b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.uninstall.xdt
index 89b0ee6..75038f9 100644
--- a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.uninstall.xdt
+++ b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.uninstall.xdt
@@ -7,6 +7,12 @@
     </builders>
   </configBuilders>
 
+  <configSections>
+    <section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />
+  </configSections>
+
+  <configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
+
   <configBuilders xdt:Transform="Remove" xdt:Locator="Condition(count(/configuration/configBuilders/builders/*)=0)" />
 
 </configuration>
\ No newline at end of file
diff --git a/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/Test.csproj b/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/Test.csproj
index fa0a652..baaff8b 100644
--- a/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/Test.csproj
+++ b/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/Test.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -40,10 +40,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\..\..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -59,9 +59,6 @@
     <Compile Include="EnvironmentTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Base\Base.csproj">
       <Project>{f382fbf8-146d-4968-a199-90d37f9ef9a7}</Project>
@@ -80,14 +77,17 @@
       <Name>UserSecrets</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/packages.config b/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/packages.config
index a4b6ae9..4dce40a 100644
--- a/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/packages.config
+++ b/test/Microsoft.Configuration.ConfigurationBuilders.Test/Test/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MSTest.TestAdapter" version="1.1.18" targetFramework="net47" />
-  <package id="MSTest.TestFramework" version="1.1.18" targetFramework="net47" />
+  <package id="MSTest.TestAdapter" version="1.3.0" targetFramework="net471" />
+  <package id="MSTest.TestFramework" version="1.3.0" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/tools/MicrosoftConfigurationBuilders.settings.targets b/tools/MicrosoftConfigurationBuilders.settings.targets
index d0c3b93..54088dd 100644
--- a/tools/MicrosoftConfigurationBuilders.settings.targets
+++ b/tools/MicrosoftConfigurationBuilders.settings.targets
@@ -1,13 +1,19 @@
 <Project DefaultTargets="UnitTest" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CustomBeforeProjectTargets>$(MSBuildThisFileDirectory)MicrosoftConfigurationBuilders.Extensions.settings.targets</CustomBeforeProjectTargets>
+    <RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'MicrosoftConfigurationBuilders.sln'))\</RepositoryRoot>
   </PropertyGroup>
+
+  <Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props"
+      Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.props')" />
+  <Import Project="$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets"
+      Condition="Exists('$(RepositoryRoot)\packages\microbuild.core.0.3.0\build\MicroBuild.Core.targets')" />
   <Import Project="$(CustomBeforeProjectTargets)" Condition="Exists('$(CustomBeforeProjectTargets)')" Label="Pre-targets Build Extensibility Point"/>
 
   <!-- Configurable properties-->
 
   <PropertyGroup>
-    <BuildQuality Condition="'$(BuildQuality)' == ''">preview3</BuildQuality>
+    <BuildQuality Condition="'$(BuildQuality)' == ''">rtm</BuildQuality>
     <VersionStartYear>2016</VersionStartYear>
     <VersionMajor>1</VersionMajor>
     <VersionMinor>0</VersionMinor>
@@ -16,7 +22,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet package dependencies">
-    <MicrosoftConfigurationBuildersNuGetPackageVersion>1.0.0-preview3</MicrosoftConfigurationBuildersNuGetPackageVersion>
+    <MicrosoftConfigurationBuildersNuGetPackageVersion>$(VersionMajor).$(VersionMinor).$(VersionRelease)</MicrosoftConfigurationBuildersNuGetPackageVersion>
   </PropertyGroup>
 
   <!-- Default properties -->
diff --git a/tools/NuGetProj.targets b/tools/NuGetProj.targets
index 70e9d99..d8ddc72 100644
--- a/tools/NuGetProj.targets
+++ b/tools/NuGetProj.targets
@@ -304,10 +304,12 @@ GetNuGetProjectOutputs: Reads build-generated files from outputs file.
   <Target Name="GetNuGetProjectOutputs">
     <PropertyGroup>
       <NuGetPackTargetFile>$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).nupkg</NuGetPackTargetFile>
-      <NuGetPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetPackTargetFile>
+      <NuGetSymbolPackTargetFile Condition="'$(NuGetPackSymbols)' == 'true'">$(PackageOutputDir)\$(NuGetPackageId).$(NuGetPackageVersion).symbols.nupkg</NuGetSymbolPackTargetFile>
     </PropertyGroup>
     <ItemGroup>
       <NuGetProjectOutput Include="$(NuGetPackTargetFile)" />
+      <NuGetProjectOutput Include="$(NuGetSymbolPackTargetFile)" Condition="'$(NuGetSymbolPackTargetFile)' != ''" />
+
       <NuGetProjectOutput Include="$(NuGetProjectOutputsFile)" />
     </ItemGroup>
   </Target>