Merge pull request #2117 from dseefeld/5.0.5-apr2021

Update to the April 5.0.5 Release

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

@@ -81,7 +81,7 @@ jobs:
  /p:FailOnPrebuiltBaselineError=$failOnBaselineError \
  /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \
  $(tarballDownloadArgs) \
- /p:AzDoPat=$(System.AccessToken)
+ /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
  du -h $(rootDirectory) | sort -h | tail -n 50
  displayName: Build source-build
  timeoutInMinutes: 180

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

@@ -25,7 +25,7 @@ jobs:
  /p:BuildPortableSdk=$(sb.portable)
  /p:FailOnPrebuiltBaselineError=$(failOnPrebuiltBaselineError)
  /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
- /p:AzDoPat=$(System.AccessToken)
+ /p:AzDoPat=$(dn-bot-all-orgs-build-rw-code-rw)
  $(tarballDownloadArgs)
  args.smokeTest: >
  --run-smoke-test

NuGet.config

@@ -2,8 +2,20 @@
 <configuration>
  <packageSources>
  <clear />
+ <!-- Begin: Package sources from dotnet-roslyn-analyzers -->
+ <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" />
+ <!-- End: Package sources from dotnet-roslyn-analyzers -->
+ <!-- Begin: Package sources from dotnet-templating -->
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <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" />
+ <!-- End: Package sources from dotnet-templating -->
+ <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
  <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json" />
  <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
  </packageSources>
- <disabledPackageSources />
+ <disabledPackageSources>
+ </disabledPackageSources>
 </configuration>

build.sh

@@ -108,9 +108,17 @@ if [ "${internalPackageFeedPat:-}" ]; then
  # TODO: Read these from nuget.config
  # The internal transport isn't added by Darc, though, so it will still need special-casing.
  export VSS_NUGET_EXTERNAL_FEED_ENDPOINTS='{"endpointCredentials": [
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-c636bbdc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-d827c653/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
- {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-installer-72dec52d/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-b7a2ec8c/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-roslyn-analyzers-ce71b27b/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-5/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-4/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-3/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-2/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31-1/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
+ {"endpoint":"https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8470ff31/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"},
  {"endpoint":"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json", "username":"optional", "password":"'$internalPackageFeedPat'"}
  ]}'
 fi

eng/Version.Details.xml

@@ -22,54 +22,54 @@
  <Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
  <RepoName>aspnet-xdt</RepoName>
  </Dependency>
- <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21113.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-rtm.21161.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/mono/linker</Uri>
- <Sha>e0b9157b540f5fc020b2e7967f4bbd23ba826e4e</Sha>
+ <Sha>c43f981eec336c1dc4fd0ead84b5e09db9377d9e</Sha>
  <RepoName>linker</RepoName>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
+ <Sha>2f740adc1457e8a28c1c072993b66f515977eb51</Sha>
  <RepoName>runtime</RepoName>
  <RepoName>runtime-portable</RepoName>
  </Dependency>
- <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.202" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/templating</Uri>
- <Sha>8dc4f8a9283d45103e132026797af30ead2aad6d</Sha>
+ <Sha>8470ff317250d761c72f920b8ea1c0700b230eb3</Sha>
  </Dependency>
  <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.5.0" Version="1.0.2-beta4.20407.5">
  <Uri>https://github.com/dotnet/test-templates</Uri>
  <Sha>956e14dedd3a3ac981b320d66c6d389387a2954a</Sha>
  </Dependency>
  <!-- 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 -->
- <Dependency Name="System.CommandLine" Version="2.0.0-beta1.20253.1">
+ <Dependency Name="System.CommandLine" Version="2.0.0-beta1.20371.2">
  <Uri>https://github.com/dotnet/command-line-api</Uri>
- <Sha>afd010ba8cb3cbd714c734465d1a5de1ee133e2d</Sha>
+ <Sha>6ddde11ed45e3f4b9d80c97670f347dbfda15c3f</Sha>
  </Dependency>
- <Dependency Name="Microsoft.NETCore.Compilers" Version="3.8.0-5.20604.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.9.0-6.21160.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/roslyn</Uri>
- <Sha>9ed4b774d20940880de8df1ca8b07508aa01c8cd</Sha>
+ <Sha>59eedc33d35754759994155ea2f4e1012a9951e3</Sha>
  </Dependency>
- <Dependency Name="Microsoft.Build" Version="16.8.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.Build" Version="16.9.0" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/msbuild</Uri>
- <Sha>39993bd9d02917993b6147a9973dc3aa6e9b00c7</Sha>
+ <Sha>5e4b48a27efce55a613664b58d353ab4c8d1f6c1</Sha>
  </Dependency>
- <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
+ <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.2" CoherentParentDependency="Microsoft.NET.Sdk">
  <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
- <Sha>77b259353aa44ec1510951a75c6e7ed6e662a001</Sha>
+ <Sha>ce71b27be743710012c0460071da188b2f05959c</Sha>
  </Dependency>
- <Dependency Name="NuGet.Build.Tasks" Version="5.8.0-rc.6930" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
- <Uri>https://github.com/NuGet/NuGet.Client</Uri>
- <Sha>830c8be45dbbccd411ecf6080abff0c2c98079cf</Sha>
+ <Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Uri>https://github.com/nuget/nuget.client</Uri>
+ <Sha>d525b0e670f3b6cbd5c73a35f04730a9f658c852</Sha>
  <RepoName>nuget-client</RepoName>
  </Dependency>
- <Dependency Name="Microsoft.NET.Sdk" Version="5.0.104-servicing.21118.26" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.NET.Sdk" Version="5.0.202-servicing.21201.17" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/sdk</Uri>
- <Sha>2932b586ae1ebf28415df80e0bf96d8015f2c192</Sha>
+ <Sha>51369266643769f9f0c1184e89715cd1045126d0</Sha>
  <RepoName>sdk</RepoName>
  </Dependency>
  <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
- <Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
+ <Uri>https://github.com/dotnet/CliCommandLineParser</Uri>
  <Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
  <RepoName>clicommandlineparser</RepoName>
  </Dependency>
@@ -83,22 +83,22 @@
  <Uri>https://github.com/dotnet/xliff-tasks</Uri>
  <Sha>a52f3d7fb58470749ee4035fbbcb7e63c78b0459</Sha>
  </Dependency>
- <Dependency Name="dotnet-watch" Version="5.0.4-servicing.21118.15" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="dotnet-dev-certs" Version="5.0.5-servicing.21167.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/aspnetcore</Uri>
- <Sha>e882394a7bb38930da748291fe2c2ceaa6a80588</Sha>
+ <Sha>b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb</Sha>
  <RepoName>aspnetcore</RepoName>
  </Dependency>
- <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20507.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.FSharp.Compiler" Version="11.3.2-beta.21102.9" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/dotnet/fsharp</Uri>
- <Sha>da6be68280c89131cdba2045525b80890401defd</Sha>
+ <Sha>7ce7132f1459095e635194d09d6f73265352029a</Sha>
  </Dependency>
- <Dependency Name="Microsoft.TestPlatform.Build" Version="16.8.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+ <Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
  <Uri>https://github.com/microsoft/vstest</Uri>
- <Sha>212656d7b384a506aa714999f678b3ace82d114e</Sha>
+ <Sha>99b911a57a02fc5d2eeef23e9ab8cbea4505678b</Sha>
  </Dependency>
- <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.104-servicing.21118.22">
+ <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.202-servicing.21201.18">
  <Uri>https://github.com/dotnet/installer</Uri>
- <Sha>ca6b6acadbd30de2160ab6a003fba072b2c7b568</Sha>
+ <Sha>db7cc87d512335808e3806067f2bf9b31379e1db</Sha>
  <RepoName>installer</RepoName>
  </Dependency>
  <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.20419.2">

eng/Versions.props

@@ -4,13 +4,12 @@
  <PropertyGroup>
  <MajorVersion>5</MajorVersion>
  <MinorVersion>0</MinorVersion>
- <RuntimePatchVersion>4</RuntimePatchVersion>
- <SdkPatchVersion>104</SdkPatchVersion>
+ <RuntimePatchVersion>5</RuntimePatchVersion>
+ <SdkPatchVersion>202</SdkPatchVersion>
  <RuntimeProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</RuntimeProductVersion>
  <AspNetCoreProductVersion>$(MajorVersion).$(MinorVersion).$(RuntimePatchVersion)</AspNetCoreProductVersion>
  <SdkProductVersion>$(MajorVersion).$(MinorVersion).$(SdkPatchVersion)</SdkProductVersion>
  </PropertyGroup>
-
  <!-- Repo Version Information -->
  <PropertyGroup>
  <VersionPrefix>0.1.0</VersionPrefix>
@@ -25,6 +24,6 @@
  <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20623.1</PrivateSourceBuildReferencePackagesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
- <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.103-992795-20210212.2</PrivateSourceBuiltArtifactsPackageVersion>
+ <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.104-1039752-20210315.3</PrivateSourceBuiltArtifactsPackageVersion>
  </PropertyGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
  "tools": {
- "dotnet": "5.0.102"
+ "dotnet": "5.0.104"
  },
  "msbuild-sdks": {
  "Microsoft.Build.CentralPackageVersions": "2.0.1",