Skip to content

[master] Update dependencies from dotnet/core-setup #834

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
zsd4yr merged 26 commits into from
Apr 22, 2019
Merged

[master] Update dependencies from dotnet/core-setup #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f72ed1a
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 19, 2019
7af09d1
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 19, 2019
3eaadfe
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 19, 2019
cca9932
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
da36205
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
6bec0b3
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
57215dc
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
0d868bc
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
4fc43fc
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
a2e2a07
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
0315bfd
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
26aa252
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
ba4f0b4
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
4636ae5
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
952f634
Dependency coherency updates
Apr 20, 2019
054ec88
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 20, 2019
217ad1b
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 21, 2019
366c13d
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 21, 2019
dc2f56b
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 21, 2019
b0bff56
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 21, 2019
baa4494
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 21, 2019
1f45f08
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 21, 2019
8a84aa6
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 22, 2019
be1ff14
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 22, 2019
1bd3f5f
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 22, 2019
8ba5d32
Merge branch 'master' into darc-master-78105664-8ce0-4d17-ae9e-4d79d9…
zsd4yr Apr 22, 2019
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
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,56 +10,56 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Core Setup for coherency -->
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27619-03">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27622-01">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>de216246a046668d10279f7e113a2b9384660652</Sha>
<Sha>a6726f7f1f087577d28e12fab071d98cc6485e24</Sha>
</Dependency>
<!-- CoreFX via Core Setup -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19218.11" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19221.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>0a9a366e290aded3e9bf5d082d6beee5ff560177</Sha>
<Sha>b96247e76506e81ff6eb28dd2a14914a59e2a257</Sha>
</Dependency>
<!-- CoreCLR via Core Setup -->
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview5-27619-71" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview5-27621-72" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>b7167889bc94c084527f184f852b867b2a1c1d56</Sha>
<Sha>a36bc61442d89d0b5c58b0b14e7bd3bde218f24d</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview5-27619-71" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview5-27621-72" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>b7167889bc94c084527f184f852b867b2a1c1d56</Sha>
<Sha>a36bc61442d89d0b5c58b0b14e7bd3bde218f24d</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
<!-- Arcade -->
Expand Down
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 @@ -15,24 +15,24 @@
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<!-- Core Setup for coherency -->
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27619-03</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27622-01</MicrosoftNETCoreAppPackageVersion>
</PropertyGroup>
<!-- CoreFX via Core Setup -->
<PropertyGroup>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview5.19218.11</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19218.11</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>4.6.0-preview5.19218.11</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview5.19218.11</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19218.11</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>4.6.0-preview5.19218.11</SystemDrawingCommonPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.6.0-preview5.19218.11</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19218.11</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19218.11</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview5.19221.5</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19221.5</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>4.6.0-preview5.19221.5</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview5.19221.5</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19221.5</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>4.6.0-preview5.19221.5</SystemDrawingCommonPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.6.0-preview5.19221.5</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19221.5</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19221.5</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- CoreCLR via Core Setup -->
<PropertyGroup>
<MicrosoftNETCoreILPackageVersion>3.0.0-preview5-27616-73</MicrosoftNETCoreILPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview5-27619-71</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview5-27621-72</MicrosoftNETCoreILAsmPackageVersion>
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
Expand Down
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 @@ -12,6 +12,6 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19218.7",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19218.7",
"Microsoft.NET.Sdk.IL": "3.0.0-preview5-27619-71"
"Microsoft.NET.Sdk.IL": "3.0.0-preview5-27621-72"
}
}