diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets
index ef8c1617b..4a06d327d 100644
--- a/build/NugetConfigFile.targets
+++ b/build/NugetConfigFile.targets
@@ -1,38 +1,44 @@
 <Project ToolsVersion="15.0">
   <Target Name="WriteNugetConfigFile">
 
+      <ItemGroup>
+        <NugetConfigPrivateFeeds Include="$(ExternalRestoreSources.Split(';'))" />
+      </ItemGroup>
+    
     <PropertyGroup>
       <NugetConfigHeader>
-        &lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
-        &lt;configuration&gt;
-        &lt;packageSources&gt;
-        &lt;!--To inherit the global NuGet package sources remove the &lt;clear/&gt; line below --&gt;
-        &lt;clear /&gt;
+        <![CDATA[
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+        ]]>
       </NugetConfigHeader>
 
-      <NugetConfigFeedsPrivate>
-        &lt;add key=&quot;PrivateBlobFeed&quot; value=&quot;$(ExternalRestoreSources)&quot; /&gt;
-      </NugetConfigFeedsPrivate>
-      
       <NugetConfigFeedsNormal>
-        &lt;add key=&quot;BlobFeed&quot; value=&quot;https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json&quot; /&gt;
-        &lt;add key=&quot;templating&quot; value=&quot;https://dotnet.myget.org/F/templating/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;aspnet&quot; value=&quot;https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;websdkfeed&quot; value=&quot;https://dotnet.myget.org/F/dotnet-web/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;cli-deps&quot; value=&quot;https://dotnet.myget.org/F/cli-deps/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;roslyn&quot; value=&quot;https://dotnet.myget.org/f/roslyn/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;symreader-native&quot; value=&quot;https://dotnet.myget.org/f/symreader-native/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;xunit&quot; value=&quot;https://www.myget.org/F/xunit/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;api.nuget.org&quot; value=&quot;https://api.nuget.org/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;vstest&quot; value=&quot;https://dotnet.myget.org/F/vstest/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;web-api&quot; value=&quot;https://dotnet.myget.org/F/dotnet-web/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;symreader-native&quot; value=&quot;https://dotnet.myget.org/F/symreader-native/api/v3/index.json&quot; /&gt;
-        &lt;add key=&quot;AspNetMaster&quot; value=&quot;https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" /&gt;
+        <![CDATA[
+    <add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+    <add key="templating" value="https://dotnet.myget.org/F/templating/api/v3/index.json" />
+    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="aspnet" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
+    <add key="websdkfeed" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
+    <add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
+    <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
+    <add key="symreader-native" value="https://dotnet.myget.org/f/symreader-native/api/v3/index.json" />
+    <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="vstest" value="https://dotnet.myget.org/F/vstest/api/v3/index.json" />
+    <add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
+    <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
+        ]]>
       </NugetConfigFeedsNormal>
 
       <NugetConfigSuffix>
-        &lt;/packageSources&gt;
-        &lt;/configuration&gt;
+        <![CDATA[
+  </packageSources>
+</configuration>
+        ]]>
       </NugetConfigSuffix>
     </PropertyGroup>
 
@@ -42,7 +48,7 @@
     
     <WriteLinesToFile Condition="'$(ExternalRestoreSources)' != ''"
                       File="$(GeneratedNuGetConfig)"
-                      Lines="$(NugetConfigFeedsPrivate)"
+                      Lines="&lt;add key=&quot;PrivateBlobFeed&quot; value=&quot;%(NugetConfigPrivateFeeds.Identity)&quot; /&gt;"
                       Overwrite="false" />
 
     <WriteLinesToFile Condition="'$(DotNetBuildOffline)' != 'true'"