Merge in 'release/5.0.2xx' changes

NuGet.config

@@ -6,22 +6,9 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-int-dotnet-aspnetcore-e882394" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-aspnetcore-e882394a/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-cfd206a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-cfd206aa/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-efcore -->
-    <!--  Begin: Package sources from dotnet-msbuild -->
-    <add key="darc-pub-dotnet-msbuild-57a23d2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-msbuild-57a23d24/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-msbuild -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-f27d337" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f27d3372/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-runtime -->
-    <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-e708867-1" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-windowsdesktop-e7088670-1/nuget/v3/index.json" />
-    <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+    <!-- For custom version of arcade -->
+    <add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@@ -32,19 +19,8 @@
   </packageSources>
   <disabledPackageSources>
     <clear />
-    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!-- Added by darc above. due to dependencies on 3.0.0 and 2.1.0 packs, but we can get those from nuget.org -->
-    <!--  Begin: Package sources from dotnet-aspnetcore -->
+    <!-- Darc will just put it back if we attempt to remove it above. -->
-    <add key="darc-int-dotnet-aspnetcore-e882394" value="true" />
+    <add key="darc-pub-dotnet-core-setup-7d57652" value="true" />
-    <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from dotnet-efcore -->
-    <add key="darc-int-dotnet-efcore-cfd206a" value="true" />
-    <!--  End: Package sources from dotnet-efcore -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-f27d337" value="true" />
-    <!--  End: Package sources from dotnet-runtime -->
-    <!--  Begin: Package sources from dotnet-windowsdesktop -->
-    <add key="darc-int-dotnet-windowsdesktop-e708867-1" value="true" />
-    <!--  End: Package sources from dotnet-windowsdesktop -->
-    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>
 </configuration>

eng/Version.Details.xml

@@ -148,13 +148,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21112.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21159.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
+      <Sha>917ded6b428fc30b40f5ba4e35eb0c863d7f69e1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21112.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21159.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>d8c68c834bcca3f721ad1550404807e301ba7afe</Sha>
+      <Sha>917ded6b428fc30b40f5ba4e35eb0c863d7f69e1</Sha>
     </Dependency>
     <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

eng/Versions.props

@@ -8,7 +8,7 @@
     <VersionMajor>5</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>2</VersionSDKMinor>
-    <VersionFeature>01</VersionFeature>
+    <VersionFeature>02</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
@@ -19,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21112.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21159.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->

eng/common/post-build/publish-using-darc.ps1

@@ -54,7 +54,7 @@ try {
   --id $buildId `
   --publishing-infra-version $PublishingInfraVersion `
   --default-channels `
-  --source-branch master `
+  --source-branch main `
   --azdev-pat $AzdoToken `
   --bar-uri $MaestroApiEndPoint `
   --password $MaestroToken `

global.json

@@ -8,6 +8,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21112.3"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21159.7"
   }
 }