Skip to content

Commit 2e1e206

Browse files
eiriktsarpaliseiriktsarpalis
committed
Add Directory.Build.props, apply CPM, use NB.GitVersioning, update package publishing
1 parent 32f5e07 commit 2e1e206

File tree

15 files changed

+313
-60
lines changed

15 files changed

+313
-60
lines changed

Diff for: ‎Directory.Build.props

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>13</LangVersion>
4+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<IsPackable>false</IsPackable>
8+
<RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))</RepoRoot>
9+
<VSTestLogger>trx%3bLogFileName=$(MSBuildProjectName).$(TargetFramework).$(OS).trx</VSTestLogger>
10+
<VSTestResultsDirectory>$(RepoRoot)/artifacts/TestResults</VSTestResultsDirectory>
11+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
12+
</PropertyGroup>
13+
14+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
15+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
16+
</PropertyGroup>
17+
</Project>

Diff for: ‎Directory.Packages.props

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<MicrosoftExtensionsAIVersion>9.3.0-preview.1.25161.3</MicrosoftExtensionsAIVersion>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<!-- Product dependencies -->
8+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
9+
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
10+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.3" />
11+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
12+
<PackageVersion Include="System.Net.ServerSentEvents" Version="9.0.3" />
13+
<PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.3" />
14+
<PackageVersion Include="System.Text.Json" Version="9.0.3" />
15+
<PackageVersion Include="System.Threading.Channels" Version="9.0.3" />
16+
<!-- Build Infra & Packaging -->
17+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
18+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
19+
<!-- Testing dependencies -->
20+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
21+
<PackageVersion Include="xunit" Version="2.9.2" />
22+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
23+
<PackageVersion Include="Moq" Version="4.20.72" />
24+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
25+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
26+
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0-preview.1.25080.5" />
27+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.3.0-preview.1.25161.3" />
28+
<PackageVersion Include="Anthropic.SDK" Version="4.7.1" />
29+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
30+
<PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
31+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
32+
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
33+
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
34+
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
35+
</ItemGroup>
36+
</Project>

Diff for: ‎ModelContextProtocol.sln

+6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,18 @@ EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCoreSseServer", "samples\AspNetCoreSseServer\AspNetCoreSseServer.csproj", "{B6F42305-423F-56FF-090F-B7263547F924}"
2525
EndProject
2626
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A2F1F52A-9107-4BF8-8C3F-2F6670E7D0AD}"
27+
ProjectSection(SolutionItems) = preProject
28+
src\Directory.Build.props = src\Directory.Build.props
29+
EndProjectSection
2730
EndProject
2831
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6FB2B28-D5DE-4654-BE9A-45E305DE4852}"
2932
ProjectSection(SolutionItems) = preProject
33+
Directory.Build.props = Directory.Build.props
3034
global.json = global.json
3135
LICENSE = LICENSE
36+
logo.png = logo.png
3237
README.MD = README.MD
38+
version.json = version.json
3339
EndProjectSection
3440
EndProject
3541
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1288ADA5-1BF1-4A7F-A33E-9EA29097AA40}"

Diff for: ‎logo.png

17.9 KB
Loading

Diff for: ‎samples/AspNetCoreSseServer/AspNetCoreSseServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="System.Net.ServerSentEvents" Version="10.0.0-preview.1.25080.5" />
14+
<PackageReference Include="System.Net.ServerSentEvents" VersionOverride="10.0.0-preview.1.25080.5" />
1515
</ItemGroup>
1616

1717
</Project>

Diff for: ‎samples/TestServerWithHosting/TestServerWithHosting.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
12-
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
13-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
14-
<PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
15-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" />
12+
<PackageReference Include="Serilog.Extensions.Hosting" />
13+
<PackageReference Include="Serilog.Sinks.Console" />
14+
<PackageReference Include="Serilog.Sinks.Debug" />
15+
<PackageReference Include="Serilog.Sinks.File" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

Diff for: ‎samples/anthropic/tools/ToolsConsole/AnthropicToolsConsole.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Anthropic.SDK" Version="4.7.1" />
12-
<PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.0-preview.1.25080.5" />
11+
<PackageReference Include="Anthropic.SDK" />
12+
<PackageReference Include="System.Linq.AsyncEnumerable" VersionOverride="10.0.0-preview.1.25080.5" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

Diff for: ‎samples/microsoft.extensions.ai/tools/ToolsConsole/MEAIToolsConsole.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.3.0-preview.1.25161.3" />
12-
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.3.0-preview.1.25161.3" />
13-
<PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.0-preview.1.25080.5" />
11+
<PackageReference Include="Microsoft.Extensions.AI" />
12+
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
13+
<PackageReference Include="System.Linq.AsyncEnumerable" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

Diff for: ‎src/Directory.Build.props

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<PackageProjectUrl>https://github.com/modelcontextprotocol/csharp-sdk</PackageProjectUrl>
6+
<RepositoryUrl>https://github.com/modelcontextprotocol/csharp-sdk</RepositoryUrl>
7+
<RepositoryType>git</RepositoryType>
8+
<PackageTags>ModelContextProtocol;mcp;ai;llm</PackageTags>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<PackageIcon>logo.png</PackageIcon>
11+
<IncludeSymbols>true</IncludeSymbols>
12+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
13+
<PackageOutputPath>$(RepoRoot)artifacts/</PackageOutputPath>
14+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
19+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="All" />
20+
</ItemGroup>
21+
22+
<ItemGroup>
23+
<None Include="$(RepoRoot)\logo.png" Pack="true" PackagePath="\" />
24+
</ItemGroup>
25+
</Project>

Diff for: ‎src/ModelContextProtocol/ModelContextProtocol.csproj

+17-30
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,39 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<LangVersion>Latest</LangVersion>
8-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9-
<AnalysisMode>All</AnalysisMode>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<IsPackable>true</IsPackable>
7+
<PackageId>ModelContextProtocol</PackageId>
8+
<Description>.NET SDK for the Model Context Protocol (MCP)</Description>
9+
<PackageReadmeFile>README.md</PackageReadmeFile>
1010
</PropertyGroup>
1111

1212
<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
1313
<IsAotCompatible>true</IsAotCompatible>
1414
</PropertyGroup>
1515

16-
<PropertyGroup>
17-
<!-- license and package properties -->
18-
<PackageId>ModelContextProtocol</PackageId>
19-
<Description>.NET SDK for the Model Context Protocol (MCP)</Description>
20-
<PackageProjectUrl>https://github.com/modelcontextprotocol/csharp-sdk</PackageProjectUrl>
21-
<RepositoryUrl>https://github.com/modelcontextprotocol/csharp-sdk</RepositoryUrl>
22-
<RepositoryType>git</RepositoryType>
23-
<PackageTags>ModelContextProtocol;mcp;ai;llm</PackageTags>
24-
<PackageReadmeFile>README.md</PackageReadmeFile>
25-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
26-
<!-- Assembly properties -->
27-
<RootNamespace>ModelContextProtocol</RootNamespace>
28-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
29-
<IncludeSymbols>true</IncludeSymbols>
30-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
31-
</PropertyGroup>
32-
3316
<ItemGroup>
3417
<InternalsVisibleTo Include="ModelContextProtocol.Tests" />
3518
<InternalsVisibleTo Include="AspNetCoreSseServer" />
3619
</ItemGroup>
3720

3821
<ItemGroup>
39-
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.3.0-preview.1.25161.3" />
40-
<PackageReference Include="Microsoft.Extensions.AI" Version="9.3.0-preview.1.25161.3" />
41-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.3" />
42-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
43-
<PackageReference Include="System.Net.ServerSentEvents" Version="9.0.3" />
22+
<PackageReference Include="Microsoft.Extensions.AI.Abstractions"/>
23+
<PackageReference Include="Microsoft.Extensions.AI" />
24+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
25+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
26+
<PackageReference Include="System.Net.ServerSentEvents" />
4427
</ItemGroup>
4528

4629
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
4730
<Compile Include="..\Common\Polyfills\**\*.cs" />
48-
<PackageReference Include="Microsoft.Bcl.Memory" Version="9.0.3" />
49-
<PackageReference Include="System.Text.Json" Version="9.0.3" />
50-
<PackageReference Include="System.Threading.Channels" Version="9.0.3" />
31+
<PackageReference Include="Microsoft.Bcl.Memory" />
32+
<PackageReference Include="System.Text.Json" />
33+
<PackageReference Include="System.Threading.Channels" />
34+
</ItemGroup>
35+
36+
<ItemGroup>
37+
<None Include="README.md" pack="true" PackagePath="." />
5138
</ItemGroup>
5239

5340
</Project>

0 commit comments

Comments
 (0)