Skip to content

Commit 913c9cc

Browse files
committed
Update MavenNet.
1 parent 7eb71ab commit 913c9cc

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

build-tools/installers/create-installers.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
<_MSBuildFiles Include="@(_LocalizationLanguages->'$(MicrosoftAndroidSdkOutDir)%(Identity)\libZipSharp.resources.dll')" />
149149
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)libZipSharp.pdb" />
150150
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)MavenNet.dll" />
151+
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)MavenNet.pdb" />
151152
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Unix.dll" />
152153
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Unix.dll.config" ExcludeFromAndroidNETSdk="true" />
153154
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Mono.Unix.pdb" />

src/Xamarin.Android.Build.Tasks/Tasks/MavenDownloadTask.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public async override System.Threading.Tasks.Task RunTaskAsync ()
7575
if (repository is null)
7676
return null;
7777

78-
artifact.SetRepository (repository);
78+
artifact.Repository = repository;
7979

8080
// Download artifact
8181
var artifact_file = await MavenExtensions.DownloadPayload (artifact, MavenCacheDirectory, Log, CancellationToken);
@@ -116,7 +116,7 @@ public async override System.Threading.Tasks.Task RunTaskAsync ()
116116
if (repository is null)
117117
return null;
118118

119-
artifact.SetRepository (repository);
119+
artifact.Repository = repository;
120120

121121
// Download POM
122122
var pom_file = await MavenExtensions.DownloadPom (artifact, MavenCacheDirectory, Log, CancellationToken);

src/Xamarin.Android.Build.Tasks/Utilities/MavenExtensions.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ public static T [] OrEmpty<T> (this T []? value)
4444
return artifact;
4545
}
4646

47-
// TODO: Fix this in MavenNet
48-
public static void SetRepository (this Artifact artifact, MavenRepository repository)
49-
{
50-
var method = artifact.GetType ().GetProperty ("Repository");
51-
52-
method.GetSetMethod (true).Invoke (artifact, new [] { repository });
53-
}
54-
5547
public static Project ParsePom (string pomFile)
5648
{
5749
Project result = null;

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<ItemGroup>
3838
<PackageReference Include="ILRepack" Version="2.0.18" />
3939
<PackageReference Include="Irony" />
40-
<PackageReference Include="MavenNet" Version="2.2.13" />
40+
<PackageReference Include="MavenNet" Version="2.2.14" GeneratePathProperty="true" />
4141
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
4242
<PackageReference Include="System.CodeDom" />
4343
<PackageReference Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,8 @@
309309
<_ExtraPackageTarget Include="$(OutputPath)\Xamarin.Build.AsyncTask.pdb" />
310310
<_ExtraPackageSource Include="$(PkgMono_Unix)\lib\$(TargetFrameworkNETStandard)\Mono.Unix.pdb" />
311311
<_ExtraPackageTarget Include="$(OutputPath)\Mono.Unix.pdb" />
312+
<_ExtraPackageSource Include="$(PkgMavenNet)\lib\netstandard2.0\MavenNet.pdb" />
313+
<_ExtraPackageTarget Include="$(OutputPath)\MavenNet.pdb" />
312314

313315
<_ExtraPackageSource Include="$(MSBuildThisFileDirectory)\Resources\Mono.Unix.dll.config" />
314316
<_ExtraPackageTarget Include="$(OutputPath)\Mono.Unix.dll.config" />

0 commit comments

Comments
 (0)