From e03969fd4b0265219040defd4bc64e12903f4e42 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 15 May 2019 13:20:17 -0700
Subject: [master] Update dependencies from dotnet/core-setup (#24149)

* Update dependencies from https://github.com/dotnet/core-setup build 20190429.07

- Microsoft.NETCore.App - 3.0.0-preview6-27629-07

* Workaround for https://github.com/dotnet/core-setup/pull/5893

* Update dependencies from https://github.com/dotnet/core-setup build 20190502.01

- Microsoft.NETCore.App - 3.0.0-preview6-27702-01

* Update dependencies from https://github.com/dotnet/core-setup build 20190503.02

- Microsoft.NETCore.App - 3.0.0-preview6-27703-02

* Update dependencies from https://github.com/dotnet/core-setup build 20190503.17

- Microsoft.NETCore.App - 3.0.0-preview6-27703-17

* Update dependencies from https://github.com/dotnet/core-setup build 20190505.02

- Microsoft.NETCore.App - 3.0.0-preview6-27705-02

* Update dependencies from https://github.com/dotnet/core-setup build 20190506.03

- Microsoft.NETCore.App - 3.0.0-preview6-27706-03

* Update dependencies from https://github.com/dotnet/core-setup build 20190506.21

- Microsoft.NETCore.App - 3.0.0-preview6-27706-21

* Update dependencies from https://github.com/dotnet/core-setup build 20190507.10

- Microsoft.NETCore.App - 3.0.0-preview6-27707-10

* Workaround for Microsoft.NetCore.App version in Coreclr.TestWrapper.csproj to unblock #24149

* Update dependencies from https://github.com/dotnet/core-setup build 20190508.04

- Microsoft.NETCore.App - 3.0.0-preview6-27708-04

* Add comment attaching specific pull request to workaround

* Update dependencies from https://github.com/dotnet/core-setup build 20190509.05

- Microsoft.NETCore.App - 3.0.0-preview6-27709-05

* Add comments in versions.props to prevent merge conflicts in future blocked maestro PRs

* Update dependencies from https://github.com/dotnet/core-setup build 20190514.15

- Microsoft.NETCore.App - 3.0.0-preview6-27714-15
---
 tests/runtest.proj                                              | 5 +++++
 tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj | 2 ++
 2 files changed, 7 insertions(+)

(limited to 'tests')

diff --git a/tests/runtest.proj b/tests/runtest.proj
index 3f1faa8fd8..0e948d9b73 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -114,6 +114,11 @@ $(_XunitEpilog)
   <ItemGroup>
     <ProjectReference Include="$(SourceDir)Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <!-- Workaround for https://github.com/dotnet/core-setup/pull/5893 -->
+    <PackageReference Include="Microsoft.NETCore.App.Internal" Version="$(MicrosoftNETCoreAppVersion)" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
diff --git a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
index 3af5fe93e9..a42c14ced2 100644
--- a/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj
@@ -11,6 +11,8 @@
 
   <ItemGroup>
     <Compile Include="CoreclrTestWrapperLib.cs" />
+    <!-- Workaround for https://github.com/dotnet/core-setup/pull/5893 -->
+    <PackageReference Include="Microsoft.NETCore.App.Internal" Version="$(MicrosoftNETCoreAppVersion)" />
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-- 
cgit v1.2.3