Skip to content

Commit fd416e2

Browse files
aaronburtleaaronburtle
authored
Swap to MCP packages from our feed until EngThrive-MCP service connection is fixed (#3195)
## Why make this change? After PR #3154 merged, CI pipelines fail during NuGet restore because the EngThrive-MCP Azure Artifacts feed (in the msazure/One org) is unreachable from the sqldab org's pipelines. The EngThriveNugetFeedAccessForSqlDab service connection fails to authenticate, producing NU1301 errors for every project in the solution. ## What is this change? Replaces the internal Microsoft.ModelContextProtocol.HttpServer (0.1.0-preview.25) — hosted on the inaccessible EngThrive-MCP feed — with the public ModelContextProtocol (1.0.0) + ModelContextProtocol.AspNetCore (1.0.0) packages that are already cached in the data_api_builder_build_packages feed. This is a drop-in replacement: the DAB MCP code already uses the ModelContextProtocol.* namespaces (not Microsoft.ModelContextProtocol.*), so zero source code changes are needed. ## How was this tested? Build worked locally, running pipeline to verify.
1 parent 3064a87 commit fd416e2

11 files changed

Lines changed: 17 additions & 44 deletions

File tree

‎.pipelines/cosmos-pipelines.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ steps:
4949
5050
- task: NuGetAuthenticate@1
5151
displayName: 'NuGet Authenticate'
52-
inputs:
53-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
5452

5553
# The .NET CLI commands in proceeding tasks use the .NET SDK version specified ("selected") here.
5654
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from

‎.pipelines/dwsql-pipelines.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ jobs:
4242
steps:
4343
- task: NuGetAuthenticate@1
4444
displayName: 'NuGet Authenticate'
45-
inputs:
46-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
4745

4846
# The .NET CLI commands in proceeding tasks use the .NET SDK version specified ("selected") here.
4947
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
@@ -172,8 +170,6 @@ jobs:
172170

173171
- task: NuGetAuthenticate@1
174172
displayName: 'NuGet Authenticate'
175-
inputs:
176-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
177173

178174
# The .NET CLI commands in proceeding tasks use the .NET SDK version specified ("selected") here.
179175
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from

‎.pipelines/mssql-pipelines.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ jobs:
4343
steps:
4444
- task: NuGetAuthenticate@1
4545
displayName: 'NuGet Authenticate'
46-
inputs:
47-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
4846

4947
# The .NET CLI commands in proceeding tasks use the .NET SDK version specified ("selected") here.
5048
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
@@ -176,8 +174,6 @@ jobs:
176174

177175
- task: NuGetAuthenticate@1
178176
displayName: 'NuGet Authenticate'
179-
inputs:
180-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
181177

182178
# The .NET CLI commands in proceeding tasks use the .NET SDK version specified ("selected") here.
183179
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from

‎.pipelines/mysql-pipelines.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ jobs:
4141
steps:
4242
- task: NuGetAuthenticate@1
4343
displayName: 'NuGet Authenticate'
44-
inputs:
45-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
4644

4745
# The .NET CLI commands in proceeding tasks use the .NET SDK version specified ("selected") here.
4846
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from

‎.pipelines/pg-pipelines.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
steps:
3737
- task: NuGetAuthenticate@1
3838
displayName: 'NuGet Authenticate'
39-
inputs:
40-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
4139

4240
# The .NET CLI commands in proceeding tasks use the .NET SDK version specified ("selected") here.
4341
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from

‎.pipelines/templates/build-pipelines.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
steps:
1010
- task: NuGetAuthenticate@1
1111
displayName: 'NuGet Authenticate'
12-
inputs:
13-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
1412

1513
# If this is a release, do not append the build number at the end as it will
1614
# generate the prerelease nuget version.

‎.pipelines/templates/static-tools.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ jobs:
1616
steps:
1717
- task: NuGetAuthenticate@1
1818
displayName: 'NuGet Authenticate'
19-
inputs:
20-
nuGetServiceConnections: 'EngThriveNugetFeedAccessForSqlDab'
2119

2220
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
2321
clean: true # if true, execute `execute git clean -ffdx && git reset --hard HEAD` before fetching

‎Nuget.config‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear />
55
<add key="data_api_builder_build_packages" value="https://pkgs.dev.azure.com/sqldab/fcb212b3-b288-4c9e-b55a-5842a268b16d/_packaging/data_api_builder_build_packages/nuget/v3/index.json" />
6-
<add key="EngThrive-MCP" value="https://pkgs.dev.azure.com/msazure/One/_packaging/EngThrive-MCP/nuget/v3/index.json" />
76
</packageSources>
8-
<packageSourceMapping>
9-
<packageSource key="data_api_builder_build_packages">
10-
<package pattern="*" />
11-
</packageSource>
12-
<!-- CI (Azure Pipelines NuGetAuthenticate) renames the source with a "feed-" prefix at runtime -->
13-
<packageSource key="feed-data_api_builder_build_packages">
14-
<package pattern="*" />
15-
</packageSource>
16-
<packageSource key="EngThrive-MCP">
17-
<package pattern="Microsoft.ModelContextProtocol.*" />
18-
<package pattern="ModelContextProtocol" />
19-
<package pattern="ModelContextProtocol.*" />
20-
<package pattern="Microsoft.Identity.ServiceEssentials.*" />
21-
<package pattern="Microsoft.Identity.SettingsProvider" />
22-
<package pattern="Microsoft.Identity.TokenRevocationFromSettings" />
23-
<package pattern="Microsoft.Identity.ServerAuthorization" />
24-
</packageSource>
25-
</packageSourceMapping>
267
<disabledPackageSources>
278
<clear />
289
</disabledPackageSources>

‎src/Azure.DataApiBuilder.Mcp/Azure.DataApiBuilder.Mcp.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -13,7 +13,8 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.ModelContextProtocol.HttpServer" />
16+
<PackageReference Include="ModelContextProtocol" />
17+
<PackageReference Include="ModelContextProtocol.AspNetCore" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎src/Directory.Packages.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
3939
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
4040
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.0" />
41-
<PackageVersion Include="Microsoft.ModelContextProtocol.HttpServer" Version="0.1.0-preview.25" />
41+
<PackageVersion Include="ModelContextProtocol" Version="1.0.0" />
42+
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.0.0" />
4243
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.0" />
4344
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.0" />
4445
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />

0 commit comments

Comments
 (0)