diff options
| author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2019-05-15 13:20:17 -0700 |
|---|---|---|
| committer | William Godbe <wigodbe@microsoft.com> | 2019-05-15 13:20:17 -0700 |
| commit | e03969fd4b0265219040defd4bc64e12903f4e42 (patch) | |
| tree | 2c65be0248f71dea93a9a80eb4bdb2b53e291000 | |
| parent | 761ab409310df31e1177a2456b9b7de29bcbd8af (diff) | |
| download | coreclr-e03969fd4b0265219040defd4bc64e12903f4e42.tar.gz coreclr-e03969fd4b0265219040defd4bc64e12903f4e42.tar.bz2 coreclr-e03969fd4b0265219040defd4bc64e12903f4e42.zip | |
[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
| -rw-r--r-- | eng/Version.Details.xml | 4 | ||||
| -rw-r--r-- | eng/Versions.props | 5 | ||||
| -rw-r--r-- | tests/runtest.proj | 5 | ||||
| -rw-r--r-- | tests/src/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78aea10a44..f07f54602b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,9 +27,9 @@ <Uri>https://github.com/dotnet/corefx</Uri> <Sha>a28176b5ec68b6da1472934fe9493790d1665cae</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27620-01"> + <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview6-27714-15"> <Uri>https://github.com/dotnet/core-setup</Uri> - <Sha>b9a720984fa4d6454d1c66ae765bc1e34cb1d206</Sha> + <Sha>73226d6f119c757813f47b0dc021e8700d525f71</Sha> </Dependency> <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190510.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b202f8c8b2..cc4a603027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,11 +8,14 @@ <UsingToolXliff>false</UsingToolXliff> <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19179.4</MicrosoftDotNetXUnitConsoleRunnerVersion> + <!-- corefx --> <MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNetFrameworkReferenceAssembliesVersion> <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview6.19264.9</MicrosoftPrivateCoreFxNETCoreAppVersion> <MicrosoftNETCorePlatformsVersion>3.0.0-preview6.19264.9</MicrosoftNETCorePlatformsVersion> <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview6.19264.9</MicrosoftBclAsyncInterfacesVersion> - <MicrosoftNETCoreAppVersion>3.0.0-preview5-27620-01</MicrosoftNETCoreAppVersion> + <!-- core-setup --> + <MicrosoftNETCoreAppVersion>3.0.0-preview6-27714-15</MicrosoftNETCoreAppVersion> + <!-- dotnet-optimization --> <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19229.8</MicrosoftDotNetBuildTasksFeedVersion> <optimizationIBCCoreCLRVersion>99.99.99-master-20190510.1</optimizationIBCCoreCLRVersion> <optimizationPGOCoreCLRVersion>99.99.99-master-20190510.1</optimizationPGOCoreCLRVersion> 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" /> |