diff --git a/catalog/Frameworks/Official-DotNet-Blazor/skills/use-igniteui-blazor/SKILL.md b/catalog/Frameworks/Official-DotNet-Blazor/skills/use-igniteui-blazor/SKILL.md
index 182d4513..edd073e5 100644
--- a/catalog/Frameworks/Official-DotNet-Blazor/skills/use-igniteui-blazor/SKILL.md
+++ b/catalog/Frameworks/Official-DotNet-Blazor/skills/use-igniteui-blazor/SKILL.md
@@ -106,7 +106,7 @@ Theme files under `_content/IgniteUI.Blazor/themes/` are `{light|dark}/{bootstra
`IgniteUI.Blazor.GridLite` ships its own stylesheet from its own asset root, but should be used only if you are using the GridLite component exclusively. If you are using other Ignite UI components, do not link (or suggest) the GridLite stylesheet — use the main theme stylesheet above instead.
```html
-
+
```
## 5. Render mode (Blazor Web App only)
diff --git a/catalog/Tools/Official-DotNet-MSBuild/agents/build-perf/AGENT.md b/catalog/Tools/Official-DotNet-MSBuild/agents/build-perf/AGENT.md
index 3eb0d532..f8b85b16 100644
--- a/catalog/Tools/Official-DotNet-MSBuild/agents/build-perf/AGENT.md
+++ b/catalog/Tools/Official-DotNet-MSBuild/agents/build-perf/AGENT.md
@@ -77,6 +77,7 @@ Load these skills for detailed guidance on specific optimization areas:
- `eval-performance` — Evaluation performance
- `check-bin-obj-clash` — Output path conflicts
- `copy-to-output-directory` — Removing the `Always` copy perf hit (`IfDifferent`, `$(SkipUnchangedFilesOnCopyAlways)`)
+- `eliminate-redundant-restores` — Removing repeated restores across pipeline or script steps safely (`--no-restore`, `-restore:false`, rsp `-restore`)
## Important Notes
- Always use `/bl` to generate binlogs for data-driven analysis
diff --git a/catalog/Tools/Official-DotNet-MSBuild/agents/msbuild/AGENT.md b/catalog/Tools/Official-DotNet-MSBuild/agents/msbuild/AGENT.md
index 4ca5b6f1..c65d5ec8 100644
--- a/catalog/Tools/Official-DotNet-MSBuild/agents/msbuild/AGENT.md
+++ b/catalog/Tools/Official-DotNet-MSBuild/agents/msbuild/AGENT.md
@@ -79,6 +79,7 @@ This agent has access to a comprehensive set of troubleshooting and optimization
- `incremental-build` — Incremental build optimization
- `build-parallelism` — Parallelism and graph build
- `eval-performance` — Evaluation performance
+- `eliminate-redundant-restores` — Removing repeated restores across pipeline or script steps safely
### Code Quality Skills
- `msbuild-antipatterns` — Anti-pattern catalog with detection rules and fix recipes
diff --git a/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-baseline/SKILL.md b/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-baseline/SKILL.md
index 680a11c9..c2b472eb 100644
--- a/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-baseline/SKILL.md
+++ b/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-baseline/SKILL.md
@@ -1,6 +1,6 @@
---
name: build-perf-baseline
-description: "Establish MSBuild/.NET build performance baselines before optimizing. USE FOR: a .NET build or solution that is slow or has build-performance concerns; cold, warm, incremental, or no-op measurements; before/after comparisons; CI build output caching; static graph build decisions; artifacts output; and dependency graph trimming. Start here before build-perf-diagnostics, incremental-build, or build-parallelism. DO NOT USE for webpack, npm, JavaScript bundlers, or other non-MSBuild build systems. For detailed target/task/analyzer bottleneck analysis after baselining, use build-perf-diagnostics."
+description: "Establish MSBuild/.NET build performance baselines before optimizing. USE FOR: unranked slow builds; cold, warm, incremental or no-op measurements; before/after comparisons; CI output caching; static graph, artifacts output and dependency graph trimming. Start here before build-perf-diagnostics, incremental-build or build-parallelism. DO NOT USE FOR: known repeated-restore fixes (use eliminate-redundant-restores), non-MSBuild builds. For measured target/task/analyzer bottlenecks, use build-perf-diagnostics."
license: MIT
---
diff --git a/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-diagnostics/SKILL.md b/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-diagnostics/SKILL.md
index ecea02c2..22fdb70e 100644
--- a/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-diagnostics/SKILL.md
+++ b/catalog/Tools/Official-DotNet-MSBuild/skills/build-perf-diagnostics/SKILL.md
@@ -1,6 +1,6 @@
---
name: build-perf-diagnostics
-description: "Diagnose MSBuild build performance bottlenecks using binary log analysis. USE FOR: identifying why builds are slow by analyzing binlog performance summaries, detecting ResolveAssemblyReference (RAR) taking >5s, Roslyn analyzers consuming >30% of Csc time, single targets dominating >50% of build time, node utilization below 80%, excessive Copy tasks, NuGet restore running every build. Covers timeline analysis, Target/Task Performance Summary interpretation, and 7 common bottleneck categories. Use after build-perf-baseline has established measurements. DO NOT USE FOR: establishing initial baselines (use build-perf-baseline first), fixing incremental build issues (use incremental-build), parallelism tuning (use build-parallelism), non-MSBuild build systems."
+description: "Diagnose MSBuild bottlenecks from binlog timelines and Target/Task Performance Summaries after build-perf-baseline establishes measurements. USE FOR: unknown build slowness, RAR >5s, analyzers >30% of Csc, one target >50% of build time, node utilization <80%, excessive Copy tasks, finding restore overhead. DO NOT USE FOR: known repeated-restore fixes (use eliminate-redundant-restores), initial baselines (use build-perf-baseline), incremental rebuilds (use incremental-build), parallelism tuning (use build-parallelism), non-MSBuild builds."
license: MIT
---
@@ -89,6 +89,7 @@ license: MIT
- **Fixes**:
- Separate restore from build: `dotnet restore` then `dotnet build --no-restore`
- Enable static graph evaluation: `true` in Directory.Build.props — can save significant time in large builds (results are workload-dependent)
+- See: `eliminate-redundant-restores` skill when several pipeline or script steps each restore, or before adding `--no-restore` (it fails with NETSDK1004/NETSDK1047 when no earlier restore covers the step)
### 7. Large Project Count and Graph Shape
diff --git a/catalog/Tools/Official-DotNet-MSBuild/skills/eliminate-redundant-restores/SKILL.md b/catalog/Tools/Official-DotNet-MSBuild/skills/eliminate-redundant-restores/SKILL.md
new file mode 100644
index 00000000..41b18f10
--- /dev/null
+++ b/catalog/Tools/Official-DotNet-MSBuild/skills/eliminate-redundant-restores/SKILL.md
@@ -0,0 +1,108 @@
+---
+name: eliminate-redundant-restores
+description: "Remove repeated NuGet restores from multi-step .NET builds safely. USE FOR: build/test/publish steps that each restore, Directory.Build.rsp with -restore, safe restore suppression, NETSDK1004/NETSDK1047 after --no-restore. DO NOT USE FOR: slow first restore, only one restore, version or lock errors, unranked build slowness (use build-perf-baseline)."
+license: MIT
+---
+
+# Eliminate Redundant Restores
+
+A no-op restore still evaluates every project and checks restore state, so each extra restore in a multi-step build costs seconds to tens of seconds in a large repo. The cure is easy to get wrong: `--no-restore` on a step that no earlier restore actually covered turns a slow build into a failed one. This skill finds which invocations restore, proves which are already covered, and changes only those.
+
+## When to Use
+
+- A pipeline or script runs several `dotnet`/`msbuild` steps and the log shows restore output in more than one of them
+- A restore step exists, yet later steps still print `Determining projects to restore...`
+- A repository `Directory.Build.rsp` or the active MSBuild installation's `MSBuild.rsp` contains `-restore`
+- Someone asks where `--no-restore` or `-restore:false` can safely be added
+- `NETSDK1004` or `NETSDK1047` appeared after `--no-restore` was added
+
+## When Not to Use
+
+- The first restore is slow (feed latency, missing package cache): that is caching, not redundancy
+- There is only one restore across all invocations: nothing to deduplicate
+- Restore errors about versions, lock files or auditing: fix the restore itself
+- Unranked "why is my build slow": start with `build-perf-baseline`, then `build-perf-diagnostics`
+
+## Inputs
+
+Discover repository inputs in the working directory; do not ask the user for paths.
+
+- CI definitions (`*.yml`, `.github/workflows`, `azure-pipelines*.yml`, `Jenkinsfile`) and build scripts (`build.cmd`, `build.sh`, `build.ps1`, `eng/`)
+- `Directory.Build.rsp`, `Directory.Build.props`/`.targets`, `NuGet.config`
+- Auto-loaded `MSBuild.rsp` beside the active MSBuild executable, or response files passed explicitly with `@file`. A repository-local `MSBuild.rsp` is not auto-loaded
+- Restore evidence if present: step logs or a binlog
+
+## Workflow
+
+### Step 1: Confirm restore is repeated and worth removing
+
+- Log evidence: `Determining projects to restore...` or `All projects are up-to-date for restore.` once per invocation.
+- Binlog evidence: restore evaluations carry the global properties `MSBuildRestoreSessionId` and `ExcludeRestorePackageImports=true`; the Target Performance Summary lists `Restore` with N calls.
+- Quantify each no-op restore. If there is one restore, or the repeated ones total about a second, report "nothing worth removing" and stop without editing.
+
+### Step 2: Inventory every invocation in execution order
+
+| Invocation | Restores? |
+|---|---|
+| `dotnet build`, `test`, `publish`, `pack` | Implicitly, unless `--no-restore`; also check inherited rsp flags |
+| `dotnet run` | Implicitly before building; `--no-restore` can still inherit rsp restore on older SDKs. With `--no-build`, no build or restore runs |
+| `dotnet test`, `publish`, `pack` with `--no-build` | No implicit restore, but an rsp `-restore` can still enable restore; add `--no-restore -restore:false` |
+| `dotnet msbuild`, `msbuild.exe`, CI MSBuild tasks | With `-restore` or `-t:Restore`, including flags inherited from repository `Directory.Build.rsp` or installation-level `MSBuild.rsp`, even when a step looks build-only |
+| `dotnet restore`, `nuget restore`, `msbuild -t:Restore` | Explicit restore |
+| CI build task with a "restore packages" option | Check its default |
+
+Starting with .NET SDK 9.0.1xx, `--no-restore` forwards `-restore:false` to override rsp flags; older SDKs can still inherit `-restore` despite skipping the CLI's implicit restore. Whenever an rsp enables restore, use the version-independent `--no-restore -restore:false` with `dotnet build`, `test`, `publish` or `pack`, even with `--no-build`. `dotnet msbuild` and `msbuild.exe` take `-restore:false`, not `--no-restore`.
+
+`dotnet run` does not expose the MSBuild `-restore:false` override. With an rsp on older SDKs, first build using `dotnet build --no-restore -restore:false`, then run using `dotnet run --no-build` with the same project, configuration, framework and runtime inputs (or execute the built DLL directly). Passing `-restore:false` to `dotnet run` is not a restore-suppression strategy.
+
+### Step 3: Decide per invocation
+
+Keep the first restore. Skip a later one only when all four checks pass:
+
+| Check | If it fails |
+|---|---|
+| **Same project set.** A restore covers its entry project or solution and that project's ProjectReference closure. It does not cover a project in another solution or `.slnf`, a tool built from another path, or a project an orchestrating `.proj` builds through the `MSBuild` task (`-restore` on the orchestrator leaves those unrestored and they fail with NETSDK1004) | Keep restore on that step, or add the project to the explicit restore step |
+| **Same restore inputs.** `-r`/`--runtime`, RID-producing `-a`/`--arch`, `--os`, `--ucr`/`--use-current-runtime`, `TargetFramework(s)`, `RuntimeIdentifier(s)`, `PublishAot`, package sources (`--source`, `--configfile`, `RestoreSources`), `RestorePackagesPath`, and any `-p:` value a PackageReference condition reads. Architecture/OS options combine with the SDK's current RID; `--use-current-runtime` selects it. Missing RID targets fail with NETSDK1047 (`Assets file ... doesn't have a target for 'net10.0/linux-x64'`) | Match the effective RID in the explicit restore (for example `publish --os linux --arch x64` requires `restore -r linux-x64`), or keep restore on the later step. A generic restore does not cover these aliases merely because there is no `-r`. Do not require `SelfContained=true` on restore solely because publish is self-contained: RID-only restore covers ordinary SDK projects. Match `Configuration` or `SelfContained` only if repository conditions change package inputs |
+| **Same available restore state.** Earlier `project.assets.json` files must exist where the later invocation looks for them. Match `--artifacts-path`, `UseArtifactsOutput`/`ArtifactsPath`, and `MSBuildProjectExtensionsPath`/`BaseIntermediateOutputPath`; another job or workspace does not automatically share these files | Align the explicit restore's output layout with build/test, or retain restore in the later workspace. For `build --artifacts-path artifacts --no-restore`, use `restore --artifacts-path artifacts` first; ordinary `obj/` assets do not cover that layout |
+| **Nothing changes packages in between.** A step that generates or edits a project, runs `dotnet add package`, rewrites `Directory.Packages.props` or `NuGet.config` invalidates the earlier restore | Move the explicit restore after that step |
+
+### Step 4: Apply the smallest change
+
+- One explicit restore carrying every restore input, then `--no-restore`, `-restore:false` or `--no-build` on later steps.
+- Several `dotnet test` steps over one solution: build once, then `dotnet test --no-build` on each. Add `--no-restore -restore:false` if an rsp enables restore, including on .NET 8 and earlier. `--no-restore` alone still rebuilds.
+- Keep self-contained publish settings. A `publish --no-build` still needs a prior build with matching configuration, framework, RID and self-contained output; restore compatibility does not prove that build outputs exist.
+- Scope the change to CI and scripts. Leave `-restore` in `Directory.Build.rsp`, because developers rely on it; pass `-restore:false` per invocation instead.
+- Never remove the first restore. If it is a `--locked-mode` gate, keep it there.
+- Do not bundle static graph restore or package caching into this change.
+
+```bash
+# One restore carries every input later steps use
+dotnet restore MyApp.sln -r linux-x64
+# Explicit overrides also work when an rsp enables restore on older SDKs
+dotnet build MyApp.sln -c Release --no-restore -restore:false
+dotnet test MyApp.sln -c Release --no-build --no-restore -restore:false
+dotnet publish src/Api -c Release -r linux-x64 --no-restore -restore:false
+# msbuild invocations need the explicit switch if an rsp file adds -restore
+dotnet msbuild Packaging.proj -t:Pack -restore:false
+```
+
+### Step 5: Validate and report truthfully
+
+1. Run the changed pipeline or script end to end in a clean temporary copy (no `obj/`, no `project.assets.json`). A project that was never restored only fails there. YAML syntax or flag-presence checks do not validate restore coverage or test execution. If you cannot run it, say "not validated" and list the steps and projects to confirm.
+2. Success evidence: every later step passed; `Restore` calls (binlog) or `Determining projects to restore` lines fell from N to the expected count; for a time claim, before/after medians of at least three runs.
+3. Report a restore failure (NETSDK1004, NETSDK1047) separately from a build failure, and never claim success after either.
+
+## Output
+
+Explain which steps restored, which earlier restore covers them, what changed, and what remains unvalidated. State whether redundant restores were removed or no change was needed, keeping the required first restore. Use prose or a findings table as appropriate; no fixed table headings or verdict syntax are required.
+
+## Common Pitfalls
+
+| Pitfall | Solution |
+|---|---|
+| Adding `--no-restore` to every command | Apply the Step 3 checks per step |
+| Missing that an rsp adds `-restore` to "build-only" msbuild steps | Search for `*.rsp` before concluding a step does not restore |
+| Deleting `-restore` from `Directory.Build.rsp` | Override per CI invocation; the rsp serves developers |
+| Orchestrator `.proj` restored, children not | Restore each child explicitly, or keep restore on the step that builds it |
+| Publishing with `-r`, architecture/OS options, or `--use-current-runtime` after a generic restore | Restore with the same effective runtime identifier, including SDK-host defaults used by the aliases |
+| A generator step edits PackageReferences after restore | Restore after the generator |
diff --git a/catalog/Tools/Official-DotNet-MSBuild/skills/eliminate-redundant-restores/manifest.json b/catalog/Tools/Official-DotNet-MSBuild/skills/eliminate-redundant-restores/manifest.json
new file mode 100644
index 00000000..2af79182
--- /dev/null
+++ b/catalog/Tools/Official-DotNet-MSBuild/skills/eliminate-redundant-restores/manifest.json
@@ -0,0 +1,5 @@
+{
+ "version": "0.1.11",
+ "category": "Core",
+ "compatibility": "Requires a .NET repository with MSBuild project or solution files."
+}
diff --git a/external-sources/upstreams/dotnet-skills/plugins/dotnet-blazor/skills/use-igniteui-blazor/SKILL.md b/external-sources/upstreams/dotnet-skills/plugins/dotnet-blazor/skills/use-igniteui-blazor/SKILL.md
index 182d4513..edd073e5 100644
--- a/external-sources/upstreams/dotnet-skills/plugins/dotnet-blazor/skills/use-igniteui-blazor/SKILL.md
+++ b/external-sources/upstreams/dotnet-skills/plugins/dotnet-blazor/skills/use-igniteui-blazor/SKILL.md
@@ -106,7 +106,7 @@ Theme files under `_content/IgniteUI.Blazor/themes/` are `{light|dark}/{bootstra
`IgniteUI.Blazor.GridLite` ships its own stylesheet from its own asset root, but should be used only if you are using the GridLite component exclusively. If you are using other Ignite UI components, do not link (or suggest) the GridLite stylesheet — use the main theme stylesheet above instead.
```html
-
+
```
## 5. Render mode (Blazor Web App only)
diff --git a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/build-perf.agent.md b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/build-perf.agent.md
index 3eb0d532..f8b85b16 100644
--- a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/build-perf.agent.md
+++ b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/build-perf.agent.md
@@ -77,6 +77,7 @@ Load these skills for detailed guidance on specific optimization areas:
- `eval-performance` — Evaluation performance
- `check-bin-obj-clash` — Output path conflicts
- `copy-to-output-directory` — Removing the `Always` copy perf hit (`IfDifferent`, `$(SkipUnchangedFilesOnCopyAlways)`)
+- `eliminate-redundant-restores` — Removing repeated restores across pipeline or script steps safely (`--no-restore`, `-restore:false`, rsp `-restore`)
## Important Notes
- Always use `/bl` to generate binlogs for data-driven analysis
diff --git a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/msbuild.agent.md b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/msbuild.agent.md
index 4ca5b6f1..c65d5ec8 100644
--- a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/msbuild.agent.md
+++ b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/agents/msbuild.agent.md
@@ -79,6 +79,7 @@ This agent has access to a comprehensive set of troubleshooting and optimization
- `incremental-build` — Incremental build optimization
- `build-parallelism` — Parallelism and graph build
- `eval-performance` — Evaluation performance
+- `eliminate-redundant-restores` — Removing repeated restores across pipeline or script steps safely
### Code Quality Skills
- `msbuild-antipatterns` — Anti-pattern catalog with detection rules and fix recipes
diff --git a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-baseline/SKILL.md b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-baseline/SKILL.md
index 680a11c9..c2b472eb 100644
--- a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-baseline/SKILL.md
+++ b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-baseline/SKILL.md
@@ -1,6 +1,6 @@
---
name: build-perf-baseline
-description: "Establish MSBuild/.NET build performance baselines before optimizing. USE FOR: a .NET build or solution that is slow or has build-performance concerns; cold, warm, incremental, or no-op measurements; before/after comparisons; CI build output caching; static graph build decisions; artifacts output; and dependency graph trimming. Start here before build-perf-diagnostics, incremental-build, or build-parallelism. DO NOT USE for webpack, npm, JavaScript bundlers, or other non-MSBuild build systems. For detailed target/task/analyzer bottleneck analysis after baselining, use build-perf-diagnostics."
+description: "Establish MSBuild/.NET build performance baselines before optimizing. USE FOR: unranked slow builds; cold, warm, incremental or no-op measurements; before/after comparisons; CI output caching; static graph, artifacts output and dependency graph trimming. Start here before build-perf-diagnostics, incremental-build or build-parallelism. DO NOT USE FOR: known repeated-restore fixes (use eliminate-redundant-restores), non-MSBuild builds. For measured target/task/analyzer bottlenecks, use build-perf-diagnostics."
license: MIT
---
diff --git a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-diagnostics/SKILL.md b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-diagnostics/SKILL.md
index ecea02c2..22fdb70e 100644
--- a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-diagnostics/SKILL.md
+++ b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/build-perf-diagnostics/SKILL.md
@@ -1,6 +1,6 @@
---
name: build-perf-diagnostics
-description: "Diagnose MSBuild build performance bottlenecks using binary log analysis. USE FOR: identifying why builds are slow by analyzing binlog performance summaries, detecting ResolveAssemblyReference (RAR) taking >5s, Roslyn analyzers consuming >30% of Csc time, single targets dominating >50% of build time, node utilization below 80%, excessive Copy tasks, NuGet restore running every build. Covers timeline analysis, Target/Task Performance Summary interpretation, and 7 common bottleneck categories. Use after build-perf-baseline has established measurements. DO NOT USE FOR: establishing initial baselines (use build-perf-baseline first), fixing incremental build issues (use incremental-build), parallelism tuning (use build-parallelism), non-MSBuild build systems."
+description: "Diagnose MSBuild bottlenecks from binlog timelines and Target/Task Performance Summaries after build-perf-baseline establishes measurements. USE FOR: unknown build slowness, RAR >5s, analyzers >30% of Csc, one target >50% of build time, node utilization <80%, excessive Copy tasks, finding restore overhead. DO NOT USE FOR: known repeated-restore fixes (use eliminate-redundant-restores), initial baselines (use build-perf-baseline), incremental rebuilds (use incremental-build), parallelism tuning (use build-parallelism), non-MSBuild builds."
license: MIT
---
@@ -89,6 +89,7 @@ license: MIT
- **Fixes**:
- Separate restore from build: `dotnet restore` then `dotnet build --no-restore`
- Enable static graph evaluation: `true` in Directory.Build.props — can save significant time in large builds (results are workload-dependent)
+- See: `eliminate-redundant-restores` skill when several pipeline or script steps each restore, or before adding `--no-restore` (it fails with NETSDK1004/NETSDK1047 when no earlier restore covers the step)
### 7. Large Project Count and Graph Shape
diff --git a/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/eliminate-redundant-restores/SKILL.md b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/eliminate-redundant-restores/SKILL.md
new file mode 100644
index 00000000..41b18f10
--- /dev/null
+++ b/external-sources/upstreams/dotnet-skills/plugins/dotnet-msbuild/skills/eliminate-redundant-restores/SKILL.md
@@ -0,0 +1,108 @@
+---
+name: eliminate-redundant-restores
+description: "Remove repeated NuGet restores from multi-step .NET builds safely. USE FOR: build/test/publish steps that each restore, Directory.Build.rsp with -restore, safe restore suppression, NETSDK1004/NETSDK1047 after --no-restore. DO NOT USE FOR: slow first restore, only one restore, version or lock errors, unranked build slowness (use build-perf-baseline)."
+license: MIT
+---
+
+# Eliminate Redundant Restores
+
+A no-op restore still evaluates every project and checks restore state, so each extra restore in a multi-step build costs seconds to tens of seconds in a large repo. The cure is easy to get wrong: `--no-restore` on a step that no earlier restore actually covered turns a slow build into a failed one. This skill finds which invocations restore, proves which are already covered, and changes only those.
+
+## When to Use
+
+- A pipeline or script runs several `dotnet`/`msbuild` steps and the log shows restore output in more than one of them
+- A restore step exists, yet later steps still print `Determining projects to restore...`
+- A repository `Directory.Build.rsp` or the active MSBuild installation's `MSBuild.rsp` contains `-restore`
+- Someone asks where `--no-restore` or `-restore:false` can safely be added
+- `NETSDK1004` or `NETSDK1047` appeared after `--no-restore` was added
+
+## When Not to Use
+
+- The first restore is slow (feed latency, missing package cache): that is caching, not redundancy
+- There is only one restore across all invocations: nothing to deduplicate
+- Restore errors about versions, lock files or auditing: fix the restore itself
+- Unranked "why is my build slow": start with `build-perf-baseline`, then `build-perf-diagnostics`
+
+## Inputs
+
+Discover repository inputs in the working directory; do not ask the user for paths.
+
+- CI definitions (`*.yml`, `.github/workflows`, `azure-pipelines*.yml`, `Jenkinsfile`) and build scripts (`build.cmd`, `build.sh`, `build.ps1`, `eng/`)
+- `Directory.Build.rsp`, `Directory.Build.props`/`.targets`, `NuGet.config`
+- Auto-loaded `MSBuild.rsp` beside the active MSBuild executable, or response files passed explicitly with `@file`. A repository-local `MSBuild.rsp` is not auto-loaded
+- Restore evidence if present: step logs or a binlog
+
+## Workflow
+
+### Step 1: Confirm restore is repeated and worth removing
+
+- Log evidence: `Determining projects to restore...` or `All projects are up-to-date for restore.` once per invocation.
+- Binlog evidence: restore evaluations carry the global properties `MSBuildRestoreSessionId` and `ExcludeRestorePackageImports=true`; the Target Performance Summary lists `Restore` with N calls.
+- Quantify each no-op restore. If there is one restore, or the repeated ones total about a second, report "nothing worth removing" and stop without editing.
+
+### Step 2: Inventory every invocation in execution order
+
+| Invocation | Restores? |
+|---|---|
+| `dotnet build`, `test`, `publish`, `pack` | Implicitly, unless `--no-restore`; also check inherited rsp flags |
+| `dotnet run` | Implicitly before building; `--no-restore` can still inherit rsp restore on older SDKs. With `--no-build`, no build or restore runs |
+| `dotnet test`, `publish`, `pack` with `--no-build` | No implicit restore, but an rsp `-restore` can still enable restore; add `--no-restore -restore:false` |
+| `dotnet msbuild`, `msbuild.exe`, CI MSBuild tasks | With `-restore` or `-t:Restore`, including flags inherited from repository `Directory.Build.rsp` or installation-level `MSBuild.rsp`, even when a step looks build-only |
+| `dotnet restore`, `nuget restore`, `msbuild -t:Restore` | Explicit restore |
+| CI build task with a "restore packages" option | Check its default |
+
+Starting with .NET SDK 9.0.1xx, `--no-restore` forwards `-restore:false` to override rsp flags; older SDKs can still inherit `-restore` despite skipping the CLI's implicit restore. Whenever an rsp enables restore, use the version-independent `--no-restore -restore:false` with `dotnet build`, `test`, `publish` or `pack`, even with `--no-build`. `dotnet msbuild` and `msbuild.exe` take `-restore:false`, not `--no-restore`.
+
+`dotnet run` does not expose the MSBuild `-restore:false` override. With an rsp on older SDKs, first build using `dotnet build --no-restore -restore:false`, then run using `dotnet run --no-build` with the same project, configuration, framework and runtime inputs (or execute the built DLL directly). Passing `-restore:false` to `dotnet run` is not a restore-suppression strategy.
+
+### Step 3: Decide per invocation
+
+Keep the first restore. Skip a later one only when all four checks pass:
+
+| Check | If it fails |
+|---|---|
+| **Same project set.** A restore covers its entry project or solution and that project's ProjectReference closure. It does not cover a project in another solution or `.slnf`, a tool built from another path, or a project an orchestrating `.proj` builds through the `MSBuild` task (`-restore` on the orchestrator leaves those unrestored and they fail with NETSDK1004) | Keep restore on that step, or add the project to the explicit restore step |
+| **Same restore inputs.** `-r`/`--runtime`, RID-producing `-a`/`--arch`, `--os`, `--ucr`/`--use-current-runtime`, `TargetFramework(s)`, `RuntimeIdentifier(s)`, `PublishAot`, package sources (`--source`, `--configfile`, `RestoreSources`), `RestorePackagesPath`, and any `-p:` value a PackageReference condition reads. Architecture/OS options combine with the SDK's current RID; `--use-current-runtime` selects it. Missing RID targets fail with NETSDK1047 (`Assets file ... doesn't have a target for 'net10.0/linux-x64'`) | Match the effective RID in the explicit restore (for example `publish --os linux --arch x64` requires `restore -r linux-x64`), or keep restore on the later step. A generic restore does not cover these aliases merely because there is no `-r`. Do not require `SelfContained=true` on restore solely because publish is self-contained: RID-only restore covers ordinary SDK projects. Match `Configuration` or `SelfContained` only if repository conditions change package inputs |
+| **Same available restore state.** Earlier `project.assets.json` files must exist where the later invocation looks for them. Match `--artifacts-path`, `UseArtifactsOutput`/`ArtifactsPath`, and `MSBuildProjectExtensionsPath`/`BaseIntermediateOutputPath`; another job or workspace does not automatically share these files | Align the explicit restore's output layout with build/test, or retain restore in the later workspace. For `build --artifacts-path artifacts --no-restore`, use `restore --artifacts-path artifacts` first; ordinary `obj/` assets do not cover that layout |
+| **Nothing changes packages in between.** A step that generates or edits a project, runs `dotnet add package`, rewrites `Directory.Packages.props` or `NuGet.config` invalidates the earlier restore | Move the explicit restore after that step |
+
+### Step 4: Apply the smallest change
+
+- One explicit restore carrying every restore input, then `--no-restore`, `-restore:false` or `--no-build` on later steps.
+- Several `dotnet test` steps over one solution: build once, then `dotnet test --no-build` on each. Add `--no-restore -restore:false` if an rsp enables restore, including on .NET 8 and earlier. `--no-restore` alone still rebuilds.
+- Keep self-contained publish settings. A `publish --no-build` still needs a prior build with matching configuration, framework, RID and self-contained output; restore compatibility does not prove that build outputs exist.
+- Scope the change to CI and scripts. Leave `-restore` in `Directory.Build.rsp`, because developers rely on it; pass `-restore:false` per invocation instead.
+- Never remove the first restore. If it is a `--locked-mode` gate, keep it there.
+- Do not bundle static graph restore or package caching into this change.
+
+```bash
+# One restore carries every input later steps use
+dotnet restore MyApp.sln -r linux-x64
+# Explicit overrides also work when an rsp enables restore on older SDKs
+dotnet build MyApp.sln -c Release --no-restore -restore:false
+dotnet test MyApp.sln -c Release --no-build --no-restore -restore:false
+dotnet publish src/Api -c Release -r linux-x64 --no-restore -restore:false
+# msbuild invocations need the explicit switch if an rsp file adds -restore
+dotnet msbuild Packaging.proj -t:Pack -restore:false
+```
+
+### Step 5: Validate and report truthfully
+
+1. Run the changed pipeline or script end to end in a clean temporary copy (no `obj/`, no `project.assets.json`). A project that was never restored only fails there. YAML syntax or flag-presence checks do not validate restore coverage or test execution. If you cannot run it, say "not validated" and list the steps and projects to confirm.
+2. Success evidence: every later step passed; `Restore` calls (binlog) or `Determining projects to restore` lines fell from N to the expected count; for a time claim, before/after medians of at least three runs.
+3. Report a restore failure (NETSDK1004, NETSDK1047) separately from a build failure, and never claim success after either.
+
+## Output
+
+Explain which steps restored, which earlier restore covers them, what changed, and what remains unvalidated. State whether redundant restores were removed or no change was needed, keeping the required first restore. Use prose or a findings table as appropriate; no fixed table headings or verdict syntax are required.
+
+## Common Pitfalls
+
+| Pitfall | Solution |
+|---|---|
+| Adding `--no-restore` to every command | Apply the Step 3 checks per step |
+| Missing that an rsp adds `-restore` to "build-only" msbuild steps | Search for `*.rsp` before concluding a step does not restore |
+| Deleting `-restore` from `Directory.Build.rsp` | Override per CI invocation; the rsp serves developers |
+| Orchestrator `.proj` restored, children not | Restore each child explicitly, or keep restore on the step that builds it |
+| Publishing with `-r`, architecture/OS options, or `--use-current-runtime` after a generic restore | Restore with the same effective runtime identifier, including SDK-host defaults used by the aliases |
+| A generator step edits PackageReferences after restore | Restore after the generator |
diff --git a/external-sources/vendir.lock.yml b/external-sources/vendir.lock.yml
index 8b6e256f..ea240f0e 100644
--- a/external-sources/vendir.lock.yml
+++ b/external-sources/vendir.lock.yml
@@ -2,20 +2,20 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- git:
- commitTitle: 'Merge pull request #1305 from dotnet/abhitejjohn-ef-eval-safeguards...'
- sha: 9de888b8ce55da34e76a113bd7b2d463d6b3e1e6
+ commitTitle: 'Merge pull request #1301 from kdinev/adjust-grid-css-path...'
+ sha: 10d85e25fb42d5f65c568d5e979a005ee69eecb3
tags:
- - skill-validator-nightly
+ - skill-validator-nightly-11-g10d85e25
path: dotnet-skills
- git:
commitTitle: Add Cursor rules that reference the existing skill docs...
sha: af2319bd01bb7cc881267a9ef42cafdaf5e9029d
path: webgpu-claude-skill
- git:
- commitTitle: '[ci] release (#18354)'
- sha: c2c43a99f4d50676456c137ff88359579f78bf5c
+ commitTitle: 'fix(node): log server listening when listening already fired (#18382)...'
+ sha: c75e89711a4935a0befea6f768842f6d6a9de2bb
tags:
- - '@astrojs/cloudflare@14.4.0'
+ - '@astrojs/cloudflare@14.4.0-10-gc75e89711a'
path: astro
- git:
commitTitle: Update README with Roslynk observation steps...