diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c5f582ebe..1988d76e2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,6 +34,8 @@ resources:
extends:
template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
parameters:
+ settings:
+ networkIsolationPolicy: Permissive, CFSClean, CFSClean2
sdl:
sourceAnalysisPool:
name: $(DncEngInternalBuildPool)
diff --git a/src/Microsoft.Crank.Agent/Startup.cs b/src/Microsoft.Crank.Agent/Startup.cs
index 84e6f70d7..8168a2e88 100644
--- a/src/Microsoft.Crank.Agent/Startup.cs
+++ b/src/Microsoft.Crank.Agent/Startup.cs
@@ -68,7 +68,7 @@ public class Startup
private static readonly string _dotnetInstallShUrl = "https://dot.net/v1/dotnet-install.sh";
private static readonly string _dotnetInstallPs1Url = "https://dot.net/v1/dotnet-install.ps1";
private static readonly string _perfviewUrl = $"https://github.com/Microsoft/perfview/releases/download/{PerfViewVersion}/PerfView.exe";
- private static readonly string _ultraUrl = $"https://www.nuget.org/api/v2/package/ultra/{UltraVersion}";
+ private static readonly string _ultraUrl = $"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/flat2/ultra/{UltraVersion}/ultra.{UltraVersion}.nupkg";
private static readonly string _aspnet8FlatContainerUrl = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/flat2/Microsoft.AspNetCore.App.Runtime.linux-x64/index.json";
private static readonly string _aspnet9FlatContainerUrl = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/flat2/Microsoft.AspNetCore.App.Runtime.linux-x64/index.json";
@@ -4156,7 +4156,9 @@ internal static void PatchNuGetConfig(string benchmarkedApp)
configPath = Path.Combine(benchmarkedApp, "NuGet.config");
doc = new XDocument(
new XElement("configuration",
- new XElement("packageSources")
+ new XElement("packageSources",
+ new XElement("clear")
+ )
)
);
Log.Info($"Creating new NuGet.config at {configPath}");
@@ -4177,6 +4179,12 @@ internal static void PatchNuGetConfig(string benchmarkedApp)
root.Add(packageSources);
}
+ // Ensure is present to prevent inheriting nuget.org from machine/user-level configs
+ if (packageSources.Element("clear") == null)
+ {
+ packageSources.AddFirst(new XElement("clear"));
+ }
+
// Track which source keys we actually add (for packageSourceMapping)
var addedSourceKeys = new List();
@@ -6376,6 +6384,7 @@ public static async Task EnsureDotnetInstallExistsAsync()
File.WriteAllText(rootNugetConfig, @"
+
diff --git a/src/Microsoft.Crank.Controller/VersionChecker.cs b/src/Microsoft.Crank.Controller/VersionChecker.cs
index 8bbf09896..995c984f5 100644
--- a/src/Microsoft.Crank.Controller/VersionChecker.cs
+++ b/src/Microsoft.Crank.Controller/VersionChecker.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Crank.Controller
public static class VersionChecker
{
static TimeSpan CacheTimeout = TimeSpan.FromDays(1);
- static string PackageVersionUrl = "https://api.nuget.org/v3-flatcontainer/microsoft.crank.controller/index.json";
+ static string PackageVersionUrl = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/flat2/microsoft.crank.controller/index.json";
public static async Task CheckUpdateAsync(HttpClient client)
{