diff --git a/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs b/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
index 041dac2ba5e..10e6d026321 100644
--- a/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
@@ -20,6 +20,10 @@ public static class ContainerResourceBuilderExtensions
     /// <returns>The <see cref="IResourceBuilder{T}"/> for chaining.</returns>
     public static IResourceBuilder<ContainerResource> AddContainer(this IDistributedApplicationBuilder builder, [ResourceName] string name, string image)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(image);
+
         return builder.AddContainer(name, image, "latest");
     }
 
@@ -33,6 +37,11 @@ public static IResourceBuilder<ContainerResource> AddContainer(this IDistributed
     /// <returns>The <see cref="IResourceBuilder{T}"/> for chaining.</returns>
     public static IResourceBuilder<ContainerResource> AddContainer(this IDistributedApplicationBuilder builder, [ResourceName] string name, string image, string tag)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(image);
+        ArgumentNullException.ThrowIfNull(tag);
+
         var container = new ContainerResource(name);
         return builder.AddResource(container)
                       .WithImage(image, tag);
@@ -47,8 +56,11 @@ public static IResourceBuilder<ContainerResource> AddContainer(this IDistributed
     /// <param name="target">The target path where the volume is mounted in the container.</param>
     /// <param name="isReadOnly">A flag that indicates if the volume should be mounted as read-only.</param>
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
-    public static IResourceBuilder<T> WithVolume<T>(this IResourceBuilder<T> builder, string name, string target, bool isReadOnly = false) where T : ContainerResource
+    public static IResourceBuilder<T> WithVolume<T>(this IResourceBuilder<T> builder, string? name, string target, bool isReadOnly = false) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(target);
+
         var annotation = new ContainerMountAnnotation(name, target, ContainerMountType.Volume, isReadOnly);
         return builder.WithAnnotation(annotation);
     }
@@ -62,6 +74,9 @@ public static IResourceBuilder<T> WithVolume<T>(this IResourceBuilder<T> builder
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithVolume<T>(this IResourceBuilder<T> builder, string target) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(target);
+
         var annotation = new ContainerMountAnnotation(null, target, ContainerMountType.Volume, false);
         return builder.WithAnnotation(annotation);
     }
@@ -77,6 +92,10 @@ public static IResourceBuilder<T> WithVolume<T>(this IResourceBuilder<T> builder
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithBindMount<T>(this IResourceBuilder<T> builder, string source, string target, bool isReadOnly = false) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(source);
+        ArgumentNullException.ThrowIfNull(target);
+
         var annotation = new ContainerMountAnnotation(Path.GetFullPath(source, builder.ApplicationBuilder.AppHostDirectory), target, ContainerMountType.BindMount, isReadOnly);
         return builder.WithAnnotation(annotation);
     }
@@ -90,6 +109,9 @@ public static IResourceBuilder<T> WithBindMount<T>(this IResourceBuilder<T> buil
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithEntrypoint<T>(this IResourceBuilder<T> builder, string entrypoint) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(entrypoint);
+
         builder.Resource.Entrypoint = entrypoint;
         return builder;
     }
@@ -103,6 +125,9 @@ public static IResourceBuilder<T> WithEntrypoint<T>(this IResourceBuilder<T> bui
     /// <returns></returns>
     public static IResourceBuilder<T> WithImageTag<T>(this IResourceBuilder<T> builder, string tag) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(tag);
+
         if (builder.Resource.Annotations.OfType<ContainerImageAnnotation>().LastOrDefault() is { } existingImageAnnotation)
         {
             existingImageAnnotation.Tag = tag;
@@ -119,8 +144,10 @@ public static IResourceBuilder<T> WithImageTag<T>(this IResourceBuilder<T> build
     /// <param name="builder">Builder for the container resource.</param>
     /// <param name="registry">Registry value.</param>
     /// <returns></returns>
-    public static IResourceBuilder<T> WithImageRegistry<T>(this IResourceBuilder<T> builder, string registry) where T : ContainerResource
+    public static IResourceBuilder<T> WithImageRegistry<T>(this IResourceBuilder<T> builder, string? registry) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         if (builder.Resource.Annotations.OfType<ContainerImageAnnotation>().LastOrDefault() is { } existingImageAnnotation)
         {
             existingImageAnnotation.Registry = registry;
@@ -140,6 +167,10 @@ public static IResourceBuilder<T> WithImageRegistry<T>(this IResourceBuilder<T>
     /// <returns></returns>
     public static IResourceBuilder<T> WithImage<T>(this IResourceBuilder<T> builder, string image, string tag = "latest") where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(image);
+        ArgumentNullException.ThrowIfNull(tag);
+
         if (builder.Resource.Annotations.OfType<ContainerImageAnnotation>().LastOrDefault() is { } existingImageAnnotation)
         {
             existingImageAnnotation.Image = image;
@@ -162,6 +193,9 @@ public static IResourceBuilder<T> WithImage<T>(this IResourceBuilder<T> builder,
     /// <returns></returns>
     public static IResourceBuilder<T> WithImageSHA256<T>(this IResourceBuilder<T> builder, string sha256) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(sha256);
+
         if (builder.Resource.Annotations.OfType<ContainerImageAnnotation>().LastOrDefault() is { } existingImageAnnotation)
         {
             existingImageAnnotation.SHA256 = sha256;
@@ -183,6 +217,8 @@ public static IResourceBuilder<T> WithImageSHA256<T>(this IResourceBuilder<T> bu
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithContainerRuntimeArgs<T>(this IResourceBuilder<T> builder, params string[] args) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithContainerRuntimeArgs(context => context.Args.AddRange(args));
     }
 
@@ -198,6 +234,9 @@ public static IResourceBuilder<T> WithContainerRuntimeArgs<T>(this IResourceBuil
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithContainerRuntimeArgs<T>(this IResourceBuilder<T> builder, Action<ContainerRuntimeArgsCallbackContext> callback) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         return builder.WithContainerRuntimeArgs(context =>
         {
             callback(context);
@@ -217,6 +256,9 @@ public static IResourceBuilder<T> WithContainerRuntimeArgs<T>(this IResourceBuil
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithContainerRuntimeArgs<T>(this IResourceBuilder<T> builder, Func<ContainerRuntimeArgsCallbackContext, Task> callback) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         var annotation = new ContainerRuntimeArgsCallbackAnnotation(callback);
         return builder.WithAnnotation(annotation);
     }
@@ -238,6 +280,8 @@ public static IResourceBuilder<T> WithContainerRuntimeArgs<T>(this IResourceBuil
     /// </example>
     public static IResourceBuilder<T> WithLifetime<T>(this IResourceBuilder<T> builder, ContainerLifetime lifetime) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithAnnotation(new ContainerLifetimeAnnotation { Lifetime = lifetime }, ResourceAnnotationMutationBehavior.Replace);
     }
 
@@ -253,6 +297,8 @@ private static IResourceBuilder<T> ThrowResourceIsNotContainer<T>(IResourceBuild
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> PublishAsContainer<T>(this IResourceBuilder<T> builder) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithManifestPublishingCallback(context => context.WriteContainerAsync(builder.Resource));
     }
 
@@ -293,6 +339,7 @@ public static IResourceBuilder<T> PublishAsContainer<T>(this IResourceBuilder<T>
     /// </example>
     public static IResourceBuilder<T> WithDockerfile<T>(this IResourceBuilder<T> builder, string contextPath, string? dockerfilePath = null, string? stage = null) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
         ArgumentException.ThrowIfNullOrEmpty(contextPath);
 
         var fullyQualifiedContextPath = Path.GetFullPath(contextPath, builder.ApplicationBuilder.AppHostDirectory);
@@ -314,7 +361,7 @@ public static IResourceBuilder<T> WithDockerfile<T>(this IResourceBuilder<T> bui
         var imageName = builder.GenerateImageName();
         var annotation = new DockerfileBuildAnnotation(fullyQualifiedContextPath, fullyQualifiedDockerfilePath, stage);
         return builder.WithAnnotation(annotation, ResourceAnnotationMutationBehavior.Replace)
-                      .WithImageRegistry(null!)
+                      .WithImageRegistry(registry: null)
                       .WithImage(imageName)
                       .WithImageTag("latest");
     }
@@ -350,6 +397,10 @@ public static IResourceBuilder<T> WithDockerfile<T>(this IResourceBuilder<T> bui
     /// </example>
     public static IResourceBuilder<ContainerResource> AddDockerfile(this IDistributedApplicationBuilder builder, [ResourceName] string name, string contextPath, string? dockerfilePath = null, string? stage = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(contextPath);
+
         return builder.AddContainer(name, "placeholder") // Image name will be replaced by WithDockerfile.
                       .WithDockerfile(contextPath, dockerfilePath, stage);
     }
@@ -369,6 +420,9 @@ public static IResourceBuilder<ContainerResource> AddDockerfile(this IDistribute
     /// <returns>The resource bulder for the container resource.</returns>
     public static IResourceBuilder<T> WithContainerName<T>(this IResourceBuilder<T> builder, string name) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         return builder.WithAnnotation(new ContainerNameAnnotation { Name = name }, ResourceAnnotationMutationBehavior.Replace);
     }
 
@@ -402,6 +456,7 @@ public static IResourceBuilder<T> WithContainerName<T>(this IResourceBuilder<T>
     /// </example>
     public static IResourceBuilder<T> WithBuildArg<T>(this IResourceBuilder<T> builder, string name, object value) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
         ArgumentException.ThrowIfNullOrEmpty(name);
         ArgumentNullException.ThrowIfNull(value);
 
@@ -448,6 +503,10 @@ public static IResourceBuilder<T> WithBuildArg<T>(this IResourceBuilder<T> build
     /// </example>
     public static IResourceBuilder<T> WithBuildArg<T>(this IResourceBuilder<T> builder, string name, IResourceBuilder<ParameterResource> value) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(value);
+
         if (value.Resource.Secret)
         {
             throw new InvalidOperationException("Cannot add secret parameter as a build argument. Use WithSecretBuildArg instead.");
@@ -487,6 +546,7 @@ public static IResourceBuilder<T> WithBuildArg<T>(this IResourceBuilder<T> build
     /// </example>
     public static IResourceBuilder<T> WithBuildSecret<T>(this IResourceBuilder<T> builder, string name, IResourceBuilder<ParameterResource> value) where T : ContainerResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
         ArgumentException.ThrowIfNullOrEmpty(name);
         ArgumentNullException.ThrowIfNull(value);
 
diff --git a/src/Aspire.Hosting/ContainerResourceExtensions.cs b/src/Aspire.Hosting/ContainerResourceExtensions.cs
index 5c520aea8be..ea48e0b5575 100644
--- a/src/Aspire.Hosting/ContainerResourceExtensions.cs
+++ b/src/Aspire.Hosting/ContainerResourceExtensions.cs
@@ -17,6 +17,8 @@ public static class ContainerResourceExtensions
     /// <returns>A collection of container resources in the specified distributed application model.</returns>
     public static IEnumerable<IResource> GetContainerResources(this DistributedApplicationModel model)
     {
+        ArgumentNullException.ThrowIfNull(model);
+
         foreach (var resource in model.Resources)
         {
             if (resource.Annotations.OfType<ContainerImageAnnotation>().Any())
@@ -33,6 +35,8 @@ public static IEnumerable<IResource> GetContainerResources(this DistributedAppli
     /// <returns>true if the specified resource is a container resource; otherwise, false.</returns>
     public static bool IsContainer(this IResource resource)
     {
+        ArgumentNullException.ThrowIfNull(resource);
+
         return resource.Annotations.OfType<ContainerImageAnnotation>().Any();
     }
 }
diff --git a/src/Aspire.Hosting/ExecutableResourceBuilderExtensions.cs b/src/Aspire.Hosting/ExecutableResourceBuilderExtensions.cs
index dc402967b10..8c16df8404f 100644
--- a/src/Aspire.Hosting/ExecutableResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ExecutableResourceBuilderExtensions.cs
@@ -23,6 +23,11 @@ public static class ExecutableResourceBuilderExtensions
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<ExecutableResource> AddExecutable(this IDistributedApplicationBuilder builder, [ResourceName] string name, string command, string workingDirectory, params string[]? args)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(command);
+        ArgumentNullException.ThrowIfNull(workingDirectory);
+
         return AddExecutable(builder, name, command, workingDirectory, (object[]?)args);
     }
 
@@ -37,6 +42,11 @@ public static IResourceBuilder<ExecutableResource> AddExecutable(this IDistribut
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<ExecutableResource> AddExecutable(this IDistributedApplicationBuilder builder, [ResourceName] string name, string command, string workingDirectory, params object[]? args)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(command);
+        ArgumentNullException.ThrowIfNull(workingDirectory);
+
         workingDirectory = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(builder.AppHostDirectory, workingDirectory));
 
         var executable = new ExecutableResource(name, command, workingDirectory);
@@ -61,6 +71,8 @@ public static IResourceBuilder<ExecutableResource> AddExecutable(this IDistribut
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> PublishAsDockerFile<T>(this IResourceBuilder<T> builder, IEnumerable<DockerBuildArg>? buildArgs = null) where T : ExecutableResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithManifestPublishingCallback(context => WriteExecutableAsDockerfileResourceAsync(context, builder.Resource, buildArgs));
     }
 
diff --git a/src/Aspire.Hosting/ExecutableResourceExtensions.cs b/src/Aspire.Hosting/ExecutableResourceExtensions.cs
index 5b7604a1ad6..69fccd1f39a 100644
--- a/src/Aspire.Hosting/ExecutableResourceExtensions.cs
+++ b/src/Aspire.Hosting/ExecutableResourceExtensions.cs
@@ -17,6 +17,8 @@ public static class ExecutableResourceExtensions
     /// <returns>An enumerable collection of executable resources.</returns>
     public static IEnumerable<ExecutableResource> GetExecutableResources(this DistributedApplicationModel model)
     {
+        ArgumentNullException.ThrowIfNull(model);
+
         return model.Resources.OfType<ExecutableResource>();
     }
 }
diff --git a/src/Aspire.Hosting/OtlpConfigurationExtensions.cs b/src/Aspire.Hosting/OtlpConfigurationExtensions.cs
index e08c74f94a4..ffed6b77be1 100644
--- a/src/Aspire.Hosting/OtlpConfigurationExtensions.cs
+++ b/src/Aspire.Hosting/OtlpConfigurationExtensions.cs
@@ -27,6 +27,10 @@ public static class OtlpConfigurationExtensions
     /// <param name="environment">The host environment to check if the application is running in development mode.</param>
     public static void AddOtlpEnvironment(IResource resource, IConfiguration configuration, IHostEnvironment environment)
     {
+        ArgumentNullException.ThrowIfNull(resource);
+        ArgumentNullException.ThrowIfNull(configuration);
+        ArgumentNullException.ThrowIfNull(environment);
+
         // Configure OpenTelemetry in projects using environment variables.
         // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md
 
@@ -112,6 +116,8 @@ static void SetOtelEndpointAndProtocol(Dictionary<string, object> environmentVar
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithOtlpExporter<T>(this IResourceBuilder<T> builder) where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         AddOtlpEnvironment(builder.Resource, builder.ApplicationBuilder.Configuration, builder.ApplicationBuilder.Environment);
         return builder;
     }
diff --git a/src/Aspire.Hosting/ParameterResourceBuilderExtensions.cs b/src/Aspire.Hosting/ParameterResourceBuilderExtensions.cs
index ebd8006409f..04473465aae 100644
--- a/src/Aspire.Hosting/ParameterResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ParameterResourceBuilderExtensions.cs
@@ -24,6 +24,9 @@ public static class ParameterResourceBuilderExtensions
     /// <exception cref="DistributedApplicationException"></exception>
     public static IResourceBuilder<ParameterResource> AddParameter(this IDistributedApplicationBuilder builder, [ResourceName] string name, bool secret = false)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         return builder.AddParameter(name, parameterDefault => GetParameterValue(builder.Configuration, name, parameterDefault), secret: secret);
     }
 
@@ -41,6 +44,10 @@ public static IResourceBuilder<ParameterResource> AddParameter(this IDistributed
                                                      Justification = "third parameters are mutually exclusive.")]
     public static IResourceBuilder<ParameterResource> AddParameter(this IDistributedApplicationBuilder builder, [ResourceName] string name, string value, bool publishValueAsDefault = false, bool secret = false)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(value);
+
         return builder.AddParameter(name, () => value, publishValueAsDefault, secret);
     }
 
@@ -58,6 +65,10 @@ public static IResourceBuilder<ParameterResource> AddParameter(this IDistributed
                                                      Justification = "third parameters are mutually exclusive.")]
     public static IResourceBuilder<ParameterResource> AddParameter(this IDistributedApplicationBuilder builder, string name, Func<string> valueGetter, bool publishValueAsDefault = false, bool secret = false)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(valueGetter);
+
         // We don't allow a parameter to be both secret and published, as that would write the secret to the manifest.
         if (publishValueAsDefault && secret)
         {
@@ -83,6 +94,10 @@ public static IResourceBuilder<ParameterResource> AddParameter(this IDistributed
     /// <returns>Resource builder for the parameter.</returns>
     public static IResourceBuilder<ParameterResource> AddParameterFromConfiguration(this IDistributedApplicationBuilder builder, string name, string configurationKey, bool secret = false)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(configurationKey);
+
         return builder.AddParameter(
             name,
             parameterDefault => GetParameterValue(builder.Configuration, name, parameterDefault, configurationKey),
@@ -106,6 +121,10 @@ public static IResourceBuilder<ParameterResource> AddParameterFromConfiguration(
                                                      Justification = "third parameters are mutually exclusive.")]
     public static IResourceBuilder<ParameterResource> AddParameter(this IDistributedApplicationBuilder builder, [ResourceName] string name, ParameterDefault value, bool secret = false, bool persist = false)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(value);
+
         // If it needs persistence, wrap it in a UserSecretsParameterDefault
         if (persist && builder.ExecutionContext.IsRunMode && builder.AppHostAssembly is not null)
         {
@@ -197,6 +216,9 @@ public Task BeforeStartAsync(DistributedApplicationModel appModel, CancellationT
     /// <exception cref="DistributedApplicationException"></exception>
     public static IResourceBuilder<IResourceWithConnectionString> AddConnectionString(this IDistributedApplicationBuilder builder, [ResourceName] string name, string? environmentVariableName = null)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         var parameterBuilder = builder.AddParameter(name, _ =>
         {
             return builder.Configuration.GetConnectionString(name) ?? throw new DistributedApplicationException($"Connection string parameter resource could not be used because connection string '{name}' is missing.");
@@ -217,6 +239,8 @@ public static IResourceBuilder<IResourceWithConnectionString> AddConnectionStrin
     public static IResourceBuilder<T> PublishAsConnectionString<T>(this IResourceBuilder<T> builder)
         where T : ContainerResource, IResourceWithConnectionString
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         ConfigureConnectionStringManifestPublisher(builder);
         return builder;
     }
@@ -227,6 +251,8 @@ public static IResourceBuilder<T> PublishAsConnectionString<T>(this IResourceBui
     /// <param name="builder">The <see cref="IResourceBuilder{T}"/>.</param>
     public static void ConfigureConnectionStringManifestPublisher(IResourceBuilder<IResourceWithConnectionString> builder)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         // Create a parameter resource that we use to write to the manifest
         var parameter = new ParameterResource(builder.Resource.Name, _ => "", secret: true);
         parameter.IsConnectionString = true;
@@ -257,6 +283,9 @@ public static ParameterResource CreateDefaultPasswordParameter(
         bool lower = true, bool upper = true, bool numeric = true, bool special = true,
         int minLower = 0, int minUpper = 0, int minNumeric = 0, int minSpecial = 0)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         var generatedPassword = new GenerateParameterDefault
         {
             MinLength = 22, // enough to give 128 bits of entropy when using the default 67 possible characters. See remarks in GenerateParameterDefault
@@ -287,6 +316,9 @@ public static ParameterResource CreateDefaultPasswordParameter(
     public static ParameterResource CreateGeneratedParameter(
         IDistributedApplicationBuilder builder, string name, bool secret, GenerateParameterDefault parameterDefault)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         var parameterResource = new ParameterResource(name, defaultValue => GetParameterValue(builder.Configuration, name, defaultValue), secret)
         {
             Default = parameterDefault
diff --git a/src/Aspire.Hosting/ProjectResourceBuilderExtensions.cs b/src/Aspire.Hosting/ProjectResourceBuilderExtensions.cs
index be0b4aeb4ec..e63b78081a1 100644
--- a/src/Aspire.Hosting/ProjectResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ProjectResourceBuilderExtensions.cs
@@ -60,6 +60,9 @@ public static class ProjectResourceBuilderExtensions
     /// </example>
     public static IResourceBuilder<ProjectResource> AddProject<TProject>(this IDistributedApplicationBuilder builder, [ResourceName] string name) where TProject : IProjectMetadata, new()
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         return builder.AddProject<TProject>(name, _ => { });
     }
 
@@ -90,6 +93,10 @@ public static class ProjectResourceBuilderExtensions
     /// </example>
     public static IResourceBuilder<ProjectResource> AddProject(this IDistributedApplicationBuilder builder, [ResourceName] string name, string projectPath)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(projectPath);
+
         return builder.AddProject(name, projectPath, _ => { });
     }
 
@@ -133,6 +140,9 @@ public static IResourceBuilder<ProjectResource> AddProject(this IDistributedAppl
     /// </example>
     public static IResourceBuilder<ProjectResource> AddProject<TProject>(this IDistributedApplicationBuilder builder, [ResourceName] string name, string? launchProfileName) where TProject : IProjectMetadata, new()
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         return builder.AddProject<TProject>(name, options =>
         {
             options.ExcludeLaunchProfile = launchProfileName is null;
@@ -168,6 +178,10 @@ public static IResourceBuilder<ProjectResource> AddProject(this IDistributedAppl
     /// </example>
     public static IResourceBuilder<ProjectResource> AddProject(this IDistributedApplicationBuilder builder, [ResourceName] string name, string projectPath, string? launchProfileName)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(projectPath);
+
         return builder.AddProject(name, projectPath, options =>
         {
             options.ExcludeLaunchProfile = launchProfileName is null;
@@ -213,6 +227,10 @@ public static IResourceBuilder<ProjectResource> AddProject(this IDistributedAppl
     /// </example>
     public static IResourceBuilder<ProjectResource> AddProject<TProject>(this IDistributedApplicationBuilder builder, [ResourceName] string name, Action<ProjectResourceOptions> configure) where TProject : IProjectMetadata, new()
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(configure);
+
         var options = new ProjectResourceOptions();
         configure(options);
 
@@ -249,6 +267,11 @@ public static IResourceBuilder<ProjectResource> AddProject(this IDistributedAppl
     /// </example>
     public static IResourceBuilder<ProjectResource> AddProject(this IDistributedApplicationBuilder builder, [ResourceName] string name, string projectPath, Action<ProjectResourceOptions> configure)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(projectPath);
+        ArgumentNullException.ThrowIfNull(configure);
+
         var options = new ProjectResourceOptions();
         configure(options);
 
@@ -539,6 +562,8 @@ EndpointAnnotation GetOrCreateEndpointForScheme(string scheme)
     /// </example>
     public static IResourceBuilder<ProjectResource> WithReplicas(this IResourceBuilder<ProjectResource> builder, int replicas)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         builder.WithAnnotation(new ReplicaAnnotation(replicas));
         return builder;
     }
@@ -571,6 +596,8 @@ public static IResourceBuilder<ProjectResource> WithReplicas(this IResourceBuild
     /// </example>
     public static IResourceBuilder<ProjectResource> DisableForwardedHeaders(this IResourceBuilder<ProjectResource> builder)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         builder.WithAnnotation<DisableForwardedHeadersAnnotation>(ResourceAnnotationMutationBehavior.Replace);
         return builder;
     }
@@ -585,6 +612,9 @@ public static IResourceBuilder<ProjectResource> DisableForwardedHeaders(this IRe
     public static IResourceBuilder<ProjectResource> WithEndpointsInEnvironment(
         this IResourceBuilder<ProjectResource> builder, Func<EndpointAnnotation, bool> filter)
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(filter);
+
         builder.Resource.Annotations.Add(new EndpointEnvironmentInjectionFilterAnnotation(filter));
 
         return builder;
diff --git a/src/Aspire.Hosting/PublicAPI.Shipped.txt b/src/Aspire.Hosting/PublicAPI.Shipped.txt
index dcd312f1fad..993f54cb560 100644
--- a/src/Aspire.Hosting/PublicAPI.Shipped.txt
+++ b/src/Aspire.Hosting/PublicAPI.Shipped.txt
@@ -438,10 +438,8 @@ static Aspire.Hosting.ContainerResourceBuilderExtensions.WithContainerRuntimeArg
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithContainerRuntimeArgs<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, System.Func<Aspire.Hosting.ApplicationModel.ContainerRuntimeArgsCallbackContext!, System.Threading.Tasks.Task!>! callback) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithEntrypoint<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! entrypoint) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithImage<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! image, string! tag = "latest") -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
-static Aspire.Hosting.ContainerResourceBuilderExtensions.WithImageRegistry<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! registry) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithImageSHA256<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! sha256) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithImageTag<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! tag) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
-static Aspire.Hosting.ContainerResourceBuilderExtensions.WithVolume<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! name, string! target, bool isReadOnly = false) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithVolume<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! target) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ContainerResourceExtensions.GetContainerResources(this Aspire.Hosting.ApplicationModel.DistributedApplicationModel! model) -> System.Collections.Generic.IEnumerable<Aspire.Hosting.ApplicationModel.IResource!>!
 static Aspire.Hosting.ContainerResourceExtensions.IsContainer(this Aspire.Hosting.ApplicationModel.IResource! resource) -> bool
diff --git a/src/Aspire.Hosting/PublicAPI.Unshipped.txt b/src/Aspire.Hosting/PublicAPI.Unshipped.txt
index 0c67fb7aaf8..1207d8eeae0 100644
--- a/src/Aspire.Hosting/PublicAPI.Unshipped.txt
+++ b/src/Aspire.Hosting/PublicAPI.Unshipped.txt
@@ -217,7 +217,9 @@ Aspire.Hosting.ApplicationModel.ResourceNotificationService.WaitForResourceAsync
 Aspire.Hosting.ApplicationModel.ResourceNotificationService.WaitForResourceAsync(string! resourceName, System.Collections.Generic.IEnumerable<string!>! targetStates, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<string!>!
 static Aspire.Hosting.ApplicationModel.ResourceExtensions.TryGetAnnotationsIncludingAncestorsOfType<T>(this Aspire.Hosting.ApplicationModel.IResource! resource, out System.Collections.Generic.IEnumerable<T>? result) -> bool
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithContainerName<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string! name) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
+static Aspire.Hosting.ContainerResourceBuilderExtensions.WithImageRegistry<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string? registry) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ContainerResourceBuilderExtensions.WithLifetime<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, Aspire.Hosting.ApplicationModel.ContainerLifetime lifetime) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
+static Aspire.Hosting.ContainerResourceBuilderExtensions.WithVolume<T>(this Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>! builder, string? name, string! target, bool isReadOnly = false) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<T!>!
 static Aspire.Hosting.ParameterResourceBuilderExtensions.AddParameter(this Aspire.Hosting.IDistributedApplicationBuilder! builder, string! name, Aspire.Hosting.ApplicationModel.ParameterDefault! value, bool secret = false, bool persist = false) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.ParameterResource!>!
 static Aspire.Hosting.ParameterResourceBuilderExtensions.AddParameter(this Aspire.Hosting.IDistributedApplicationBuilder! builder, string! name, string! value, bool publishValueAsDefault = false, bool secret = false) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.ParameterResource!>!
 static Aspire.Hosting.ParameterResourceBuilderExtensions.AddParameter(this Aspire.Hosting.IDistributedApplicationBuilder! builder, string! name, System.Func<string!>! valueGetter, bool publishValueAsDefault = false, bool secret = false) -> Aspire.Hosting.ApplicationModel.IResourceBuilder<Aspire.Hosting.ApplicationModel.ParameterResource!>!
diff --git a/src/Aspire.Hosting/ResourceBuilderExtensions.cs b/src/Aspire.Hosting/ResourceBuilderExtensions.cs
index c2457cbae19..4c6e44572fb 100644
--- a/src/Aspire.Hosting/ResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ResourceBuilderExtensions.cs
@@ -28,6 +28,9 @@ public static class ResourceBuilderExtensions
     /// <returns>A resource configured with the specified environment variable.</returns>
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, string? value) where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         return builder.WithAnnotation(new EnvironmentAnnotation(name, value ?? string.Empty));
     }
 
@@ -42,6 +45,9 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, in ReferenceExpression.ExpressionInterpolatedStringHandler value)
         where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+
         var expression = value.GetExpression();
 
         return builder.WithEnvironment(context =>
@@ -61,6 +67,10 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, ReferenceExpression value)
         where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(value);
+
         return builder.WithEnvironment(context =>
         {
             context.EnvironmentVariables[name] = value;
@@ -77,6 +87,10 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
     /// <returns>A resource configured with the specified environment variable.</returns>
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, Func<string> callback) where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(callback);
+
         return builder.WithAnnotation(new EnvironmentCallbackAnnotation(name, callback));
     }
 
@@ -89,6 +103,9 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
     /// <returns>A resource configured with the environment variable callback.</returns>
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, Action<EnvironmentCallbackContext> callback) where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         return builder.WithAnnotation(new EnvironmentCallbackAnnotation(callback));
     }
 
@@ -101,6 +118,9 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
     /// <returns>A resource configured with the environment variable callback.</returns>
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, Func<EnvironmentCallbackContext, Task> callback) where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         return builder.WithAnnotation(new EnvironmentCallbackAnnotation(callback));
     }
 
@@ -114,6 +134,10 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
     /// <returns>A resource configured with the environment variable callback.</returns>
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, EndpointReference endpointReference) where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(endpointReference);
+
         return builder.WithEnvironment(context =>
         {
             context.EnvironmentVariables[name] = endpointReference;
@@ -130,6 +154,10 @@ public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> bu
     /// <returns>A resource configured with the environment variable callback.</returns>
     public static IResourceBuilder<T> WithEnvironment<T>(this IResourceBuilder<T> builder, string name, IResourceBuilder<ParameterResource> parameter) where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(parameter);
+
         return builder.WithEnvironment(context =>
         {
             context.EnvironmentVariables[name] = parameter.Resource;
@@ -150,6 +178,10 @@ public static IResourceBuilder<T> WithEnvironment<T>(
         IResourceBuilder<IResourceWithConnectionString> resource)
         where T : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(envVarName);
+        ArgumentNullException.ThrowIfNull(resource);
+
         return builder.WithEnvironment(context =>
         {
             context.EnvironmentVariables[envVarName] = new ConnectionStringReference(resource.Resource, optional: false);
@@ -165,6 +197,9 @@ public static IResourceBuilder<T> WithEnvironment<T>(
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder, params string[] args) where T : IResourceWithArgs
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(args);
+
         return builder.WithArgs(context => context.Args.AddRange(args));
     }
 
@@ -177,6 +212,9 @@ public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder,
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder, params object[] args) where T : IResourceWithArgs
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(args);
+
         return builder.WithArgs(context => context.Args.AddRange(args));
     }
 
@@ -189,6 +227,9 @@ public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder,
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder, Action<CommandLineArgsCallbackContext> callback) where T : IResourceWithArgs
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         return builder.WithArgs(context =>
         {
             callback(context);
@@ -205,6 +246,9 @@ public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder,
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder, Func<CommandLineArgsCallbackContext, Task> callback) where T : IResourceWithArgs
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         return builder.WithAnnotation(new CommandLineArgsCallbackAnnotation(callback));
     }
 
@@ -217,6 +261,9 @@ public static IResourceBuilder<T> WithArgs<T>(this IResourceBuilder<T> builder,
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithManifestPublishingCallback<T>(this IResourceBuilder<T> builder, Action<ManifestPublishingContext> callback) where T : IResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         // You can only ever have one manifest publishing callback, so it must be a replace operation.
         return builder.WithAnnotation(new ManifestPublishingCallbackAnnotation(callback), ResourceAnnotationMutationBehavior.Replace);
     }
@@ -230,6 +277,9 @@ public static IResourceBuilder<T> WithManifestPublishingCallback<T>(this IResour
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithManifestPublishingCallback<T>(this IResourceBuilder<T> builder, Func<ManifestPublishingContext, Task> callback) where T : IResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(callback);
+
         // You can only ever have one manifest publishing callback, so it must be a replace operation.
         return builder.WithAnnotation(new ManifestPublishingCallbackAnnotation(callback), ResourceAnnotationMutationBehavior.Replace);
     }
@@ -243,6 +293,9 @@ public static IResourceBuilder<T> WithManifestPublishingCallback<T>(this IResour
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> WithConnectionStringRedirection<T>(this IResourceBuilder<T> builder, IResourceWithConnectionString resource) where T : IResourceWithConnectionString
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(resource);
+
         // You can only ever have one manifest publishing callback, so it must be a replace operation.
         return builder.WithAnnotation(new ConnectionStringRedirectAnnotation(resource), ResourceAnnotationMutationBehavior.Replace);
     }
@@ -290,6 +343,9 @@ private static Action<EnvironmentCallbackContext> CreateEndpointReferenceEnviron
     public static IResourceBuilder<TDestination> WithReference<TDestination>(this IResourceBuilder<TDestination> builder, IResourceBuilder<IResourceWithConnectionString> source, string? connectionName = null, bool optional = false)
         where TDestination : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(source);
+
         var resource = source.Resource;
         connectionName ??= resource.Name;
 
@@ -312,6 +368,9 @@ public static IResourceBuilder<TDestination> WithReference<TDestination>(this IR
     public static IResourceBuilder<TDestination> WithReference<TDestination>(this IResourceBuilder<TDestination> builder, IResourceBuilder<IResourceWithServiceDiscovery> source)
         where TDestination : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(source);
+
         ApplyEndpoints(builder, source.Resource);
         return builder;
     }
@@ -328,6 +387,10 @@ public static IResourceBuilder<TDestination> WithReference<TDestination>(this IR
     public static IResourceBuilder<TDestination> WithReference<TDestination>(this IResourceBuilder<TDestination> builder, string name, Uri uri)
         where TDestination : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(uri);
+
         if (!uri.IsAbsoluteUri)
         {
             throw new InvalidOperationException("The uri for service reference must be absolute.");
@@ -352,6 +415,9 @@ public static IResourceBuilder<TDestination> WithReference<TDestination>(this IR
     public static IResourceBuilder<TDestination> WithReference<TDestination>(this IResourceBuilder<TDestination> builder, EndpointReference endpointReference)
         where TDestination : IResourceWithEnvironment
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(endpointReference);
+
         ApplyEndpoints(builder, endpointReference.Resource, endpointReference.EndpointName);
         return builder;
     }
@@ -399,6 +465,10 @@ private static void ApplyEndpoints<T>(this IResourceBuilder<T> builder, IResourc
     [System.Diagnostics.CodeAnalysis.SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "<Pending>")]
     public static IResourceBuilder<T> WithEndpoint<T>(this IResourceBuilder<T> builder, [EndpointName] string endpointName, Action<EndpointAnnotation> callback, bool createIfNotExists = true) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(endpointName);
+        ArgumentNullException.ThrowIfNull(callback);
+
         var endpoint = builder.Resource.Annotations
             .OfType<EndpointAnnotation>()
             .Where(ea => StringComparers.EndpointAnnotationName.Equals(ea.Name, endpointName))
@@ -441,6 +511,8 @@ public static IResourceBuilder<T> WithEndpoint<T>(this IResourceBuilder<T> build
     [System.Diagnostics.CodeAnalysis.SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "<Pending>")]
     public static IResourceBuilder<T> WithEndpoint<T>(this IResourceBuilder<T> builder, int? port = null, int? targetPort = null, string? scheme = null, [EndpointName] string? name = null, string? env = null, bool isProxied = true, bool? isExternal = null) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         var annotation = new EndpointAnnotation(
             protocol: ProtocolType.Tcp,
             uriScheme: scheme,
@@ -486,6 +558,8 @@ public static IResourceBuilder<T> WithEndpoint<T>(this IResourceBuilder<T> build
     /// <exception cref="DistributedApplicationException">Throws an exception if an endpoint with the same name already exists on the specified resource.</exception>
     public static IResourceBuilder<T> WithHttpEndpoint<T>(this IResourceBuilder<T> builder, int? port = null, int? targetPort = null, [EndpointName] string? name = null, string? env = null, bool isProxied = true) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithEndpoint(targetPort: targetPort, port: port, scheme: "http", name: name, env: env, isProxied: isProxied);
     }
 
@@ -504,6 +578,8 @@ public static IResourceBuilder<T> WithHttpEndpoint<T>(this IResourceBuilder<T> b
     /// <exception cref="DistributedApplicationException">Throws an exception if an endpoint with the same name already exists on the specified resource.</exception>
     public static IResourceBuilder<T> WithHttpsEndpoint<T>(this IResourceBuilder<T> builder, int? port = null, int? targetPort = null, [EndpointName] string? name = null, string? env = null, bool isProxied = true) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithEndpoint(targetPort: targetPort, port: port, scheme: "https", name: name, env: env, isProxied: isProxied);
     }
 
@@ -515,6 +591,8 @@ public static IResourceBuilder<T> WithHttpsEndpoint<T>(this IResourceBuilder<T>
     /// <returns></returns>
     public static IResourceBuilder<T> WithExternalHttpEndpoints<T>(this IResourceBuilder<T> builder) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         if (!builder.Resource.TryGetAnnotationsOfType<EndpointAnnotation>(out var endpoints))
         {
             return builder;
@@ -541,6 +619,8 @@ public static IResourceBuilder<T> WithExternalHttpEndpoints<T>(this IResourceBui
     /// <returns>An <see cref="EndpointReference"/> that can be used to resolve the address of the endpoint after resource allocation has occurred.</returns>
     public static EndpointReference GetEndpoint<T>(this IResourceBuilder<T> builder, [EndpointName] string name) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.Resource.GetEndpoint(name);
     }
 
@@ -552,6 +632,8 @@ public static EndpointReference GetEndpoint<T>(this IResourceBuilder<T> builder,
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> AsHttp2Service<T>(this IResourceBuilder<T> builder) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithAnnotation(new Http2ServiceAnnotation());
     }
 
@@ -563,6 +645,8 @@ public static IResourceBuilder<T> AsHttp2Service<T>(this IResourceBuilder<T> bui
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<T> ExcludeFromManifest<T>(this IResourceBuilder<T> builder) where T : IResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         return builder.WithAnnotation(ManifestPublishingCallbackAnnotation.Ignore);
     }
 
@@ -595,6 +679,9 @@ public static IResourceBuilder<T> ExcludeFromManifest<T>(this IResourceBuilder<T
     /// </example>
     public static IResourceBuilder<T> WaitFor<T>(this IResourceBuilder<T> builder, IResourceBuilder<IResource> dependency) where T : IResourceWithWaitSupport
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(dependency);
+
         if (builder.Resource as IResource == dependency.Resource)
         {
             throw new DistributedApplicationException($"The '{builder.Resource.Name}' resource cannot wait for itself.");
@@ -645,6 +732,9 @@ public static IResourceBuilder<T> WaitFor<T>(this IResourceBuilder<T> builder, I
     /// </example>
     public static IResourceBuilder<T> WaitForCompletion<T>(this IResourceBuilder<T> builder, IResourceBuilder<IResource> dependency, int exitCode = 0) where T : IResourceWithWaitSupport
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(dependency);
+
         if (builder.Resource as IResource == dependency.Resource)
         {
             throw new DistributedApplicationException($"The '{builder.Resource.Name}' resource cannot wait for itself.");
@@ -696,6 +786,9 @@ public static IResourceBuilder<T> WaitForCompletion<T>(this IResourceBuilder<T>
     /// </example>
     public static IResourceBuilder<T> WithHealthCheck<T>(this IResourceBuilder<T> builder, string key) where T : IResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(key);
+
         if (builder.Resource.TryGetAnnotationsOfType<HealthCheckAnnotation>(out var annotations) && annotations.Any(a => a.Key == key))
         {
             throw new DistributedApplicationException($"Resource '{builder.Resource.Name}' already has a health check with key '{key}'.");
@@ -737,6 +830,8 @@ public static IResourceBuilder<T> WithHealthCheck<T>(this IResourceBuilder<T> bu
     /// </example>
     public static IResourceBuilder<T> WithHttpHealthCheck<T>(this IResourceBuilder<T> builder, string? path = null, int? statusCode = null, string? endpointName = null) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         endpointName = endpointName ?? "http";
         return builder.WithHttpHealthCheckInternal(
             path: path,
@@ -830,6 +925,8 @@ internal static IResourceBuilder<T> WithHttpHealthCheckInternal<T>(this IResourc
     /// </example>
     public static IResourceBuilder<T> WithHttpsHealthCheck<T>(this IResourceBuilder<T> builder, string? path = null, int? statusCode = null, string? endpointName = null) where T : IResourceWithEndpoints
     {
+        ArgumentNullException.ThrowIfNull(builder);
+
         endpointName = endpointName ?? "https";
         return builder.WithHttpHealthCheckInternal(
             path: path,
@@ -887,6 +984,11 @@ public static IResourceBuilder<T> WithCommand<T>(
         IconVariant? iconVariant = null,
         bool isHighlighted = false) where T : IResource
     {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentNullException.ThrowIfNull(displayName);
+        ArgumentNullException.ThrowIfNull(executeCommand);
+
         // Replace existing annotation with the same name.
         var existingAnnotation = builder.Resource.Annotations.OfType<ResourceCommandAnnotation>().SingleOrDefault(a => a.Name == name);
         if (existingAnnotation != null)