From d411aee43330d371f9978fac40896b021c8442c7 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Tue, 14 Jun 2022 09:18:48 -0500
Subject: [PATCH 1/2] [Xamarin.Build.Download] Support pre-release package ids.

---
 .../source/Xamarin.Build.Download/DownloadUtils.cs            | 4 ++--
 .../Xamarin.Build.Download/Xamarin.Build.Download.csproj      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/DownloadUtils.cs b/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/DownloadUtils.cs
index 869c536a2a..6bc8d5d227 100644
--- a/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/DownloadUtils.cs
+++ b/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/DownloadUtils.cs
@@ -197,9 +197,9 @@ public static string GetCacheDir (string overrideCacheDir = null)
 		//VERSION:
 		// * components separated by periods
 		// * each component must consist of letters and numbers
-		//
+		// * optional hyphen and pre-release id (eg: '-beta01')
 		static readonly Regex idRegex = new Regex (
-			@"[A-Za-z]+[A-Za-z\d\._]*[A-Za-z\d]+-[A-Za-z\d]+(\.[A-Za-z\d]+)*(/[A-Za-z]+[A-Za-z\d\._]*[A-Za-z\d]+)?"
+			@"[A-Za-z]+[A-Za-z\d\._]*[A-Za-z\d]+-[A-Za-z\d]+(\.[A-Za-z\d]+)*(/[A-Za-z]+[A-Za-z\d\._]*[A-Za-z\d]+)?(-\w*)?"
 			,
 			RegexOptions.Compiled
 		);
diff --git a/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj b/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj
index cc7987564f..ad025ff1f8 100644
--- a/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj
+++ b/Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj
@@ -8,7 +8,7 @@
 
     <PackageId>Xamarin.Build.Download</PackageId>
     <Title>Xamarin Build-time Download Support</Title>
-    <PackageVersion>0.11.2</PackageVersion>
+    <PackageVersion>0.11.3</PackageVersion>
     <Authors>Microsoft</Authors>
     <Owners>Microsoft</Owners>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?linkid=865061</PackageProjectUrl>

From 0f3a9b8bccf5cac1f5bb040a7381d3a543f8036a Mon Sep 17 00:00:00 2001
From: moljac <mcvjetko@holisticware.net>
Date: Thu, 28 Jul 2022 10:39:14 +0200
Subject: [PATCH 2/2] TFM changed (net6)

---
 .../Xamarin.Build.Download.Tests.csproj                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj b/Util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj
index 4689d14599..52ccbc0c80 100644
--- a/Util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj
+++ b/Util/Xamarin.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
@@ -25,4 +25,4 @@
     <ProjectReference Include="..\Xamarin.Build.Download\Xamarin.Build.Download.csproj" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>