Merge pull request #1384 from xamarin/xbd-pre-release

[Xamarin.Build.Download] Support pre-release package ids.

Author: moljac

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>
+</Project>

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
 		);

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>