diff options
| author | William Godbe <wigodbe@microsoft.com> | 2019-11-11 09:31:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 09:31:07 -0800 |
| commit | 027103debe8be5e679419105db13c3390d7cc0b7 (patch) | |
| tree | 2d393943becdd8068e65ee879b0f23e079d60c4d | |
| parent | 59ed470b5eaf6025d16bb91a26ce082e33bc9744 (diff) | |
| parent | 64ab2b8e73fbf183f48d99ac7460a911a774d42a (diff) | |
| download | coreclr-027103debe8be5e679419105db13c3390d7cc0b7.tar.gz coreclr-027103debe8be5e679419105db13c3390d7cc0b7.tar.bz2 coreclr-027103debe8be5e679419105db13c3390d7cc0b7.zip | |
Merge pull request #27742 from dotnet/darc-release/3.1-d5e14434-9c47-489d-80e5-c9ee4d41b969
[release/3.1] Update dependencies from dotnet/core-setup and dotnet/corefx
| -rw-r--r-- | eng/Version.Details.xml | 16 | ||||
| -rw-r--r-- | eng/Versions.props | 7 | ||||
| -rw-r--r-- | tests/src/Common/CoreFX/CoreFX.depproj | 4 |
3 files changed, 18 insertions, 9 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cdbe9316d..ad4df5d682 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,17 +18,21 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha> </Dependency> - <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-preview1.19461.12"> + <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-preview3.19551.4"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>57c36a6816a5ac6d0a7956ae1e153c6a770332be</Sha> + <Sha>046765913dff824f9ed0f2d2fe0fb9b111906cf5</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview1.19461.12"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview3.19551.4"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>57c36a6816a5ac6d0a7956ae1e153c6a770332be</Sha> + <Sha>046765913dff824f9ed0f2d2fe0fb9b111906cf5</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19459.38"> + <Dependency Name="System.IO.FileSystem.AccessControl" Version="4.7.0-preview3.19551.4"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>046765913dff824f9ed0f2d2fe0fb9b111906cf5</Sha> + </Dependency> + <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview3.19553.2"> <Uri>https://github.com/dotnet/core-setup</Uri> - <Sha>0d6763312a2754e45d604ebdc69c8ac7e21a2187</Sha> + <Sha>13f35c3d86a40ff811bfde0b64cfb86431c19d15</Sha> </Dependency> <Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190912.1"> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index aee7e0c370..d6bda0dbdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,11 +21,12 @@ <!-- roslyn --> <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion> <!-- corefx --> - <MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-preview1.19461.12</MicrosoftPrivateCoreFxNETCoreAppVersion> - <MicrosoftNETCorePlatformsVersion>3.1.0-preview1.19461.12</MicrosoftNETCorePlatformsVersion> + <MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-preview3.19551.4</MicrosoftPrivateCoreFxNETCoreAppVersion> + <MicrosoftNETCorePlatformsVersion>3.1.0-preview3.19551.4</MicrosoftNETCorePlatformsVersion> <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion> + <SystemIOFileSystemAccessControlVersion>4.7.0-preview3.19551.4</SystemIOFileSystemAccessControlVersion> <!-- core-setup --> - <MicrosoftNETCoreAppVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreAppVersion> + <MicrosoftNETCoreAppVersion>3.1.0-preview3.19553.2</MicrosoftNETCoreAppVersion> <!-- dotnet-core-internal-tooling --> <IbcMergePackageVersion>5.0.6-beta.19203.1</IbcMergePackageVersion> <!-- dotnet-optimization --> diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj index 75bccfa929..fc61e1dd5b 100644 --- a/tests/src/Common/CoreFX/CoreFX.depproj +++ b/tests/src/Common/CoreFX/CoreFX.depproj @@ -6,6 +6,7 @@ <Language>C#</Language> <NugetTargetMoniker>.NETCoreApp,Version=v3.1</NugetTargetMoniker> <TargetFramework>netcoreapp3.1</TargetFramework> + <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion> <ContainsPackageReferences>true</ContainsPackageReferences> <CLRTestKind>SharedLibrary</CLRTestKind> <IsTestProject>false</IsTestProject> @@ -31,6 +32,9 @@ <ItemGroup> + <!-- Workaround to exclude runtime assets from this package while we fix a bug in CoreFx --> + <PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" ExcludeAssets="Runtime" /> + <!-- Microsoft.Private.CoreFx.OOB is a meta-package that contains references to most of what we need --> <PackageReference Include="Microsoft.Private.CoreFx.OOB" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" /> |