Skip to content

Commit 4b77ea9

Browse files
MichaelSimonsMichaelSimons
committed
Merge branch 'internal/release/5.0.202-apr2021' of https://dev.azure.com/dnceng/internal/_git/dotnet-source-build into internal/release/5.0.202-apr2021
2 parents e9af177 + 5096be9 commit 4b77ea9

File tree

5 files changed

+38
-34
lines changed

5 files changed

+38
-34
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<add key="darc-int-dotnet-aspnetcore-b7a2ec8c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b7a2ec8c/nuget/v3/index.json" />
67
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
78
<add key="darc-pub-dotnet-roslyn-analyzers-ce71b27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ if [ "${internalPackageFeedPat:-}" ]; then
108108
# TODO: Read these from nuget.config
109109
# The internal transport isn't added by Darc, though, so it will still need special-casing.
110110
export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
111+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b7a2ec8c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
111112
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112113
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113114
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},

‎repos/Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@
581581

582582
<ItemGroup>
583583
<!-- This file is a resource tracked by Git, not generated by restore. Ignore false positive. -->
584-
<IgnoredProjectAssetsJsonFiles Include="$(ClonedSubmoduleDirectory)NuGet.Client*/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json" Condition="'$(OfflineBuild)' != 'true'" />
585-
<IgnoredProjectAssetsJsonFiles Include="$(SubmoduleDirectory)NuGet.Client*/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json" Condition="'$(OfflineBuild)' == 'true'" />
584+
<IgnoredProjectAssetsJsonFiles Include="$(ClonedSubmoduleDirectory)nuget.client*/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json" Condition="'$(OfflineBuild)' != 'true'" />
585+
<IgnoredProjectAssetsJsonFiles Include="$(SubmoduleDirectory)nuget.client*/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/compiler/resources/project.assets.json" Condition="'$(OfflineBuild)' == 'true'" />
586586
</ItemGroup>
587587

588588
<WritePackageUsageData

‎smoke-testNuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<add key="darc-int-dotnet-aspnetcore-b7a2ec8c" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b7a2ec8c/nuget/v3/index.json" />
67
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
78
<add key="darc-pub-dotnet-roslyn-analyzers-ce71b27" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-roslyn-analyzers -->

‎tools-local/prebuilt-baseline-online.xml

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@
44
<Dir>artifacts/src/ApplicationInsights-dotnet.53b80940842204f78708a538628288ff5d741a1d/</Dir>
55
<Dir>artifacts/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/</Dir>
66
<Dir>artifacts/src/xdt.c01a538851a8ab1a1fbeb2e6243f391fff7587b4/</Dir>
7-
<Dir>artifacts/src/dotnet-aspnetcore.e882394a7bb38930da748291fe2c2ceaa6a80588/</Dir>
8-
<Dir>artifacts/src/cliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/</Dir>
9-
<Dir>artifacts/src/command-line-api.afd010ba8cb3cbd714c734465d1a5de1ee133e2d/</Dir>
7+
<Dir>artifacts/src/dotnet-aspnetcore.b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb/</Dir>
8+
<Dir>artifacts/src/CliCommandLineParser.0e89c2116ad28e404ba56c14d1c3f938caa25a01/</Dir>
9+
<Dir>artifacts/src/command-line-api.6ddde11ed45e3f4b9d80c97670f347dbfda15c3f/</Dir>
1010
<Dir>artifacts/src/common.6e37cdfe96ac8b06a923242120169fafacd720e6/</Dir>
1111
<Dir>artifacts/src/cssparser.d6d86bcd8c162b1ae22ef00955ff748d028dd0ee/</Dir>
1212
<Dir>artifacts/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/</Dir>
13-
<Dir>artifacts/src/fsharp.da6be68280c89131cdba2045525b80890401defd/</Dir>
13+
<Dir>artifacts/src/fsharp.7ce7132f1459095e635194d09d6f73265352029a/</Dir>
1414
<Dir>artifacts/src/Humanizer.b30550eed103a6970d8465fe7c5c16300b70be81/</Dir>
15-
<Dir>artifacts/src/dotnet-installer.ca6b6acadbd30de2160ab6a003fba072b2c7b568/</Dir>
15+
<Dir>artifacts/src/dotnet-installer.db7cc87d512335808e3806067f2bf9b31379e1db/</Dir>
1616
<Dir>artifacts/src/known-good-tests./</Dir>
1717
<Dir>artifacts/src/known-good./</Dir>
18-
<Dir>artifacts/src/linker.e0b9157b540f5fc020b2e7967f4bbd23ba826e4e/</Dir>
19-
<Dir>artifacts/src/msbuild.39993bd9d02917993b6147a9973dc3aa6e9b00c7/</Dir>
18+
<Dir>artifacts/src/linker.c43f981eec336c1dc4fd0ead84b5e09db9377d9e/</Dir>
19+
<Dir>artifacts/src/msbuild.5e4b48a27efce55a613664b58d353ab4c8d1f6c1/</Dir>
2020
<Dir>src/netcorecli-fsc/</Dir>
2121
<Dir>artifacts/src/Newtonsoft.Json.cac0690ad133c5e166ce5642dc71175791404fad/</Dir>
2222
<Dir>artifacts/src/Newtonsoft.Json.e43dae94c26f0c30e9095327a3a9eac87193923d/</Dir>
23-
<Dir>artifacts/src/NuGet.Client.830c8be45dbbccd411ecf6080abff0c2c98079cf/</Dir>
23+
<Dir>artifacts/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/</Dir>
2424
<Dir>src/package-source-build/</Dir>
25-
<Dir>artifacts/src/roslyn-analyzers.77b259353aa44ec1510951a75c6e7ed6e662a001/</Dir>
26-
<Dir>artifacts/src/roslyn.9ed4b774d20940880de8df1ca8b07508aa01c8cd/</Dir>
27-
<Dir>artifacts/src/dotnet-runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/</Dir>
28-
<Dir>artifacts/src/dotnet-runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/</Dir>
29-
<Dir>artifacts/src/dotnet-sdk.2932b586ae1ebf28415df80e0bf96d8015f2c192/</Dir>
25+
<Dir>artifacts/src/roslyn-analyzers.ce71b27be743710012c0460071da188b2f05959c/</Dir>
26+
<Dir>artifacts/src/roslyn.59eedc33d35754759994155ea2f4e1012a9951e3/</Dir>
27+
<Dir>artifacts/src/dotnet-runtime.2f740adc1457e8a28c1c072993b66f515977eb51/</Dir>
28+
<Dir>artifacts/src/dotnet-runtime.2f740adc1457e8a28c1c072993b66f515977eb51/</Dir>
29+
<Dir>artifacts/src/dotnet-sdk.51369266643769f9f0c1184e89715cd1045126d0/</Dir>
3030
<Dir>artifacts/src/sourcelink.f175b06862f889474b689a57527e489101c774cc/</Dir>
3131
<Dir>artifacts/src/symreader.f8a3ba85aed339fb8d08ca26f3876b28c32d58ee/</Dir>
32-
<Dir>artifacts/src/templating.8dc4f8a9283d45103e132026797af30ead2aad6d/</Dir>
32+
<Dir>artifacts/src/templating.8470ff317250d761c72f920b8ea1c0700b230eb3/</Dir>
3333
<Dir>artifacts/src/test-templates.956e14dedd3a3ac981b320d66c6d389387a2954a/</Dir>
34-
<Dir>artifacts/src/vstest.212656d7b384a506aa714999f678b3ace82d114e/</Dir>
34+
<Dir>artifacts/src/vstest.99b911a57a02fc5d2eeef23e9ab8cbea4505678b/</Dir>
3535
<Dir>artifacts/src/xliff-tasks.a52f3d7fb58470749ee4035fbbcb7e63c78b0459/</Dir>
3636
<Dir>Tools/</Dir>
3737
<Dir>tools-local/tasks/</Dir>
@@ -45,7 +45,6 @@
4545
<Usage Id="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-rc.1.20451.14" />
4646
<Usage Id="Microsoft.NETCore.App.Host.linux-x64" Version="5.0.0-rc.1.20451.14" />
4747
<!-- End OSX-only prebuilts -->
48-
<Usage Id="dotnet-watch" Version="5.0.3-servicing.21073.3" IsDirectDependency="true" />
4948
<Usage Id="MicroBuild.Core" Version="0.2.0" IsDirectDependency="true" IsAutoReferenced="true" />
5049
<Usage Id="MicroBuild.Core" Version="0.3.0" IsDirectDependency="true" />
5150
<Usage Id="MicroBuild.Core.Sentinel" Version="1.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
@@ -54,7 +53,6 @@
5453
<Usage Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
5554
<Usage Id="Microsoft.AspNetCore.Components.WebAssembly.Templates" Version="3.2.1" />
5655
<Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
57-
<Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
5856
<Usage Id="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0-rc.1.20451.14" />
5957
<Usage Id="Microsoft.Build" Version="15.7.179" IsDirectDependency="true" />
6058
<Usage Id="Microsoft.Build.CentralPackageVersions" Version="2.0.1" />
@@ -75,35 +73,36 @@
7573
<Usage Id="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.0" IsDirectDependency="true" />
7674
<Usage Id="Microsoft.CodeAnalysis.Common" Version="2.9.0" />
7775
<Usage Id="Microsoft.CodeAnalysis.Common" Version="3.4.0" />
76+
<Usage Id="Microsoft.CodeAnalysis.Common" Version="3.8.0" IsDirectDependency="true" />
7877
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="2.9.0" IsDirectDependency="true" />
7978
<Usage Id="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" IsDirectDependency="true" />
80-
<Usage Id="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0-2.20414.4" IsDirectDependency="true" />
81-
<Usage Id="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="3.8.0-2.20414.4" IsDirectDependency="true" />
79+
<Usage Id="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0-5.20519.18" IsDirectDependency="true" />
80+
<Usage Id="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="3.8.0" IsDirectDependency="true" />
81+
<Usage Id="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="3.8.0-5.20519.18" IsDirectDependency="true" />
82+
<Usage Id="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="3.8.0" IsDirectDependency="true" />
8283
<Usage Id="Microsoft.CSharp" Version="4.0.1" IsDirectDependency="true" />
8384
<Usage Id="Microsoft.CSharp" Version="4.3.0" IsDirectDependency="true" />
8485
<Usage Id="Microsoft.Docker.Sdk" Version="1.1.0" />
8586
<Usage Id="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20426.4" />
8687
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta3" />
8788
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1" />
88-
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.11" />
89+
<Usage Id="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.10" />
8990
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
9091
<Usage Id="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20426.4" IsDirectDependency="true" IsAutoReferenced="true" />
9192
<Usage Id="microsoft.dotnet.templateLocator" Version="5.0.100-rc.1.20421.19" />
92-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.25" />
93+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.26" />
9394
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.0.1" />
94-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.12" />
95-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="5.0.4" />
96-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.25" />
95+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.13" />
96+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.26" />
9797
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.0" Version="3.0.1" />
98-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.12" />
99-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.5.0" Version="5.0.4" />
100-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.25" />
98+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.13" />
99+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.26" />
101100
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0" Version="3.0.1" />
102-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.12" />
103-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.4" />
101+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.13" />
104102
<Usage Id="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
105103
<Usage Id="Microsoft.Extensions.DependencyModel" Version="2.1.0" IsDirectDependency="true" />
106104
<Usage Id="Microsoft.Extensions.DependencyModel" Version="3.1.6" IsDirectDependency="true" />
105+
<Usage Id="Microsoft.FSharp.Compiler" Version="11.3.2-beta.21102.9" IsDirectDependency="true" />
107106
<Usage Id="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.8.20359.4" />
108107
<Usage Id="Microsoft.NETCore.App" Version="2.0.0" IsDirectDependency="true" IsAutoReferenced="true" />
109108
<Usage Id="Microsoft.NETCore.App" Version="2.1.0" IsDirectDependency="true" IsAutoReferenced="true" />
@@ -241,6 +240,7 @@
241240
<Usage Id="System.Collections.Specialized" Version="4.3.0" IsDirectDependency="true" />
242241
<Usage Id="System.ComponentModel" Version="4.3.0" />
243242
<Usage Id="System.ComponentModel.Annotations" Version="4.7.0" />
243+
<Usage Id="System.ComponentModel.Composition" Version="4.5.0" IsDirectDependency="true" />
244244
<Usage Id="System.ComponentModel.Primitives" Version="4.3.0" />
245245
<Usage Id="System.ComponentModel.TypeConverter" Version="4.3.0" IsDirectDependency="true" />
246246
<Usage Id="System.Composition" Version="1.0.31" />
@@ -288,6 +288,7 @@
288288
<Usage Id="System.IO.FileSystem.Primitives" Version="4.0.1" />
289289
<Usage Id="System.IO.FileSystem.Primitives" Version="4.3.0" />
290290
<Usage Id="System.IO.MemoryMappedFiles" Version="4.3.0" />
291+
<Usage Id="System.IO.Pipelines" Version="5.0.0" />
291292
<Usage Id="System.IO.Pipes" Version="4.3.0" />
292293
<Usage Id="System.IO.Pipes.AccessControl" Version="4.3.0" />
293294
<Usage Id="System.IO.Pipes.AccessControl" Version="4.5.1" IsDirectDependency="true" />
@@ -331,7 +332,7 @@
331332
<Usage Id="System.Reflection.Metadata" Version="1.4.1" />
332333
<Usage Id="System.Reflection.Metadata" Version="1.4.2" IsDirectDependency="true" />
333334
<Usage Id="System.Reflection.Metadata" Version="1.5.0" IsDirectDependency="true" />
334-
<Usage Id="System.Reflection.Metadata" Version="1.6.0" />
335+
<Usage Id="System.Reflection.Metadata" Version="1.6.0" IsDirectDependency="true" />
335336
<Usage Id="System.Reflection.Metadata" Version="1.7.0" IsDirectDependency="true" />
336337
<Usage Id="System.Reflection.Metadata" Version="1.8.0" IsDirectDependency="true" />
337338
<Usage Id="System.Reflection.Metadata" Version="1.8.1" />
@@ -392,6 +393,7 @@
392393
<Usage Id="System.Security.Cryptography.X509Certificates" Version="4.1.0" />
393394
<Usage Id="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
394395
<Usage Id="System.Security.Cryptography.Xml" Version="4.7.0" />
396+
<Usage Id="System.Security.Permissions" Version="4.5.0" />
395397
<Usage Id="System.Security.Permissions" Version="4.7.0" />
396398
<Usage Id="System.Security.Principal" Version="4.0.1" />
397399
<Usage Id="System.Security.Principal" Version="4.3.0" />
@@ -410,10 +412,9 @@
410412
<Usage Id="System.Text.Encodings.Web" Version="4.7.0" />
411413
<Usage Id="System.Text.Encodings.Web" Version="4.7.1" />
412414
<Usage Id="System.Text.Encodings.Web" Version="5.0.0-rc.1.20451.14" />
413-
<Usage Id="System.Text.Json" Version="4.7.0" />
415+
<Usage Id="System.Text.Json" Version="4.7.0" IsDirectDependency="true" />
414416
<Usage Id="System.Text.Json" Version="4.7.2" />
415417
<Usage Id="System.Text.Json" Version="5.0.0-rc.1.20451.14" IsDirectDependency="true" />
416-
<Usage Id="System.Text.Json" Version="5.0.0" />
417418
<Usage Id="System.Text.RegularExpressions" Version="4.1.0" IsDirectDependency="true" />
418419
<Usage Id="System.Text.RegularExpressions" Version="4.3.0" />
419420
<Usage Id="System.Threading" Version="4.0.11" IsDirectDependency="true" />

0 commit comments

Comments
 (0)