Skip to content

Commit 3aaca4d

Browse files
dotnet-maestro[bot]crummel
dotnet-maestro[bot]
authored and
crummel
committed
[release/3.0] Update dependencies from dotnet/core-sdk (#1260)
* Update dependencies from https://github.com/dotnet/core-sdk build 20191023.3 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19523.3 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19521.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) - Microsoft.Build - 16.3.2 (parent: Microsoft.Dotnet.Toolset.Internal) - NuGet.Build.Tasks - 5.3.1-rtm.6268 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19517.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19516.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Remove patches for fixed issue * Match our core-setup package name with core-sdk's to hopefully fix coherency, and update versions. * Baseline Changes
1 parent 969361b commit 3aaca4d

File tree

37 files changed

+1207
-306
lines changed

37 files changed

+1207
-306
lines changed

‎NuGet.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<add key="darc-pub-microsoft-msbuild-0f4c62f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-0f4c62fe-1/nuget/v3/index.json" />
6+
<add key="darc-pub-microsoft-msbuild-e481bbf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-e481bbf8/nuget/v3/index.json" />
77
<add key="darc-pub-dotnet-standard-a5b5f2e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-standard-a5b5f2e1/nuget/v3/index.json" />
8-
<add key="darc-pub-aspnet-Extensions-0b951c1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-0b951c16/nuget/v3/index.json" />
9-
<add key="darc-pub-aspnet-AspNetCore-Tooling-16b0ca4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-16b0ca4a/nuget/v3/index.json" />
10-
<add key="darc-pub-aspnet-AspNetCore-aee5e40" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-aee5e408/nuget/v3/index.json" />
8+
<add key="darc-pub-aspnet-Extensions-7dbc3eb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-7dbc3ebd/nuget/v3/index.json" />
9+
<add key="darc-pub-aspnet-AspNetCore-Tooling-7471a3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-7471a3da/nuget/v3/index.json" />
10+
<add key="darc-pub-aspnet-AspNetCore-22dedcb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-22dedcb2/nuget/v3/index.json" />
1111
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1212
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
1313
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />

‎dir.props

Lines changed: 6 additions & 4 deletions
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>
@@ -193,12 +193,14 @@
193193
<!-- same thing here for CLI -->
194194
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64Version" Version="$(coresetupOutputPackageVersion)" />
195195
<!-- same thing here for toolset -->
196-
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64PackageVersion" Version="$(coresetupOutputPackageVersion)" />
196+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64PackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
197197
<!-- same thing here for core-sdk -->
198-
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreAppVersion)" />
199-
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreAppVersion)" />
198+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
199+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
200200
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
201201
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinuxX64PackageVersion)" />
202+
<!-- core-sdk uses this property for ASP.NET blob directory -->
203+
<ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
202204
<!-- OSX needs the OSX version instead of Linux. We don't have a lot of flexibility in how we output these properties so we're relying on the previous one being blank if the Linux version of the package is missing. -->
203205
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeOsxX64PackageVersion)" DoNotOverwrite="true" />
204206
</ItemGroup>

‎eng/Version.Details.xml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@
2727
<Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.1-servicing.19475.2" CoherentParentDependency="Microsoft.Private.CoreFx.NETCoreApp">
30+
<Dependency Name="Microsoft.NETCore.Runtime.CoreCLR" Version="3.0.1-servicing.19515.2" CoherentParentDependency="Microsoft.NETCore.App.Internal">
3131
<Uri>https://github.com/dotnet/coreclr</Uri>
32-
<Sha>68ff240063fc2ddb9b03275ae5d5063a09d38ace</Sha>
32+
<Sha>ecfe3bca7cfbd413415af9d2bcccb5f9a361f962</Sha>
3333
</Dependency>
3434
<Dependency Name="NETStandard.Library" Version="2.1.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3535
<Uri>https://github.com/dotnet/standard</Uri>
3636
<Sha>a5b5f2e1e369972c8ff1e2183979fab6099f52ef</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-servicing.19501.4" CoherentParentDependency="Microsoft.NETCore.App">
38+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-servicing.19516.9" CoherentParentDependency="Microsoft.NETCore.App.Internal">
3939
<Uri>https://github.com/dotnet/corefx</Uri>
40-
<Sha>54d63c3e283e0c3937a35ab4e99f391c84ff119e</Sha>
40+
<Sha>c1778515a3bee34cc09c757b5563d0af0c8b1e99</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.1-servicing-19502-09" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
42+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="3.0.1-servicing-19516-12" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
4343
<Uri>https://github.com/dotnet/core-setup</Uri>
44-
<Sha>0bdbe6b3a7caf32a4f594196effe56a941980d7b</Sha>
44+
<Sha>32085cbc728e1016c9d6a7bc105845f0f9eb6b47</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
46+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
4747
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
48-
<Sha>16b0ca4a5838c39c8852e6cf144232597e2bee2e</Sha>
48+
<Sha>7471a3daf7ba17c22da59cf5815ff1a2b9926bcf</Sha>
4949
<RepoName>aspnetcore-tooling</RepoName>
5050
</Dependency>
5151
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.1-servicing.19476.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
@@ -56,23 +56,23 @@
5656
<Uri>https://github.com/dotnet/roslyn</Uri>
5757
<Sha>66a912c9463eebe832cf742d2fe8bb2e1a4600ec</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
59+
<Dependency Name="Microsoft.Build" Version="16.3.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
6060
<Uri>https://github.com/microsoft/msbuild</Uri>
61-
<Sha>0f4c62feac0a5726f63b56472de7b1c1527459fc</Sha>
61+
<Sha>e481bbf88fd4a406cc8a98c2f46e9bda8e76be69</Sha>
6262
</Dependency>
63-
<Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6251" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
63+
<Dependency Name="NuGet.Build.Tasks" Version="5.3.1-rtm.6268" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
6464
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
65-
<Sha>b75150f2f4127a77a166c9552845e86fb24a3282</Sha>
65+
<Sha>f2c670b0b7cdc018dc708666b2d58699d9654e42</Sha>
6666
<RepoName>nuget-client</RepoName>
6767
</Dependency>
68-
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.0" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
68+
<Dependency Name="Microsoft.Extensions.Logging" Version="3.0.1" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
6969
<Uri>https://github.com/aspnet/Extensions</Uri>
70-
<Sha>0b951c16de0f39e13cce8372e11c28eb90576662</Sha>
70+
<Sha>7dbc3ebd20c79ecf311c768be865c02ff4676836</Sha>
7171
<RepoName>aspnet-extensions</RepoName>
7272
</Dependency>
73-
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.101-servicing.19477.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
73+
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.101-servicing.19529.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
7474
<Uri>https://github.com/dotnet/sdk</Uri>
75-
<Sha>3819a21a612cd8bc15b6f6c4e361d18490469577</Sha>
75+
<Sha>5c9dd04241f307f1aa6b3643d5e07ea89a1dad4a</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" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
92+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
9393
<Uri>https://github.com/aspnet/AspNetCore</Uri>
94-
<Sha>aee5e4080331553ea9dfb7fb388b6d72f715bf6a</Sha>
94+
<Sha>22dedcb2f0de59022e0383e1f05c9caffc708522</Sha>
9595
<RepoName>aspnetcore</RepoName>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.101-servicing.19503.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
97+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.101-servicing.19554.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
9898
<Uri>https://github.com/dotnet/cli</Uri>
99-
<Sha>2bb5a58198c6d96aae157ea3a119867b57cd839d</Sha>
99+
<Sha>3df3c6d5406e217c5dc7ea1cdd4abffbc9eea3ea</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-rc2.19507.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
105+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc2.19554.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
106106
<Uri>https://github.com/aspnet/websdk</Uri>
107-
<Sha>9b65fe8b178d2ad73482080c6a0aabae911e1224</Sha>
107+
<Sha>389b280e262b5f74e8d08cd5c784d4ba18e2fe4d</Sha>
108108
</Dependency>
109109
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
110110
<Uri>https://github.com/microsoft/vstest</Uri>
111111
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.101-servicing.19508.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
113+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.101-servicing.19554.11" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
114114
<Uri>https://github.com/dotnet/toolset</Uri>
115-
<Sha>6a8609fc2c10ee908977238e5c6bc48b926491da</Sha>
115+
<Sha>4742a2d9c56b249808bab066a12a50554377a90b</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19508.2">
117+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.19557.1">
118118
<Uri>https://github.com/dotnet/core-sdk</Uri>
119-
<Sha>f08e8bc516c2d598c8b0fba247bf8eac5e329a91</Sha>
119+
<Sha>ec736cbd54dc2b75a36acda4a7c00e4b99c7d094</Sha>
120120
</Dependency>
121121
<!-- external dependencies, not handled by Maestro/Arcade -->
122122
<Dependency Name="Newtonsoft.Json" Version="12.0.2">

0 commit comments

Comments
 (0)