Skip to content

Commit 561d6ea

Browse files
dseefelddseefeld
authored
Merge pull request #2117 from dseefeld/5.0.5-apr2021
Update to the April 5.0.5 Release
2 parents c13177f + 8c37131 commit 561d6ea

File tree

61 files changed

+1457
-1019
lines changed

Some content is hidden

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

61 files changed

+1457
-1019
lines changed

‎.vsts.pipelines/jobs/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
/p:FailOnPrebuiltBaselineError=$failOnBaselineError \
8282
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \
8383
$(tarballDownloadArgs) \
84-
/p:AzDoPat=$(System.AccessToken)
84+
/p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
8585
du -h $(rootDirectory) | sort -h | tail -n 50
8686
displayName: Build source-build
8787
timeoutInMinutes: 180

‎.vsts.pipelines/jobs/ci-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
/p:BuildPortableSdk=$(sb.portable)
2626
/p:FailOnPrebuiltBaselineError=$(failOnPrebuiltBaselineError)
2727
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
28-
/p:AzDoPat=$(System.AccessToken)
28+
/p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
2929
$(tarballDownloadArgs)
3030
args.smokeTest: >
3131
--run-smoke-test

‎NuGet.config

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,20 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
6+
<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" />
7+
<!-- End: Package sources from dotnet-roslyn-analyzers -->
8+
<!-- Begin: Package sources from dotnet-templating -->
9+
<add key="darc-pub-dotnet-templating-8470ff3-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-4/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-templating-8470ff3-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json" />
11+
<add key="darc-pub-dotnet-templating-8470ff3-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-templating-8470ff3-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-templating-8470ff3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json" />
14+
<!-- End: Package sources from dotnet-templating -->
15+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
516
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
617
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
718
</packageSources>
8-
<disabledPackageSources />
19+
<disabledPackageSources>
20+
</disabledPackageSources>
921
</configuration>

‎build.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,17 @@ 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-runtime-c636bbdc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-d827c653/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113-
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-installer-72dec52d/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
111+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b7a2ec8c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
112+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
113+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
114+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
115+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
116+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
117+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
118+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
119+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
120+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
121+
{"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
114122
{"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
115123
]}'
116124
fi

‎eng/Version.Details.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,54 +22,54 @@
2222
<Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
2323
<RepoName>aspnet-xdt</RepoName>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21113.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
25+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21161.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
2626
<Uri>https://github.com/mono/linker</Uri>
27-
<Sha>e0b9157b540f5fc020b2e7967f4bbd23ba826e4e</Sha>
27+
<Sha>c43f981eec336c1dc4fd0ead84b5e09db9377d9e</Sha>
2828
<RepoName>linker</RepoName>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
30+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3131
<Uri>https://github.com/dotnet/runtime</Uri>
32-
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
32+
<Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
3333
<RepoName>runtime</RepoName>
3434
<RepoName>runtime-portable</RepoName>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
36+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.202" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
3737
<Uri>https://github.com/dotnet/templating</Uri>
38-
<Sha>8dc4f8a9283d45103e132026797af30ead2aad6d</Sha>
38+
<Sha>8470ff317250d761c72f920b8ea1c0700b230eb3</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.20407.5">
4141
<Uri>https://github.com/dotnet/test-templates</Uri>
4242
<Sha>956e14dedd3a3ac981b320d66c6d389387a2954a</Sha>
4343
</Dependency>
4444
<!-- this should have CPD to Roslyn or runtime but they don't have the proper Version.Details.xml entry - https://github.com/dotnet/runtime/issues/42637 -->
45-
<Dependency Name="System.CommandLine" Version="2.0.0-beta1.20253.1">
45+
<Dependency Name="System.CommandLine" Version="2.0.0-beta1.20371.2">
4646
<Uri>https://github.com/dotnet/command-line-api</Uri>
47-
<Sha>afd010ba8cb3cbd714c734465d1a5de1ee133e2d</Sha>
47+
<Sha>6ddde11ed45e3f4b9d80c97670f347dbfda15c3f</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.Compilers" Version="3.8.0-5.20604.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
49+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-6.21160.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
51-
<Sha>9ed4b774d20940880de8df1ca8b07508aa01c8cd</Sha>
51+
<Sha>59eedc33d35754759994155ea2f4e1012a9951e3</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.Build" Version="16.8.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
53+
<Dependency Name="Microsoft.Build" Version="16.9.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
5454
<Uri>https://github.com/dotnet/msbuild</Uri>
55-
<Sha>39993bd9d02917993b6147a9973dc3aa6e9b00c7</Sha>
55+
<Sha>5e4b48a27efce55a613664b58d353ab4c8d1f6c1</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
57+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
5858
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
59-
<Sha>77b259353aa44ec1510951a75c6e7ed6e662a001</Sha>
59+
<Sha>ce71b27be743710012c0460071da188b2f05959c</Sha>
6060
</Dependency>
61-
<Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6930" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
62-
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
63-
<Sha>830c8be45dbbccd411ecf6080abff0c2c98079cf</Sha>
61+
<Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
62+
<Uri>https://github.com/nuget/nuget.client</Uri>
63+
<Sha>d525b0e670f3b6cbd5c73a35f04730a9f658c852</Sha>
6464
<RepoName>nuget-client</RepoName>
6565
</Dependency>
66-
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.104-servicing.21118.26" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
66+
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21201.17" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
6767
<Uri>https://github.com/dotnet/sdk</Uri>
68-
<Sha>2932b586ae1ebf28415df80e0bf96d8015f2c192</Sha>
68+
<Sha>51369266643769f9f0c1184e89715cd1045126d0</Sha>
6969
<RepoName>sdk</RepoName>
7070
</Dependency>
7171
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
72-
<Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
72+
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
7373
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
7474
<RepoName>clicommandlineparser</RepoName>
7575
</Dependency>
@@ -83,22 +83,22 @@
8383
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
8484
<Sha>a52f3d7fb58470749ee4035fbbcb7e63c78b0459</Sha>
8585
</Dependency>
86-
<Dependency Name="dotnet-watch" Version="5.0.4-servicing.21118.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
86+
<Dependency Name="dotnet-dev-certs" Version="5.0.5-servicing.21167.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
8787
<Uri>https://github.com/dotnet/aspnetcore</Uri>
88-
<Sha>e882394a7bb38930da748291fe2c2ceaa6a80588</Sha>
88+
<Sha>b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb</Sha>
8989
<RepoName>aspnetcore</RepoName>
9090
</Dependency>
91-
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
91+
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.3.2-beta.21102.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
9292
<Uri>https://github.com/dotnet/fsharp</Uri>
93-
<Sha>da6be68280c89131cdba2045525b80890401defd</Sha>
93+
<Sha>7ce7132f1459095e635194d09d6f73265352029a</Sha>
9494
</Dependency>
95-
<Dependency Name="Microsoft.TestPlatform.Build" Version="16.8.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
95+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
9696
<Uri>https://github.com/microsoft/vstest</Uri>
97-
<Sha>212656d7b384a506aa714999f678b3ace82d114e</Sha>
97+
<Sha>99b911a57a02fc5d2eeef23e9ab8cbea4505678b</Sha>
9898
</Dependency>
99-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.104-servicing.21118.22">
99+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.202-servicing.21201.18">
100100
<Uri>https://github.com/dotnet/installer</Uri>
101-
<Sha>ca6b6acadbd30de2160ab6a003fba072b2c7b568</Sha>
101+
<Sha>db7cc87d512335808e3806067f2bf9b31379e1db</Sha>
102102
<RepoName>installer</RepoName>
103103
</Dependency>
104104
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">

‎eng/Versions.props

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
<PropertyGroup>
55
<MajorVersion>5</MajorVersion>
66
<MinorVersion>0</MinorVersion>
7-
<RuntimePatchVersion>4</RuntimePatchVersion>
8-
<SdkPatchVersion>104</SdkPatchVersion>
7+
<RuntimePatchVersion>5</RuntimePatchVersion>
8+
<SdkPatchVersion>202</SdkPatchVersion>
99
<RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
1010
<AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
1111
<SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
1212
</PropertyGroup>
13-
1413
<!-- Repo Version Information -->
1514
<PropertyGroup>
1615
<VersionPrefix>0.1.0</VersionPrefix>
@@ -25,6 +24,6 @@
2524
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20623.1</PrivateSourceBuildReferencePackagesPackageVersion>
2625
</PropertyGroup>
2726
<PropertyGroup>
28-
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.103-992795-20210212.2</PrivateSourceBuiltArtifactsPackageVersion>
27+
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.104-1039752-20210315.3</PrivateSourceBuiltArtifactsPackageVersion>
2928
</PropertyGroup>
3029
</Project>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "5.0.102"
3+
"dotnet": "5.0.104"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",

0 commit comments

Comments
 (0)