Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 6cd974f

Browse files
committed
Fix v4 nupkg not being built
1 parent 3450e6b commit 6cd974f

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

build.cake

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LogSystemInfo ();
1717
var TARGET = Argument ("t", Argument ("target", "Default"));
1818
var BUILD_CONFIG = Argument ("config", "Release");
1919

20-
var NUGET_VERSION = "25.4.0-rc1";
20+
var NUGET_VERSION = "25.4.0";
2121
var COMPONENT_VERSION = "25.4.0.0";
2222
var AAR_VERSION = "25.4.0";
2323
var XBD_VERSION = "0.4.6";
@@ -123,6 +123,9 @@ if (IsRunningOnWindows ()) {
123123
MSCORLIB_PATH = MakeAbsolute (DOTNETDIR.Combine("Framework/v4.0.30319/")).FullPath;
124124
}
125125

126+
var nugetInfos = ARTIFACTS.Select (a => new NuGetInfo { NuSpec = "./" + a.ArtifactId + "/nuget/" + a.NugetId + ".nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true }).ToList ();
127+
nugetInfos.Add (new NuGetInfo { NuSpec = "./support-v4/nuget/Xamarin.Android.Support.v4.nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true });
128+
126129
var buildSpec = new BuildSpec {
127130
Libs = new [] {
128131
new DefaultSolutionBuilder {
@@ -155,7 +158,7 @@ var buildSpec = new BuildSpec {
155158
new DefaultSolutionBuilder { SolutionPath = "./animated-vector-drawable/samples/VectorDrawableSample.sln", BuildsOn = BuildPlatforms.Windows | BuildPlatforms.Mac, MaxCpuCount = CPU_COUNT, AlwaysUseMSBuild = USE_MSBUILD_ON_MAC },
156159
},
157160

158-
NuGets = ARTIFACTS.Select (a => new NuGetInfo { NuSpec = "./" + a.ArtifactId + "/nuget/" + a.NugetId + ".nuspec", Version = NUGET_VERSION, RequireLicenseAcceptance = true }).ToArray (),
161+
NuGets = nugetInfos.ToArray (),
159162

160163
Components = new [] {
161164
new Component { ManifestDirectory = "./animated-vector-drawable/component" },
@@ -321,7 +324,10 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
321324

322325
var templateText = FileReadText ("./template.targets");
323326

324-
foreach (var art in ARTIFACTS) {
327+
var nugetArtifacts = ARTIFACTS.ToList ();
328+
nugetArtifacts.Add (new ArtifactInfo (SUPPORT_PKG_NAME, "support-v4", "Xamarin.Android.Support.v4", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION));
329+
330+
foreach (var art in nugetArtifacts) {
325331

326332
var proguardFile = new FilePath(string.Format("./externals/{0}/proguard.txt", art.ArtifactId));
327333

0 commit comments

Comments
 (0)