Skip to content

Commit 9678fef

Browse files
[release/3.1] Update dependencies from dotnet/core-sdk (#1533)
* Update dependencies from https://github.com/dotnet/core-sdk build 20200318.6 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.20168.6 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.1.103-servicing.20167.4 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.AspNetCore.App.Ref - 3.1.3 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Cli.Runtime - 3.1.103-servicing.20167.2 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.1.103-servicing.20164.2 (parent: Microsoft.Dotnet.Toolset.Internal) * remove unapplicable patches Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Aditya Aggarwal <aditya.aggarwal@microsoft.com>
1 parent 2d5b506 commit 9678fef

File tree

4 files changed

+15
-63
lines changed

4 files changed

+15
-63
lines changed

NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<add key="darc-pub-dotnet-templating-4609143" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-46091435/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-extensions-7d9baaf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-extensions-7d9baaf6/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-aspnetcore-tooling-5ecfad7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-tooling-5ecfad7e/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-aspnetcore-e81033e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-e81033e0/nuget/v3/index.json" />
10+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
511
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
612
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
713
<add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />

eng/Version.Details.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,34 +110,34 @@
110110
</Dependency>
111111
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
112112
<Uri>https://github.com/dotnet/aspnetcore</Uri>
113-
<Sha>64a7f37e8afb060f3dbf8a679e1f7112a4558562</Sha>
113+
<Sha>e81033e094d4663ffd227bb4aed30b76b0631e6d</Sha>
114114
<RepoName>aspnetcore</RepoName>
115115
</Dependency>
116-
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.103-servicing.20152.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
116+
<Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.103-servicing.20167.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
117117
<Uri>https://github.com/dotnet/cli</Uri>
118-
<Sha>8f624d0138a176b89b415c37d7d3285a940d1780</Sha>
118+
<Sha>f6250b79a00848f18e6e7b076b561d0a794983d3</Sha>
119119
<RepoName>cli</RepoName>
120120
</Dependency>
121121
<Dependency Name="Microsoft.FSharp.Compiler" Version="10.7.0-beta.19610.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
122122
<Uri>https://github.com/dotnet/fsharp</Uri>
123123
<Sha>dc86ab5d2c46e9a7c49290e7e2270ab1eeb0c61e</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.103-servicing.20152.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
125+
<Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.103-servicing.20164.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
126126
<Uri>https://github.com/aspnet/websdk</Uri>
127-
<Sha>699b7bad4d82e7f36a8def94c1718cb9f352eae1</Sha>
127+
<Sha>0152dfa567f877ee1c5da6e00033218002848956</Sha>
128128
</Dependency>
129129
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
130130
<Uri>https://github.com/microsoft/vstest</Uri>
131131
<Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.103-servicing.20152.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
133+
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.103-servicing.20167.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
134134
<Uri>https://github.com/dotnet/toolset</Uri>
135-
<Sha>0e71a8b3f024bbebf7bc7506ac3fbb8c60c55c1e</Sha>
135+
<Sha>4d0fe6c07e644a576aad6e0c3842f61460e48158</Sha>
136136
<RepoName>toolset</RepoName>
137137
</Dependency>
138-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20152.8">
138+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="1.0.0-preview.20168.6">
139139
<Uri>https://github.com/dotnet/core-sdk</Uri>
140-
<Sha>abf73fdb91629e10df642815218ba5522fd13b54</Sha>
140+
<Sha>6f74c4a1dd4fd0cc49eec7a28984476ed14d09d9</Sha>
141141
<RepoName>core-sdk</RepoName>
142142
</Dependency>
143143
<!-- external dependencies, not handled by Maestro/Arcade -->

patches/core-sdk/0009-remove-unneeded-feed-corefx.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

patches/toolset/0004-remove-dependency-flow-feeds.patch

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)