Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[build] Remove NuGet.exe provisioning #8506

Merged
merged 1 commit into from
Nov 15, 2023
Merged

[build] Remove NuGet.exe provisioning #8506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions build-tools/xaprepare/xaprepare/Application/Scenario.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ public void Init (Context context)
}

protected virtual void AddStartSteps (Context context)
{
// These are steps that have to be executed by all the scenarios
Steps.Add (new Step_DownloadNuGet ());
}
{}

protected virtual void AddEndSteps (Context context)
{}
Expand Down
3 changes: 0 additions & 3 deletions build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ public static partial class Urls
/// </summary>
public static readonly Uri AndroidToolchain_AndroidUri = new Uri ("https://dl.google.com/android/repository/");

public static readonly Uri NugetUri = new Uri ("https://dist.nuget.org/win-x86-commandline/v6.0.0/nuget.exe");

public static Uri MonoArchive_BaseUri = new Uri ("https://xamjenkinsartifact.azureedge.net/mono-sdks/");

public static Uri BinutilsArchive = new Uri ($"https://github.com/xamarin/xamarin-android-binutils/releases/download/{BinutilsVersion}/xamarin-android-toolchain-{BinutilsVersion}.7z");
Expand Down Expand Up @@ -238,7 +236,6 @@ public static partial class Paths
public static readonly string BuildToolsScriptsDir = Path.Combine (BuildToolsDir, "scripts");
public static readonly string BinDirRoot = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "bin");
public static readonly string ExternalDir = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, "external");
public static readonly string LocalNugetPath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, ".nuget", "NuGet.exe");
public static readonly string ExternalGitDepsFilePath = Path.Combine (BuildPaths.XamarinAndroidSourceRoot, ".external");
public static readonly string ExternalGitDepsDestDir = ExternalDir;
public static readonly string ExternalXamarinAndroidToolsSln = Path.Combine (ExternalDir, "xamarin-android-tools", "Xamarin.Android.Tools.sln");
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Arch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class LinuxArch : Linux
new ArchLinuxProgram ("libzip"),
new ArchLinuxProgram ("m4"),
new ArchLinuxProgram ("make"),
new ArchLinuxProgram ("nuget"),
new ArchLinuxProgram ("patch"),
new ArchLinuxProgram ("pkg-config"),
new ArchLinuxProgram ("referenceassemblies-pcl"),
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ abstract class LinuxDebianCommon : Linux
new DebianLinuxProgram ("linux-libc-dev"),
new DebianLinuxProgram ("make"),
new DebianLinuxProgram ("ninja-build", "ninja"),
new DebianLinuxProgram ("nuget"),
new DebianLinuxProgram ("p7zip-full", "7z"),
new DebianLinuxProgram ("sqlite3"),
new DebianLinuxProgram ("vim-common"),
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Fedora.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class LinuxFedora : Linux
new FedoraLinuxProgram ("libzip"),
new FedoraLinuxProgram ("m4"),
new FedoraLinuxProgram ("make"),
new FedoraLinuxProgram ("nuget"),
new FedoraLinuxProgram ("patch"),
new FedoraLinuxProgram ("pkgconf"),
new FedoraLinuxProgram ("referenceassemblies-pcl"),
Expand Down
1 change: 0 additions & 1 deletion build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Gentoo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class LinuxGentoo : Linux
new GentooLinuxProgram ("dev-libs/libzip"),
new GentooLinuxProgram ("sys-devel/m4"),
new GentooLinuxProgram ("sys-devel/make"),
//new GentooLinuxProgram ("nuget"),
new GentooLinuxProgram ("sys-devel/patch"),
new GentooLinuxProgram ("dev-util/pkgconf"),
//new GentooLinuxProgram ("referenceassemblies-pcl"),
Expand Down
51 changes: 0 additions & 51 deletions build-tools/xaprepare/xaprepare/Steps/Step_DownloadNuGet.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\..\.nuget\NuGet.exe">
<Link>..\nuget\NuGet.exe</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="FrameworkPath.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down
Loading