Skip to content

Use and preserve server.json wherever it is found #1271

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2025
Merged

Use and preserve server.json wherever it is found #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,25 +317,21 @@
BeforeTargets="GenerateNuspec;_GetPackageFiles"
DependsOnTargets="GetBuildVersion">
<ItemGroup>
<_NBGV_OriginalServerJson Include="$(MSBuildProjectDirectory)\server.json" Condition="Exists('$(MSBuildProjectDirectory)\server.json')" />
<_NBGV_OriginalServerJson Include="@(None)" Condition="'%(None.FileName)%(None.Extension)'=='server.json'" />
<_NBGV_StampedServerJson Include="@(_NBGV_OriginalServerJson->'$(IntermediateOutputPath)\nb.gv\server.json')" />
</ItemGroup>

<PropertyGroup>
<_NBGV_StampedServerJsonPath>$(IntermediateOutputPath)server.json</_NBGV_StampedServerJsonPath>
</PropertyGroup>


<!-- Transform server.json with versioned content -->
<Nerdbank.GitVersioning.Tasks.StampMcpServerJson
Condition="'@(_NBGV_OriginalServerJson)' != ''"
SourceServerJson="%(_NBGV_OriginalServerJson.Identity)"
OutputServerJson="$(_NBGV_StampedServerJsonPath)"
SourceServerJson="@(_NBGV_OriginalServerJson)"
OutputServerJson="@(_NBGV_StampedServerJson)"
Version="$(Version)" />

<!-- Remove original server.json from packaging and add stamped version -->
<ItemGroup Condition="'$(_NBGV_StampedServerJsonPath)' != ''">
<Content Remove="server.json" />
<None Remove="server.json" />
<Content Include="$(_NBGV_StampedServerJsonPath)" PackagePath="server.json" Pack="true" />
<ItemGroup>
<None Remove="@(_NBGV_OriginalServerJson)" />
<None Include="@(_NBGV_StampedServerJson)" />
</ItemGroup>
</Target>

Expand Down
9 changes: 7 additions & 2 deletions test/Nerdbank.GitVersioning.Tests/BuildIntegrationManagedTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,27 @@ public async Task McpServerJson_VersionStamping()
}
""";

string serverJsonPath = Path.Combine(this.projectDirectory, "server.json");
string serverJsonPath = Path.Combine(this.projectDirectory, ".mcp", "server.json");
Directory.CreateDirectory(Path.Combine(this.projectDirectory, ".mcp"));
File.WriteAllText(serverJsonPath, serverJsonContent);

// Set PackageType to McpServer
ProjectPropertyGroupElement propertyGroup = this.testProject.CreatePropertyGroupElement();
this.testProject.AppendChild(propertyGroup);
propertyGroup.AddProperty("PackageType", "McpServer");

this.testProject.AddItem("None", @".mcp\server.json", new Dictionary<string, string> { ["Pack"] = "true", ["PackagePath"] = "/.mcp/" });

this.WriteVersionFile();
BuildResults result = await this.BuildAsync("NBGV_StampMcpServerJson", logVerbosity: LoggerVerbosity.Detailed);

// Verify the build succeeded
Assert.Empty(result.LoggedEvents.OfType<BuildErrorEventArgs>());

// Verify the stamped server.json was created
string stampedServerJsonPath = Path.Combine(this.projectDirectory, result.BuildResult.ProjectStateAfterBuild.GetPropertyValue("IntermediateOutputPath"), "server.json");
string stampedServerJsonPath = result.BuildResult.ProjectStateAfterBuild.GetItems("None")
.Single(pi => $"{pi.GetMetadataValue("FileName")}{pi.GetMetadataValue("Extension")}" == "server.json")
.GetMetadataValue("FullPath");
Assert.True(File.Exists(stampedServerJsonPath), $"Expected stamped server.json at: {stampedServerJsonPath}");

// Verify the version was correctly stamped
Expand Down
Loading