Skip to content

Commit 6df8641

Browse files
dotnet-maestro[bot]crummel
dotnet-maestro[bot]
authored and
crummel
committed
[release/3.0] Update dependencies from dotnet/core-sdk (#1238)
* Update dependencies from https://github.com/dotnet/core-sdk build 20190918.4 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19468.4 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19468.3 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) - NETStandard.Library - 2.1.0 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.0 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Compilers - 3.3.1-beta4-19462-11 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.Build - 16.3.0 (parent: Microsoft.Dotnet.Toolset.Internal) - NuGet.Build.Tasks - 5.3.0-rtm.6251 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.Extensions.Logging - 3.0.0 (parent: Microsoft.AspNetCore.Mvc.Razor.Extensions) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 3.0.0 (parent: Microsoft.AspNetCore.App.Ref) - Microsoft.AspNetCore.App.Ref - 3.0.0 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.100-rc2.19467.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.100-rc2.19467.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19465.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.TestPlatform.Build - 16.3.0 (parent: Microsoft.Dotnet.Toolset.Internal)
1 parent 2153d57 commit 6df8641

File tree

46 files changed

+2236
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2236
-202
lines changed

‎dir.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PortableBuild Condition="'$(OS)' == 'Windows_NT'">true</PortableBuild>
1111
<PortableBuild Condition="'$(PortableBuild)' == ''">false</PortableBuild>
1212
<UseSystemLibraries Condition="'$(UseSystemLibraries)' == '' AND '$(PortableBuild)' != 'true'">true</UseSystemLibraries>
13-
<UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
13+
<UseStableVersions Condition="'$(UseStableVersions)' == ''">true</UseStableVersions>
1414
</PropertyGroup>
1515

1616
<PropertyGroup>

‎eng/Version.Details.xml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,52 +27,52 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc1.19455.6" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.0-rc2.19462.5" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>aed84886b8d777168f53fae4da15c7af5f7572da</Sha>
32+
<Sha>922429db0144dd6f3b4324805464dae82857512a</Sha>
3333
</Dependency>
34-
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19455.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
34+
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3535
<Uri>https://github.com/dotnet/standard</Uri>
36-
<Sha>209c43e7f6232e7871b6927a510c25ee7dfd5c72</Sha>
36+
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc1.19456.4" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19462.14" CoherentParentDependency="Microsoft.NETCore.App">
3939
<Uri>https://github.com/dotnet/corefx</Uri>
40-
<Sha>3da667af759d88b683ca851694ced073e8dc9960</Sha>
40+
<Sha>4ac4c0367003fe3973a3648eb0715ddb0e3bbcea</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19456-20" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
42+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc2-19463-05" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4343
<Uri>https://github.com/dotnet/core-setup</Uri>
44-
<Sha>8f5d7b1ba4f744199ba006cac38dfcb9a2408880</Sha>
44+
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0-rc1.19457.3" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
46+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
4747
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
48-
<Sha>d8f651aa5281e9fa60a8fe0dcad98efeb7720a36</Sha>
48+
<Sha>16b0ca4a5838c39c8852e6cf144232597e2bee2e</Sha>
4949
<RepoName>aspnetcore-tooling</RepoName>
5050
</Dependency>
51-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
51+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-rc1.19473.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5252
<Uri>https://github.com/dotnet/templating</Uri>
53-
<Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha>
53+
<Sha>b2663fb07294f5d6cf3caa927d58f7cbebf7d626</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.3.1-beta3-19454-05" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
55+
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.3.1-beta4-19462-11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
5656
<Uri>https://github.com/dotnet/roslyn</Uri>
57-
<Sha>3b423bd305daf81076d4d7b105101361c2490531</Sha>
57+
<Sha>66a912c9463eebe832cf742d2fe8bb2e1a4600ec</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.Build" Version="16.3.0-preview-19455-02" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
60-
<Uri>https://github.com/Microsoft/msbuild</Uri>
61-
<Sha>4a2d771074b97bcc31125801b4a9ea57900d84d6</Sha>
59+
<Dependency Name="Microsoft.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
60+
<Uri>https://github.com/microsoft/msbuild</Uri>
61+
<Sha>0f4c62feac0a5726f63b56472de7b1c1527459fc</Sha>
6262
</Dependency>
63-
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6192" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
63+
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6251" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
6464
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
65-
<Sha>bb60d6720d24890b8f3e071e70d27ea0f2bef57e</Sha>
65+
<Sha>b75150f2f4127a77a166c9552845e86fb24a3282</Sha>
6666
<RepoName>nuget-client</RepoName>
6767
</Dependency>
68-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0-rc1.19456.10" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
68+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
6969
<Uri>https://github.com/aspnet/Extensions</Uri>
70-
<Sha>73c259904d5db01bbeede15df2a72d1b94cb3306</Sha>
70+
<Sha>0b951c16de0f39e13cce8372e11c28eb90576662</Sha>
7171
<RepoName>aspnet-extensions</RepoName>
7272
</Dependency>
73-
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19458.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
73+
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc2.19467.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7474
<Uri>https://github.com/dotnet/sdk</Uri>
75-
<Sha>b09faf073550a3bf31f3be23ad0b2b7b4d80f4d5</Sha>
75+
<Sha>b3a343bf8ed65f5208c5bb86c632856c5d107b1d</Sha>
7676
</Dependency>
7777
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
7878
<Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
@@ -89,34 +89,34 @@
8989
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
9090
<Sha>173ee3bd61c9549557eefa3cfb718bdef157cb87</Sha>
9191
</Dependency>
92-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc1.19457.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
92+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
9393
<Uri>https://github.com/aspnet/AspNetCore</Uri>
94-
<Sha>49e84ee5ff04b17f35cacb9c1d6ccf52d8328dad</Sha>
94+
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
9595
<RepoName>aspnetcore</RepoName>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-rc1.19458.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
97+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-rc2.19467.7" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
9898
<Uri>https://github.com/dotnet/cli</Uri>
99-
<Sha>70cf7521b833e92afe13864c775399a2e6922176</Sha>
99+
<Sha>e72d84f73adcbfa0054df27fbb21505295a55dcb</Sha>
100100
</Dependency>
101101
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.6.0-beta.19454.10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
102102
<Uri>https://github.com/dotnet/fsharp</Uri>
103103
<Sha>0422ff293bb2cc722fe5021b85ef50378a9af823</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc1.19458.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc2.19465.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
106106
<Uri>https://github.com/aspnet/websdk</Uri>
107-
<Sha>0141a0efbdad0ece12294cec1f6da1c03502e021</Sha>
107+
<Sha>002ea5ca7c699d925281abd8307556ec8eccb530</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0-preview-20190905-01" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
109+
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
110110
<Uri>https://github.com/microsoft/vstest</Uri>
111-
<Sha>2479b26734a98a9594590ee13e895aa58b5f0a6b</Sha>
111+
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19458.14" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
113+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc2.19468.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
114114
<Uri>https://github.com/dotnet/toolset</Uri>
115-
<Sha>8d4c190fe5f865f9f900ac3a94a9e5b5029cdc03</Sha>
115+
<Sha>33026f95de81116aefd79b4ec4c8071090a02480</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19458.23">
117+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19468.4">
118118
<Uri>https://github.com/dotnet/core-sdk</Uri>
119-
<Sha>c4d43f672d8c1bca944a2177d517223028629f54</Sha>
119+
<Sha>04339c3a262a2e313f9431edd3805ce71e08b92e</Sha>
120120
</Dependency>
121121
<!-- external dependencies, not handled by Maestro/Arcade -->
122122
<Dependency Name="Newtonsoft.Json" Version="12.0.2">

‎patches/arcade/0002-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch renamed to ‎patches/arcade/0003-Remove-adding-fake-dependencies-for-CoreFX-partial-p.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From b85de43a04b54a267ac4fa8dd70047b35e482676 Mon Sep 17 00:00:00 2001
1+
From 64a346d373e2cf6c99182fdd4a8e6a77e4866fd1 Mon Sep 17 00:00:00 2001
22
From: Chris Rummel <crummel@microsoft.com>
33
Date: Thu, 29 Aug 2019 11:20:06 -0500
4-
Subject: [PATCH 2/2] Remove adding fake dependencies for CoreFX partial
4+
Subject: [PATCH 3/4] Remove adding fake dependencies for CoreFX partial
55
packages.
66

77
---
@@ -27,5 +27,5 @@ index a3a0bd85..06d45eff 100644
2727

2828
<!-- Generate package references based on assembly dependencies -->
2929
--
30-
2.18.0
30+
2.21.0
3131

0 commit comments

Comments
 (0)