Skip to content

Commit ed4dc34

Browse files
committed
fix: Msbuild .props properties inheritance
chore: Bump dependencies
1 parent 69ebdcb commit ed4dc34

File tree

5 files changed

+16
-19
lines changed

5 files changed

+16
-19
lines changed

Directory.Build.props

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
<PackageProjectUrl>https://netcord.dev</PackageProjectUrl>
1616
<PackageTags>bot;discord;discord-api</PackageTags>
1717
<PackageLicenseExpression>MIT</PackageLicenseExpression>
18-
<Description>The modern and fully customizable C# Discord library.</Description>
18+
<Description Condition="'$(Description)' == ''">The modern and fully customizable C# Discord library.</Description>
1919
<PackageReadmeFile>README.md</PackageReadmeFile>
2020
<PackageIcon>ICON.png</PackageIcon>
2121
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2222
</PropertyGroup>
2323

24-
<PropertyGroup>
24+
<!-- https://github.com/dotnet/sdk/issues/42660#issuecomment-2282753952-->
25+
<!-- https://github.com/NuGet/Home/issues/10372-->
26+
<PropertyGroup Condition="'$(MSBuildProjectName)' != 'NetCordTemplates'">
2527
<IncludeSymbols>true</IncludeSymbols>
2628
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2729
</PropertyGroup>
@@ -30,7 +32,7 @@
3032
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3133
</PropertyGroup>
3234

33-
<ItemGroup>
35+
<ItemGroup Condition="'$(MSBuildProjectName)' != 'NetCordTemplates'">
3436
<PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="all" />
3537
</ItemGroup>
3638

ProjectTemplates/NetCordTemplates.csproj

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,18 @@
44
<PackageType>Template</PackageType>
55
<PackageVersion>1.0</PackageVersion>
66
<PackageId>NetCord.Templates</PackageId>
7-
<TargetFramework>net8.0</TargetFramework>
8-
<LangVersion>latest</LangVersion>
97

10-
<ImplicitUsings>enable</ImplicitUsings>
11-
<Nullable>enable</Nullable>
128
<NoWarn>$(NoWarn);NU5128</NoWarn>
139

1410
<IncludeContentInPack>true</IncludeContentInPack>
1511
<IncludeBuildOutput>false</IncludeBuildOutput>
1612
<ContentTargetFolders>content</ContentTargetFolders>
13+
</PropertyGroup>
1714

15+
<PropertyGroup>
1816
<Title>NetCord Project Templates</Title>
1917
<Authors>NetCord</Authors>
20-
<Description>Starting templates to use when creating NetCord bot.</Description>
21-
<RepositoryUrl>https://github.com/NetCordDev/NetCord</RepositoryUrl>
22-
<PackageProjectUrl>https://netcord.dev</PackageProjectUrl>
23-
<PackageTags>dotnet-new;templates;netcord;bot;discord;discord-api</PackageTags>
18+
<Description>Starting templates to use with NetCord - The modern and fully customizable C# Discord library.</Description>
2419
</PropertyGroup>
2520

2621
<ItemGroup>
File renamed without changes.

ProjectTemplates/templates/NetCord.GenericHost/.template.config/template.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,23 +81,23 @@
8181
"datatype": "bool",
8282
"defaultValue": "false",
8383
"displayName": "Add Application Commands",
84-
"description": "Whether to add application commands with example module"
84+
"description": "Whether to add application commands with example module",
8585
"isRequired": false
8686
},
8787
"addTextCommands": {
8888
"type": "parameter",
8989
"datatype": "bool",
9090
"defaultValue": "false",
9191
"displayName": "Add Text Commands",
92-
"description": "Whether to add text commands with example module"
92+
"description": "Whether to add text commands with example module",
9393
"isRequired": false
9494
},
9595
"addComponentInteractions": {
9696
"type": "parameter",
9797
"datatype": "bool",
9898
"defaultValue": "false",
9999
"displayName": "Add Interactions",
100-
"description": "Whether to add interactions with example module"
100+
"description": "Whether to add interactions with example module",
101101
"isRequired": false
102102
},
103103
"hostIdentifier": {

ProjectTemplates/templates/NetCord.GenericHost/NetCord.Template.Bot.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
<PropertyGroup>
44
<!--#if (framework == "net9.0") -->
5-
<TargetFramework>net8.0</TargetFramework>
6-
<!--#else -->
75
<TargetFramework>net9.0</TargetFramework>
6+
<!--#else -->
7+
<TargetFramework>net8.0</TargetFramework>
88
<!--#endif -->
99
<Nullable>enable</Nullable>
1010
<ImplicitUsings>enable</ImplicitUsings>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
1414
<!--#if (framework == "net9.0") -->
15-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.4" />
15+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
1616
<!--#else -->
1717
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
1818
<!--#endif -->
19-
<PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.363" />
20-
<PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.363" />
19+
<PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.380" />
20+
<PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.380" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

0 commit comments

Comments
 (0)