Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

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

Merged
merged 2 commits into from
Jul 29, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d411aee
[Xamarin.Build.Download] Support pre-release package ids.
jpobst Jun 14, 2022
0f3a9b8
TFM changed (net6)
moljac Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...in.Build.Download/source/Xamarin.Build.Download.Tests/Xamarin.Build.Download.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>net6</TargetFramework>
Copy link
Member

@jonathanpeppers jonathanpeppers Jul 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, didn't realize this worked, most people put:

Suggested change
<TargetFramework>net6</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

Copy link
Contributor

@moljac moljac Jul 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

net6 works, but you were right net6.0 is preferred.

<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

Expand All @@ -25,4 +25,4 @@
<ProjectReference Include="..\Xamarin.Build.Download\Xamarin.Build.Download.csproj" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions Util/Xamarin.Build.Download/source/Xamarin.Build.Download/DownloadUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down
2 changes: 1 addition & 1 deletion Util/Xamarin.Build.Download/source/Xamarin.Build.Download/Xamarin.Build.Download.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down