Skip to content
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

Jump to bottom

[master] Update dependencies from dotnet/runtime #45387

Merged
merged 27 commits into from
Dec 16, 2020
Merged

[master] Update dependencies from dotnet/runtime #45387

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b6da38c
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Nov 30, 2020
76b40a7
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 1, 2020
cbb03a0
Replace obsoleted json serializer option
akoeplinger Dec 2, 2020
a36acf5
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 2, 2020
8ffe45f
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 3, 2020
f51c831
Use PDFMT=PORTABLE option for ilproj
akoeplinger Dec 3, 2020
4c29c67
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 4, 2020
adb6dfe
Merge branch 'master' into darc-master-8672eaad-b7a4-4bb1-8166-9393d9…
akoeplinger Dec 4, 2020
33734cb
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 5, 2020
dd91689
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 6, 2020
e582ef8
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 7, 2020
78b4c00
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 8, 2020
86434bc
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 9, 2020
a4cd3b5
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 10, 2020
a8acf88
Merge branch 'master' into darc-master-8672eaad-b7a4-4bb1-8166-9393d9…
jkotas Dec 11, 2020
2906310
Add workaround for #45908
jkotas Dec 11, 2020
023a2dc
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 11, 2020
ce8e2c4
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 12, 2020
76388a3
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Dec 13, 2020
ad08650
Merge branch 'master' into darc-master-8672eaad-b7a4-4bb1-8166-9393d9…
akoeplinger Dec 14, 2020
15865c6
Update versions
akoeplinger Dec 15, 2020
353147f
Remove PDBFMT option
akoeplinger Dec 15, 2020
54eb3ee
Apply ilasm .locals workaround for more files
akoeplinger Dec 15, 2020
472d3fd
Revert "Apply ilasm .locals workaround for more files"
akoeplinger Dec 16, 2020
a148ac2
Revert "Add workaround for #45908"
akoeplinger Dec 16, 2020
22ba741
Update versions
akoeplinger Dec 16, 2020
75c21c3
Disable tests that fail on Mono due to https://github.com/dotnet/runt…
akoeplinger Dec 16, 2020
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
30 changes: 15 additions & 15 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,33 +170,33 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>38017c3935de95d0335bac04f4901ddfc2718656</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-alpha.1.20602.4">
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="6.0.0-alpha.1.20615.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>575dae9695141b1ade423b443a41084624940818</Sha>
<Sha>ea982829538c1055155b6c767f3821329e1e9600</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-alpha.1.20602.4">
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="6.0.0-alpha.1.20615.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>575dae9695141b1ade423b443a41084624940818</Sha>
<Sha>ea982829538c1055155b6c767f3821329e1e9600</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-alpha.1.20602.4">
<Dependency Name="runtime.native.System.IO.Ports" Version="6.0.0-alpha.1.20615.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>575dae9695141b1ade423b443a41084624940818</Sha>
<Sha>ea982829538c1055155b6c767f3821329e1e9600</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-preview.8.20359.4">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-alpha.1.20615.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bdfbf0cf85878673a80d7822cc11bde5c9fda30c</Sha>
<Sha>ea982829538c1055155b6c767f3821329e1e9600</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-alpha.1.20602.4">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-alpha.1.20615.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>575dae9695141b1ade423b443a41084624940818</Sha>
<Sha>ea982829538c1055155b6c767f3821329e1e9600</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="6.0.0-alpha.1.20602.4">
<Dependency Name="System.Text.Json" Version="6.0.0-alpha.1.20615.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>575dae9695141b1ade423b443a41084624940818</Sha>
<Sha>ea982829538c1055155b6c767f3821329e1e9600</Sha>
</Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-alpha.1.20602.4">
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-alpha.1.20615.7">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>575dae9695141b1ade423b443a41084624940818</Sha>
<Sha>ea982829538c1055155b6c767f3821329e1e9600</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.0-alpha.1.20611.4">
<Uri>https://github.com/mono/linker</Uri>
Expand All @@ -211,4 +211,4 @@
<Sha>ea857eecd5aab698138fff0eadbbcd552bcaa973</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
</Dependencies>
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20610.4</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20610.4</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20602.4</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-alpha.1.20602.4</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-alpha.1.20602.4</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftNETCoreAppVersion>6.0.0-alpha.1.20612.4</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-alpha.1.20615.7</MicrosoftNETCoreDotNetHostVersion>
<MicrosoftNETCoreDotNetHostPolicyVersion>6.0.0-alpha.1.20615.7</MicrosoftNETCoreDotNetHostPolicyVersion>
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
<!-- CoreClr dependencies -->
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.8.20359.4</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-alpha.1.20615.7</MicrosoftNETCoreILAsmVersion>
<!-- Libraries dependencies -->
<StyleCopAnalyzersVersion>1.2.0-beta.304</StyleCopAnalyzersVersion>
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
Expand All @@ -98,14 +98,14 @@
<SystemSecurityCryptographyCngVersion>4.7.0</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>4.7.0</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyOpenSslVersion>4.7.0</SystemSecurityCryptographyOpenSslVersion>
<SystemTextJsonVersion>6.0.0-alpha.1.20602.4</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-alpha.1.20602.4</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemTextJsonVersion>6.0.0-alpha.1.20615.7</SystemTextJsonVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-alpha.1.20615.7</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemThreadingVersion>4.3.0</SystemThreadingVersion>
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-alpha.1.20602.4</runtimenativeSystemIOPortsVersion>
<runtimenativeSystemIOPortsVersion>6.0.0-alpha.1.20615.7</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20607.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>5.0.0-beta.20607.2</SystemDrawingCommonTestDataVersion>
Expand Down Expand Up @@ -187,4 +187,4 @@
</PropertyGroup>
<!-- Override isolated build dependency versions with versions from Repo API. -->
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
</Project>
</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20610.4",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20610.4",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20610.4",
"Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20602.4",
"Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20615.7",
"Microsoft.Build.NoTargets": "2.0.1",
"Microsoft.Build.Traversal": "2.1.1"
}
Expand Down