[build] Use dotnet/arcade dependency management tooling (#5731)

pjcollins · web-flow · commit 952e67be871b · 2021-03-22T15:57:32.000-04:00
Context: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md The dotnet core engineering group has some dependency management tooling known as `darc` that we'd like to adopt. Integrating this tooling into the build system will make it easier to stay up to date with the latest .NET 6 SDK changes. Many dotnet repos use a [publishing workflow][0] that will push build artifact data to a central location known as the "Build Asset Registry". This data includes a "[Channel][1]" association, which is the key to dependency updating. Local updates and automatic update "Subscriptions" compare the version files in a given repo against the product versions available in the channel that you are interested in. We hope to be able to publish Xamarin SDK build information to this central registry in the near future, so that other products can take a dependency on us as needed (dotnet/maui for instance). The `darc` tool looks for four different files in a repo when adding a dependency or when checking for an update: * `eng/Version.Details.xml` * `eng/Versions.props` * `global.json` * `nuget.config` Both of the `Version*` files present in the `eng` folder are updated when a new dependency is available. To work with `darc` locally you will need to [install][2] the `darc` global tool, join the `arcade-contrib` GitHub team, and configure your auth settings. To add a new dependency, use the [`darc add-dependency`][3] command: darc add-dependency -n Microsoft.NetCore.App.Runtime.android-arm64 -t product -v 6.0.0-preview.2.21154.6 -r https://github.com/dotnet/runtime To update all dependencies, use the [`darc update-dependencies`][4] command: darc update-dependencies --channel ".NET 6" To configure automatic updates, use the [`darc add-subscription`][5] command to enroll a target repo/branch into updates from a particular channel: darc add-subscription --channel ".NET 6" --source-repo https://github.com/dotnet/installer --target-repo https://github.com/xamarin/xamarin-android --target-branch main --update-frequency everyWeek --standard-automerge Once a subscription is configured, [a pull request][6] will be created automatically by the dotnet Maestro bot when dependency updates are available. ~~~ This PR also contains a bump to .NET 6.0.100-preview.3.21168.18. Changes: dotnet/installer@19e22a7...823c1df The .NET 6 `.apkdesc` files have been updated accordingly. It seems that `System.Private.CoreLib.dll` grew in size, however reductions in native libraries/etc. results in an overall smaller package sizes. Simple XA: -"PackageSize": 2889606 +"PackageSize": 2877318 XF/XA: -"PackageSize": 8746124 +"PackageSize": 8733836 [0]: https://github.com/dotnet/arcade/blob/681511f2f63a3563494f1f27904b2842abef6b35/Documentation/CorePackages/Publishing.md#what-is-v3-publishing-how-is-it-different-from-v2 [1]: https://github.com/dotnet/arcade/blob/main/Documentation/BranchesChannelsAndSubscriptions.md#branches-channels-and-subscriptions-explained [2]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#setting-up-your-darc-client [3]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#add-dependency [4]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#update-dependencies [5]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#add-subscription [6]: #5744
diff --git a/Configuration.props b/Configuration.props
@@ -3,6 +3,7 @@
   <!--
     Note: This file *must* be imported *after* `$(Configuration)` is set.
   -->
+  <Import Project="$(MSBuildThisFileDirectory)eng\Versions.props" />
   <Import
       Project="$(MSBuildThisFileDirectory)Build$(Configuration)\Configuration.Generated.props"
       Condition="Exists('$(MSBuildThisFileDirectory)Build$(Configuration)\Configuration.Generated.props')"
@@ -74,14 +75,6 @@
     <AndroidNdkDirectory Condition=" '$(AndroidNdkDirectory)' == '' ">$(AndroidToolchainDirectory)\ndk</AndroidNdkDirectory>
     <DotNetPreviewPath Condition=" '$(DotNetPreviewPath)' == '' ">$(AndroidToolchainDirectory)\dotnet\</DotNetPreviewPath>
     <DotNetPreviewTool Condition=" '$(DotNetPreviewTool)' == '' ">$(DotNetPreviewPath)dotnet</DotNetPreviewTool>
-    <!-- Version number from: https://github.com/dotnet/installer#installers-and-binaries -->
-    <!-- Please update DotNetRuntimePacksVersion below accordingly -->
-    <DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">6.0.100</DotNetPreviewVersionBand>
-    <DotNetPreviewVersionFull Condition=" '$(DotNetPreviewVersionFull)' == '' ">$(DotNetPreviewVersionBand)-preview.3.21161.23</DotNetPreviewVersionFull>
-    <!-- This version comes from the a file in the dotnet distribution: sdk/$(DotNetPreviewVersionFull)/dotnet.runtimeconfig.json (the `runtimeOptions/framework/version key`) -->
-    <DotNetRuntimePacksVersion Condition=" '$(DotNetRuntimePacksVersion)' == '' ">6.0.0-preview.3.21159.16</DotNetRuntimePacksVersion>
-    <ILLinkVersionBand Condition=" '$(ILLinkVersionBand)' == '' ">6.0.0</ILLinkVersionBand>
-    <ILLinkVersionFull Condition=" '$(ILLinkVersionFull)' == '' ">$(ILLinkVersionBand)-alpha.1.21109.1</ILLinkVersionFull>
     <WixToolPath Condition=" '$(WixToolPath)' == '' ">$(AndroidToolchainDirectory)\wix\</WixToolPath>
     <AndroidCmakeVersion Condition=" '$(AndroidCmakeVersion)' == '' ">3.18.1</AndroidCmakeVersion>
     <AndroidCmakeUrlPrefix Condition=" '$(HostOS)' == 'Windows' And '$(AndroidCmakeUrlPrefix)' == '' ">7c386a739f915f5bd60051f2572c24782388e807.</AndroidCmakeUrlPrefix>
diff --git a/NuGet.config b/NuGet.config
@@ -6,9 +6,9 @@
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
-
-     <!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
-     <!-- Android binary, to support delta APK install -->
-     <add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
+    <!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
+    <!-- Android binary, to support delta APK install -->
+    <add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
   </packageSources>
+  <disabledPackageSources />
 </configuration>
diff --git a/build-tools/create-dotnet-msi/create-dotnet-msi.csproj b/build-tools/create-dotnet-msi/create-dotnet-msi.csproj
@@ -74,7 +74,7 @@
         Template="$(_WixTemplate)"
         DestinationFile="$(_WixFile)"
         DotNetPath="$(DotNetPreviewPath)"
-        DotNetVersion="$(DotNetPreviewVersionFull)"
+        DotNetVersion="$(MicrosoftDotnetSdkInternalPackageVersion)"
         MSIVersion="$(AndroidMSIVersion)"
     />
     <ItemGroup>
diff --git a/build-tools/create-dotnet-pkg/create-dotnet-pkg.csproj b/build-tools/create-dotnet-pkg/create-dotnet-pkg.csproj
@@ -38,7 +38,7 @@
       <DotNetPayloadDir>$(PayloadDir)\usr\local\share\dotnet\</DotNetPayloadDir>
     </PropertyGroup>
     <ItemGroup>
-      <_FilesToCopy Include="$(DotNetPreviewPath)\sdk\$(DotNetPreviewVersionFull)\EnableWorkloadResolver.sentinel" />
+      <_FilesToCopy Include="$(DotNetPreviewPath)\sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\EnableWorkloadResolver.sentinel" />
       <_FilesToCopy Include="$(DotNetPreviewPath)\sdk-manifests\$(DotNetPreviewVersionBand)\Microsoft.NET.Workload.Android\**\*" />
       <_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Ref\**\*" />
       <_FilesToCopy Include="$(DotNetPreviewPath)\packs\Microsoft.Android.Sdk.osx-x64\**\*" />
diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets
@@ -12,7 +12,7 @@
 
   <PropertyGroup>
     <_MonoAndroidNETOutputDir>$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\netcoreapp3.1\</_MonoAndroidNETOutputDir>
-    <_WorkloadResolverFlagFile>$(DotNetPreviewPath)sdk\$(DotNetPreviewVersionFull)\EnableWorkloadResolver.sentinel</_WorkloadResolverFlagFile>
+    <_WorkloadResolverFlagFile>$(DotNetPreviewPath)sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\EnableWorkloadResolver.sentinel</_WorkloadResolverFlagFile>
   </PropertyGroup>
 
   <!-- LICENSE setup -->
diff --git a/build-tools/xaprepare/xaprepare/Application/Context.cs b/build-tools/xaprepare/xaprepare/Application/Context.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Xml.Linq;
 
 namespace Xamarin.Android.Prepare
 {
@@ -358,6 +359,27 @@ public bool IsRunningOnHostedAzureAgent {
 			}
 		}
 
+		string _bundledPreviewRuntimePackVersion;
+		public string BundledPreviewRuntimePackVersion {
+			get {
+				if (string.IsNullOrEmpty (_bundledPreviewRuntimePackVersion)) {
+					var dotnetPath = Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);
+					dotnetPath = dotnetPath.TrimEnd (new char [] { Path.DirectorySeparatorChar });
+					var dotnetPreviewVersion = Properties.GetRequiredValue (KnownProperties.MicrosoftDotnetSdkInternalPackageVersion);
+					var bundledVersionsPath = Path.Combine (dotnetPath, "sdk", dotnetPreviewVersion, "Microsoft.NETCoreSdk.BundledVersions.props");
+					if (!File.Exists (bundledVersionsPath))
+						throw new FileNotFoundException ("Could not find Microsoft.NETCoreSdk.BundledVersions.props.", bundledVersionsPath);
+
+					var version = XDocument.Load (bundledVersionsPath).Descendants ().FirstOrDefault (p => p.Name == "BundledNETCoreAppPackageVersion")?.Value ?? string.Empty;
+					if (string.IsNullOrEmpty (version))
+						throw new InvalidOperationException ($"Unable to locate $(BundledNETCoreAppPackageVersion) in {bundledVersionsPath}.");
+
+					_bundledPreviewRuntimePackVersion = version;
+				}
+				return _bundledPreviewRuntimePackVersion;
+			}
+		}
+
 		/// <summary>
 		///   Do not install mingw-w64 with brew on MacOS, default false
 		/// </summary>
diff --git a/build-tools/xaprepare/xaprepare/Application/KnownProperties.cs b/build-tools/xaprepare/xaprepare/Application/KnownProperties.cs
@@ -21,8 +21,7 @@ static class KnownProperties
 		public const string CommandLineToolsVersion             = nameof (CommandLineToolsVersion);
 		public const string CommandLineToolsFolder              = nameof (CommandLineToolsFolder);
 		public const string DotNetPreviewPath                   = "DotNetPreviewPath";
-		public const string DotNetPreviewVersionFull            = "DotNetPreviewVersionFull";
-		public const string DotNetRuntimePacksVersion           = "DotNetRuntimePacksVersion";
+		public const string MicrosoftDotnetSdkInternalPackageVersion = "MicrosoftDotnetSdkInternalPackageVersion";
 		public const string EmulatorVersion                     = "EmulatorVersion";
 		public const string EmulatorPkgRevision                 = "EmulatorPkgRevision";
 		public const string HostOS                              = "HostOS";
diff --git a/build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in b/build-tools/xaprepare/xaprepare/Application/Properties.Defaults.cs.in
@@ -25,8 +25,7 @@ namespace Xamarin.Android.Prepare
 			properties.Add (KnownProperties.CommandLineToolsFolder,              StripQuotes ("@CommandLineToolsFolder@"));
 			properties.Add (KnownProperties.CommandLineToolsVersion,             StripQuotes ("@CommandLineToolsVersion@"));
 			properties.Add (KnownProperties.DotNetPreviewPath,                   StripQuotes (@"@DotNetPreviewPath@"));
-			properties.Add (KnownProperties.DotNetPreviewVersionFull,            StripQuotes ("@DotNetPreviewVersionFull@"));
-			properties.Add (KnownProperties.DotNetRuntimePacksVersion,           StripQuotes ("@DotNetRuntimePacksVersion@"));
+			properties.Add (KnownProperties.MicrosoftDotnetSdkInternalPackageVersion, StripQuotes ("@MicrosoftDotnetSdkInternalPackageVersion@"));
 			properties.Add (KnownProperties.EmulatorVersion,                     StripQuotes ("@EmulatorVersion@"));
 			properties.Add (KnownProperties.EmulatorPkgRevision,                 StripQuotes ("@EmulatorPkgRevision@"));
 			properties.Add (KnownProperties.HostOS,                              StripQuotes ("@HostOS@"));
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
@@ -403,7 +403,7 @@ static string GetNetcoreAppRuntimePath (Context ctx, string androidTarget)
 				return Path.Combine (
 					XAPackagesDir,
 					$"microsoft.netcore.app.runtime.android-{androidTarget}",
-					ctx.Properties.GetRequiredValue (KnownProperties.DotNetRuntimePacksVersion),
+					ctx.BundledPreviewRuntimePackVersion,
 					"runtimes",
 					$"android-{androidTarget}"
 				);
diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
@@ -17,7 +17,8 @@ protected override async Task<bool> Execute (Context context)
 		{
 			var dotnetPath = context.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);
 			dotnetPath = dotnetPath.TrimEnd (new char [] { Path.DirectorySeparatorChar });
-			var dotnetPreviewVersion = context.Properties.GetRequiredValue (KnownProperties.DotNetPreviewVersionFull);
+			var dotnetTool = Path.Combine (dotnetPath, "dotnet");
+			var dotnetPreviewVersion = context.Properties.GetRequiredValue (KnownProperties.MicrosoftDotnetSdkInternalPackageVersion);
 			var dotnetTestRuntimeVersion = Configurables.Defaults.DotNetTestRuntimeVersion;
 
 			// Delete any custom Microsoft.Android packs that may have been installed by test runs. Other ref/runtime packs will be ignored.
@@ -38,8 +39,8 @@ protected override async Task<bool> Execute (Context context)
 				}
 			}
 
-			if (Directory.Exists (dotnetPath)) {
-				if (!TestDotNetSdk (dotnetPath)) {
+			if (File.Exists (dotnetTool)) {
+				if (!TestDotNetSdk (dotnetTool)) {
 					Log.WarningLine ($"Attempt to run `dotnet --version` failed, reinstalling the SDK.");
 					Utilities.DeleteDirectory (dotnetPath);
 				}
@@ -55,7 +56,11 @@ protected override async Task<bool> Execute (Context context)
 				return false;
 			}
 
-			return true;
+			// Install runtime packs associated with the SDK previously installed.
+			var packageDownloadProj = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "xaprepare", "xaprepare", "package-download.proj");
+			var logPath = Path.Combine (Configurables.Paths.BuildBinDir, $"msbuild-{context.BuildTimeStamp}-download-runtime-packs.binlog");
+			return Utilities.RunCommand (dotnetTool, new string [] { "restore", $"-p:DotNetRuntimePacksVersion={context.BundledPreviewRuntimePackVersion}",
+				ProcessRunner.QuoteArgument (packageDownloadProj), ProcessRunner.QuoteArgument ($"-bl:{logPath}") });
 		}
 
 		async Task<bool> InstallDotNetAsync (Context context, string dotnetPath, string version, bool runtimeOnly = false)
@@ -122,9 +127,9 @@ async Task<bool> InstallDotNetAsync (Context context, string dotnetPath, string
 			}
 		}
 
-		bool TestDotNetSdk (string dotnetPath)
+		bool TestDotNetSdk (string dotnetTool)
 		{
-			return Utilities.RunCommand (Path.Combine (dotnetPath, "dotnet"), new string [] { "--version" });
+			return Utilities.RunCommand (dotnetTool, new string [] { "--version" });
 		}
 
 	}
diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj
@@ -0,0 +1,25 @@
+<!--
+***********************************************************************************************
+package-download.proj
+
+Downloads .NET runtime packs using the version specified in $(DotNetRuntimePacksVersion) if set.
+Otherwise, the $(BundledNETCoreAppPackageVersion) version specified in the Microsoft.NET.Sdk that
+is building/restoring this project will be used.  $(BundledNETCoreAppPackageVersion) is set in 
+dotnet\sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\Microsoft.NETCoreSdk.BundledVersions.props
+***********************************************************************************************
+-->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <DotNetRuntimePacksVersion Condition=" '$(DotNetRuntimePacksVersion)' == '' " >$(BundledNETCoreAppPackageVersion)</DotNetRuntimePacksVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm" Version="[$(DotNetRuntimePacksVersion)]" />
+    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm64" Version="[$(DotNetRuntimePacksVersion)]" />
+    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x86" Version="[$(DotNetRuntimePacksVersion)]" />
+    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x64" Version="[$(DotNetRuntimePacksVersion)]" />
+  </ItemGroup>
+
+</Project>
diff --git a/build-tools/xaprepare/xaprepare/xaprepare.csproj b/build-tools/xaprepare/xaprepare/xaprepare.csproj
@@ -60,10 +60,5 @@
   </ItemGroup>
 
   <Import Project="xaprepare.targets" Condition=" $(MSBuildToolsPath.IndexOf('omnisharp')) &lt; 0 " />
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm64" Version="[$(DotNetRuntimePacksVersion)]" />
-    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x64" Version="[$(DotNetRuntimePacksVersion)]" />
-    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm" Version="[$(DotNetRuntimePacksVersion)]" />
-    <PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x86" Version="[$(DotNetRuntimePacksVersion)]" />
-  </ItemGroup>
+
 </Project>
diff --git a/build-tools/xaprepare/xaprepare/xaprepare.targets b/build-tools/xaprepare/xaprepare/xaprepare.targets
@@ -59,8 +59,7 @@
       <Replacement Include="@CommandLineToolsFolder@=$(CommandLineToolsFolder)" />
       <Replacement Include="@CommandLineToolsVersion@=$(CommandLineToolsVersion)" />
       <Replacement Include="@DotNetPreviewPath@=$(DotNetPreviewPath)" />
-      <Replacement Include="@DotNetPreviewVersionFull@=$(DotNetPreviewVersionFull)" />
-      <Replacement Include="@DotNetRuntimePacksVersion@=$(DotNetRuntimePacksVersion)" />
+      <Replacement Include="@MicrosoftDotnetSdkInternalPackageVersion@=$(MicrosoftDotnetSdkInternalPackageVersion)" />
       <Replacement Include="@EmulatorVersion@=$(EmulatorVersion)" />
       <Replacement Include="@EmulatorPkgRevision@=$(EmulatorPkgRevision)" />
       <Replacement Include="@HostOS@=$(HostOS)" />
diff --git a/eng/README.md b/eng/README.md
@@ -0,0 +1,57 @@
+The `eng` folder contains and is used by parts of the https://github.com/dotnet/arcade SDK.
+
+## Dependency Management
+The Arcade SDK contains a tool known as [`darc`][0], which can be used to manage
+and query the relationships between repositories in the dotnet ecosystem.
+
+The `eng/Version.Details.xml` and `eng/Versions.props` files contain information
+about the products and tooling that this repository depends on.
+
+Many dotnet repositories use a publishing workflow that will push build artifact data
+to a central location known as the "Build Asset Registry".  This data includes
+a "channel" association, which is used to determine when an update for a particular
+product or tool is available.  Local updates and automatic update "subscriptions"
+compare the version files in the repository against the versions avalable in the
+channel that you are interested in.  The `darc` tool is used facilitate these updates.
+
+To work with `darc` locally, see the [setting up your darc client docs][1].
+You'll need to run a script in the dotnet/arcade repo to install the dotnet global
+tool, join the `arcade-contrib` GitHub team, and run the [`darc authenticate`][2]
+command to add the PATs required by the tool.
+
+The GitHub PAT that you add must have the full `repo` scope enabled if you want to
+work with any of the `subcription` commands.  Subscriptions control the automated
+creation of dependency update pull requests.
+
+
+To add a new dependency, run the [`darc add-dependency`][3] command at the root
+of the repository:
+```
+darc add-dependency -n Microsoft.NetCore.App.Runtime.android-arm64 -t product -v 6.0.0-preview.2.21154.6 -r https://github.com/dotnet/runtime
+```
+
+To update all dependencies, use the [`darc update-dependencies`][4] command:
+```
+darc update-dependencies --channel ".NET 6"
+```
+
+To configure automatic updates, use the [`darc add-subscription`][5] command
+to enroll a target repo/branch into updates from a particular channel:
+```
+darc add-subscription --channel ".NET 6" --source-repo https://github.com/dotnet/installer --target-repo https://github.com/xamarin/xamarin-android --target-branch main --update-frequency everyWeek --standard-automerge
+```
+
+Once a subscription is configured, pull requests will be created automatically
+by the dotnet Maestro bot whenever dependency updates are available.
+
+Subscriptions need to be manually managed at this time.  For example, when a
+release branch is created, someone with `darc` installed locally will need to
+run the `add-subscription` command to configure updates against that new branch.
+
+
+[0]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md
+[1]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#setting-up-your-darc-client
+[2]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#authenticate
+[3]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#add-dependency
+[4]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#update-dependencies
+[5]: https://github.com/dotnet/arcade/blob/ea609b8e036359934332480de9336d98fcbb3f91/Documentation/Darc.md#add-subscription
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -0,0 +1,12 @@
+<Dependencies>
+  <ProductDependencies>
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.3.21168.18">
+      <Uri>https://github.com/dotnet/installer</Uri>
+      <Sha>823c1dfceb916ff19de20c7ddccab0ea145508a3</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.ILLink" Version="6.0.100-preview.2.21168.1">
+      <Uri>https://github.com/mono/linker</Uri>
+      <Sha>9eff8c6ce48cb15cafb8eef4aaf853675b05f9d9</Sha>
+    </Dependency>
+  </ProductDependencies>
+</Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -0,0 +1,11 @@
+<Project>
+  <!--Package versions-->
+  <PropertyGroup>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.3.21168.18</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftNETILLinkPackageVersion>6.0.100-preview.2.21168.1</MicrosoftNETILLinkPackageVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- Trim all characters after first `-` or `+` is encountered. -->
+    <DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$([System.Text.RegularExpressions.Regex]::Replace($(MicrosoftDotnetSdkInternalPackageVersion), `[-+].*$`, ""))</DotNetPreviewVersionBand>
+  </PropertyGroup>
+</Project>
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
-    "msbuild-sdks": {
-        "Microsoft.Build.NoTargets": "2.0.1",
-        "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20555.6",
-        "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20120.1"
-    }
-}
+  "msbuild-sdks": {
+    "Microsoft.Build.NoTargets": "2.0.1",
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20555.6",
+    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20120.1"
+  }
+}
diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
@@ -7,7 +7,7 @@
     <OutputPath>$(XAInstallPrefix)xbuild\Xamarin\Android\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.ILLink" Version="$(ILLinkVersionFull)" />
+    <PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkPackageVersion)" />
     <ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj" SkipGetTargetFrameworkProperties="true" AdditionalProperties="TargetFramework=netcoreapp3.1" />
 
     <Compile Include="..\Xamarin.Android.Build.Tasks\obj\$(Configuration)\Profile.g.cs" Link="Profile.g.cs" />
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ protected override async Task<bool> Execute (Context context)`
`17`	`17`	`{`
`18`	`18`	`var dotnetPath = context.Properties.GetRequiredValue (KnownProperties.DotNetPreviewPath);`
`19`	`19`	`dotnetPath = dotnetPath.TrimEnd (new char [] { Path.DirectorySeparatorChar });`
`20`		`- var dotnetPreviewVersion = context.Properties.GetRequiredValue (KnownProperties.DotNetPreviewVersionFull);`
	`20`	`+ var dotnetTool = Path.Combine (dotnetPath, "dotnet");`
	`21`	`+ var dotnetPreviewVersion = context.Properties.GetRequiredValue (KnownProperties.MicrosoftDotnetSdkInternalPackageVersion);`
`21`	`22`	`var dotnetTestRuntimeVersion = Configurables.Defaults.DotNetTestRuntimeVersion;`
`22`	`23`
`23`	`24`	`// Delete any custom Microsoft.Android packs that may have been installed by test runs. Other ref/runtime packs will be ignored.`
`@@ -38,8 +39,8 @@ protected override async Task<bool> Execute (Context context)`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
`41`		`- if (Directory.Exists (dotnetPath)) {`
`42`		`- if (!TestDotNetSdk (dotnetPath)) {`
	`42`	`+ if (File.Exists (dotnetTool)) {`
	`43`	`+ if (!TestDotNetSdk (dotnetTool)) {`
`43`	`44`	Log.WarningLine ($"Attempt to run `dotnet --version` failed, reinstalling the SDK.");
`44`	`45`	`Utilities.DeleteDirectory (dotnetPath);`
`45`	`46`	`}`
`@@ -55,7 +56,11 @@ protected override async Task<bool> Execute (Context context)`
`55`	`56`	`return false;`
`56`	`57`	`}`
`57`	`58`
`58`		`- return true;`
	`59`	`+ // Install runtime packs associated with the SDK previously installed.`
	`60`	`+ var packageDownloadProj = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "build-tools", "xaprepare", "xaprepare", "package-download.proj");`
	`61`	`+ var logPath = Path.Combine (Configurables.Paths.BuildBinDir, $"msbuild-{context.BuildTimeStamp}-download-runtime-packs.binlog");`
	`62`	`+ return Utilities.RunCommand (dotnetTool, new string [] { "restore", $"-p:DotNetRuntimePacksVersion={context.BundledPreviewRuntimePackVersion}",`
	`63`	`+ ProcessRunner.QuoteArgument (packageDownloadProj), ProcessRunner.QuoteArgument ($"-bl:{logPath}") });`
`59`	`64`	`}`
`60`	`65`
`61`	`66`	`async Task<bool> InstallDotNetAsync (Context context, string dotnetPath, string version, bool runtimeOnly = false)`
`@@ -122,9 +127,9 @@ async Task<bool> InstallDotNetAsync (Context context, string dotnetPath, string`
`122`	`127`	`}`
`123`	`128`	`}`
`124`	`129`
`125`		`- bool TestDotNetSdk (string dotnetPath)`
	`130`	`+ bool TestDotNetSdk (string dotnetTool)`
`126`	`131`	`{`
`127`		`- return Utilities.RunCommand (Path.Combine (dotnetPath, "dotnet"), new string [] { "--version" });`
	`132`	`+ return Utilities.RunCommand (dotnetTool, new string [] { "--version" });`
`128`	`133`	`}`
`129`	`134`
`130`	`135`	`}`