Skip to content

[main] Update dependencies from dotnet/runtime #16425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 24, 2021
Merged

[main] Update dependencies from dotnet/runtime #16425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23435be
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 19, 2021
9c27621
Remove ios from list of always supported platforms
marek-safar Mar 19, 2021
fbc754d
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Mar 20, 2021
b54b140
Exclude iOS/Android support checks for SDK build; restore iOS in the …
jeffhandley Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>
<ItemGroup>
<SupportedPlatform Remove="Android" />
<SupportedPlatform Remove="iOS" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' == 'true' AND '$(OutputType)' == 'Exe' AND '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<PackageReference Include="xunit.console" Version="$(XUnitVersion)" Private="true" />

<!-- These files are both included via a .props file in xunit.runner.visualstudio, as well as
<!-- These files are both included via a .props file in xunit.runner.visualstudio, as well as
via package dependencies of xunit.console. To prevent warnings about duplicate files
from Pack, don't copy the ones from the .props file to the output directory. -->
<None Update="@(None)">
Expand All @@ -18,7 +23,7 @@
<Pack Condition="$([System.IO.Path]::GetFileName('%(Identity)')) == 'testhost.exe'">false</Pack>
<Pack Condition="$([System.IO.Path]::GetFileName('%(Identity)')) == 'testhost.dll'">false</Pack>
</Content>

</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
Expand All @@ -35,7 +40,7 @@
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
and '$(MSBuildProjectName)' != 'toolset-tasks'">
<FrameworkReference
Update="Microsoft.NETCore.App"
Update="Microsoft.NETCore.App"
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
</ItemGroup>
Expand Down
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,37 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5067a9034f799eceb42846a62e5431a3ec8a267b</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21167.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NET.HostModel" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1">
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
Expand Down Expand Up @@ -122,21 +122,21 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>9eff8c6ce48cb15cafb8eef4aaf853675b05f9d9</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21167.1">
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.3.21167.1">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.3.21167.1">
<Dependency Name="System.Text.Encoding.CodePages" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21167.1">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.3.21167.3">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -236,9 +236,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21167.1">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21169.6">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
<Sha>76954b4ed7b5cd48ace16fefb1209fe56779b247</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21167.3</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.3.21167.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-preview.3.21169.6</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21167.1</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21169.6</SystemReflectionMetadataLoadContextVersion>
<DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21167.1</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.3.21169.6</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21169.6</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21169.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.3.21167.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>6.0.0-preview.3.21167.1</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-preview.3.21169.6</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.3.21169.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETHostModelVersion>6.0.0-preview.3.21169.6</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -79,10 +79,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>6.0.0-preview.3.21167.1</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.3.21167.1</SystemTextEncodingCodePagesPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.3.21169.6</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>6.0.0-preview.3.21169.6</SystemTextEncodingCodePagesPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.3.21167.1</SystemResourcesExtensionsPackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0-preview.3.21169.6</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
Expand Down
2 changes: 1 addition & 1 deletion src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.SupportedPlatforms.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.

Copyright (c) .NET Foundation. All rights reserved.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->

Expand Down