From adfe6f09e49b9b70a72d4ad230b9030c4827eb9d Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Mon, 24 Jun 2019 10:51:23 -0700
Subject: [PATCH] Move to 3.0 Preview 6 SDK and 2.1.11 runtime
 (dotnet/aspnetcore-tooling#695)

- add feeds that SDK no longer provides automatically when building test apps
- add another allowed build warning in some integration tests\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/cfd46983817f091c259928d1c0549e26ef034834
---
 .../test/IntegrationTests/Assert.cs                       | 1 +
 src/Razor/test/testassets/Directory.Build.props           | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index 23ab8172e8..72e8d79e49 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -23,6 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         private static readonly string[] AllowedBuildWarnings = new[]
         {
             "MSB3491" , // The process cannot access the file. As long as the build succeeds, we're ok.
+            "NETSDK1071", // "A PackageReference to 'Microsoft.NETCore.App' specified a Version ..."
         };
 
         public static void BuildPassed(MSBuildResult result, bool allowWarnings = false)
diff --git a/src/Razor/test/testassets/Directory.Build.props b/src/Razor/test/testassets/Directory.Build.props
index 4250269a09..8cc9caef29 100644
--- a/src/Razor/test/testassets/Directory.Build.props
+++ b/src/Razor/test/testassets/Directory.Build.props
@@ -11,6 +11,14 @@
 
     <RazorSdkCurrentVersionProps>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>
     <RazorSdkCurrentVersionTargets>$(SolutionRoot)src\Microsoft.NET.Sdk.Razor\build\netstandard2.0\Sdk.Razor.CurrentVersion.targets</RazorSdkCurrentVersionTargets>
+  
+    <!-- Necessary while testing with unreleased packages. -->
+    <RestoreSources>
+      $(RestoreSources);
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
+      https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
+      https://api.nuget.org/v3/index.json;
+    </RestoreSources>
   </PropertyGroup>
 
   <PropertyGroup>