From 1c5b49baeeab57c300aabe2d0febf88f77a086a1 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Mon, 4 Dec 2017 14:32:56 -0800
Subject: [PATCH] Nuget.config update to align with CLI:master - add comments
 in DependencyVersions.prop

---
 build/DependencyVersions.props |  9 +++++----
 build/NugetConfigFile.targets  | 34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index eb42994d5..adb5987c7 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -47,10 +47,13 @@
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
     <CliDepsSatellitesRoslynPackageVersion>2.3.0-pre-20170727-1</CliDepsSatellitesRoslynPackageVersion>
     <CliDepsSatellitesFSharpPackageVersion>4.4.1-pre-20170727-1</CliDepsSatellitesFSharpPackageVersion>
+  </PropertyGroup>
+
+  <!-- NOTE: The property group above is in alignment with orchestrated build version naming conventions. -->
+  <Import Condition=" Exists('$(OrchestratedPackageVersionsProps)') " Project="$(OrchestratedPackageVersionsProps)" />
 
 
-    
-    
+  <PropertyGroup>
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
 
     <SharedFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkVersion>
@@ -78,6 +81,4 @@
     <BuildTasksFeedToolVersion>2.1.0-prerelease-02221-02</BuildTasksFeedToolVersion>
   </PropertyGroup>
 
-  <Import Condition=" Exists('$(OrchestratedPackageVersionsProps)') " Project="$(OrchestratedPackageVersionsProps)" />
-  
 </Project>
diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets
index 8aba7ac72..06d67c109 100644
--- a/build/NugetConfigFile.targets
+++ b/build/NugetConfigFile.targets
@@ -10,33 +10,33 @@
         <![CDATA[
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
+<packageSources>
+<!--To inherit the global NuGet package sources remove the <clear/> line below -->
+<clear />
         ]]>
       </NugetConfigHeader>
 
       <NugetConfigCLIFeeds>
         <![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" />
+<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="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" />
+<add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
         ]]>
       </NugetConfigCLIFeeds>
 
       <NugetConfigSuffix>
         <![CDATA[
-  </packageSources>
+</packageSources>
 </configuration>
         ]]>
       </NugetConfigSuffix>