[build] Remove NuGet.exe provisioning (#8506)

Our build requires the .NET SDK, and NuGet operations should now be performed by `dotnet build` and `dotnet nuget` invocations. We no longer need to install an out of date NuGet.exe.
dotnet · Nov 15, 2023 · 3f2b090 · 3f2b090
1 parent df08bb3
commit 3f2b090
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 66 deletions.
diff --git a/build-tools/xaprepare/xaprepare/Application/Scenario.cs b/build-tools/xaprepare/xaprepare/Application/Scenario.cs
@@ -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)
 		{}

diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
@@ -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");
@@ -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");

diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Arch.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Arch.cs
@@ -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"),

diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.DebianCommon.cs
@@ -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"),

diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Fedora.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Fedora.cs
@@ -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"),

diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Gentoo.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/Linux.Gentoo.cs
@@ -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"),

diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_DownloadNuGet.cs b/build-tools/xaprepare/xaprepare/Steps/Step_DownloadNuGet.cs
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Xamarin.ProjectTools.csproj
@@ -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>