From 0e5f9c25629ea81258b9f347db227788acba37f5 Mon Sep 17 00:00:00 2001
From: Suchiman <robinsue@live.de>
Date: Fri, 25 May 2018 20:38:45 +0200
Subject: [PATCH] Use RestoreAdditionalProjectSources instead of RestoreSources
 - The former is additive while the latter replaces the existing sources

---
 README.md                                                   | 6 ++----
 .../BlazorHosted-CSharp.Client.csproj                       | 6 ++----
 .../BlazorHosted-CSharp.Server.csproj                       | 6 ++----
 .../BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj        | 6 ++----
 .../BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj  | 6 ++----
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 04331eaa04..ab41e3ca41 100644
--- a/README.md
+++ b/README.md
@@ -84,12 +84,10 @@ To use a nightly or developer CI build of the Blazor package, ensure that you ha
 
 Update your projects to include the Blazor developer feed (`https://dotnet.myget.org/f/blazor-dev/api/v3/index.json`) and ASP.NET Core developer feed (`https://dotnet.myget.org/F/dotnet-core/api/v3/index.json`). You can do this in a project file with MSBuild:
 ```xml
-<RestoreSources>
-    $(RestoreSources);
-    https://api.nuget.org/v3/index.json;
+<RestoreAdditionalProjectSources>
     https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
     https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
-</RestoreSources>
+</RestoreAdditionalProjectSources>
 ```
 
 Or in a NuGet.config in the same directory as the solution file:
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj
index ff0f4e61aa..4ca9064a51 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj
@@ -3,11 +3,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RestoreSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
+    <RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
       https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
-    </RestoreSources>
+    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj
index 5fed11abc2..c2ba023f44 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj
@@ -2,11 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <RestoreSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
+    <RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
       https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
-    </RestoreSources>
+    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
index a27676ed8b..7625da03da 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
@@ -5,11 +5,9 @@
     <OutputType>Library</OutputType>
     <IsPackable>true</IsPackable>
     <BlazorLinkOnBuild>false</BlazorLinkOnBuild>
-    <RestoreSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
+    <RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
       https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
-    </RestoreSources>
+    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj
index 652d98a810..0048627b32 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj
@@ -4,11 +4,9 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RunCommand>dotnet</RunCommand>
     <RunArguments>blazor serve</RunArguments>
-    <RestoreSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
+    <RestoreAdditionalProjectSources Condition="'$(IncludeCustomRestoreSourcesSymbol)'=='true'">
       https://dotnet.myget.org/f/blazor-dev/api/v3/index.json;
-    </RestoreSources>
+    </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
   </PropertyGroup>