Skip to content

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

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 8 commits into from
Apr 9, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aa331e6
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 8, 2019
2a1087d
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 8, 2019
16e0ca5
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 9, 2019
fb2533d
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 9, 2019
24979fc
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 9, 2019
0338f73
Update dependencies from https://github.com/dotnet/core-setup build 2…
Apr 9, 2019
5d7886f
rev sdk version to resolve system colors move to the sdk
Apr 9, 2019
3709e2e
Merge branch 'master' into darc-master-7cfd7e7f-f537-4ca5-b019-65be37…
zsd4yr Apr 9, 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 @@ -7,47 +7,47 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Permissions" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="4.6.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27601-04">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27609-01">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>4ea0233e38681384ee91d7a72c011db9c02e35ff</Sha>
<Sha>0d98c40e504e222ef27a971a3a10b1ee4031463a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview4.19181.2" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview5.19208.5" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>2c1cf10610d8102e080b203ff396707eeced15bd</Sha>
<Sha>6ca16758a5d454c1f1b04975bf55f259dd71fc49</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19209.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -65,14 +65,14 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9d7e665ecf2606094677524ecd5af0fc39c7bb49</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27525-72" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="3.0.0-preview4-27604-73" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>2520798548b0c414f513aaaf708399f8ef5a4f6c</Sha>
<Sha>991817d90827b206ab25e74e7a5bd326a7e86ad4</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27525-72" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="3.0.0-preview4-27604-73" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>2520798548b0c414f513aaaf708399f8ef5a4f6c</Sha>
<Sha>991817d90827b206ab25e74e7a5bd326a7e86ad4</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
</ToolsetDependencies>
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
</PropertyGroup>
<!-- Corefx-updated dependencies -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview4.19181.2</MicrosoftWin32RegistryPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview4.19181.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>4.6.0-preview4.19181.2</SystemDrawingCommonPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>4.6.0-preview4.19181.2</MicrosoftWin32SystemEventsPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.6.0-preview4.19181.2</SystemSecurityCryptographyCngPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview4.19181.2</SystemCodeDomPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview4.19181.2</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview4.19181.2</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview4.19181.2</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32RegistryPackageVersion>4.6.0-preview5.19208.5</MicrosoftWin32RegistryPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview5.19208.5</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>4.6.0-preview5.19208.5</SystemDrawingCommonPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>4.6.0-preview5.19208.5</MicrosoftWin32SystemEventsPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>4.6.0-preview5.19208.5</SystemSecurityCryptographyCngPackageVersion>
<SystemCodeDomPackageVersion>4.6.0-preview5.19208.5</SystemCodeDomPackageVersion>
<SystemSecurityPermissionsPackageVersion>4.6.0-preview5.19208.5</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>4.6.0-preview5.19208.5</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview5.19208.5</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<!-- CoreCLR-updated dependencies -->
<PropertyGroup>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview4-27525-72</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview4-27604-73</MicrosoftNETCoreILAsmPackageVersion>
</PropertyGroup>
<!-- Arcade-updated dependencies -->
<PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"tools": {
"dotnet": "3.0.100-preview4-010924",
"dotnet": "3.0.100-preview5-011162",
"vs": {
"version": "16.0"
},
"xcopy-msbuild": "16.0.0-rc1-alpha"
},
"sdk": {
"version": "3.0.100-preview4-010924"
"version": "3.0.100-preview5-011162"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19209.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19209.1",
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27525-72"
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27604-73"
}
}