Skip to content

Commit ddf156a

Browse files
committed
chore(build): replace NuGetizer with SDK-native template packaging
Drop the NuGetizer dependency and pack template content with standard SDK metadata (`None` items with `Pack="true"` and `PackagePath`). - Map template files to `content/` and `content/templates/` paths explicitly - Align NUnit template output with the `DevleadConsolenunit` folder name - Switch the Cake `Pack` task from `DotNetMSBuild` to `DotNetPack` - Set `NoBuild`, `NoRestore`, output directory, and `/m:1` for reliable packs - Add `#!/usr/bin/env dotnet` shebang to `cake.cs` for direct execution
1 parent 59018bb commit ddf156a

2 files changed

Lines changed: 55 additions & 38 deletions

File tree

cake.cs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/usr/bin/env dotnet
12
#:sdk Cake.Sdk@6.2.0
23
#:property IncludeAdditionalFiles=./build/*.cs
34
@@ -162,13 +163,17 @@
162163
)
163164
.Then("Pack")
164165
.Does<BuildData>(
165-
static (context, data) => context.DotNetMSBuild(
166+
static (context, data) => context.DotNetPack(
166167
data.TemplateProject.FullPath,
167-
data
168-
.MSBuildSettings
169-
.WithTarget("Pack")
170-
.WithProperty("_IsPacking", "true")
171-
.WithProperty("NoBuild", "true")
168+
new DotNetPackSettings {
169+
NoBuild = true,
170+
NoRestore = true,
171+
OutputDirectory = data.NuGetOutputPath,
172+
ArgumentCustomization = args => args.Append("/m:1"),
173+
MSBuildSettings = data.MSBuildSettingsCustomization(
174+
data,
175+
new DotNetMSBuildSettings())
176+
}
172177
)
173178
)
174179
.Then("Upload-Artifacts")

src/Devlead.Console.Template/Devlead.Console.Template.csproj

Lines changed: 44 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,44 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<PackageType>Template</PackageType>
5-
<AssemblyName>Devlead.Console.Template</AssemblyName>
6-
<Title>Devlead console templates for the .NET SDK.</Title>
7-
<IsPackable>true</IsPackable>
8-
<PackBuildOutput>false</PackBuildOutput>
9-
<IncludeContentInPack>true</IncludeContentInPack>
10-
<IncludeBuildOutput>false</IncludeBuildOutput>
11-
<ContentTargetFolders>content</ContentTargetFolders>
12-
<NoWarn>$(NoWarn)</NoWarn>
13-
<NoPackageAnalysis>true</NoPackageAnalysis>
14-
<PackageReadmeFile>README.md</PackageReadmeFile>
15-
</PropertyGroup>
16-
17-
<ItemGroup>
18-
<PackageFile Include="templates/**/*" Exclude="templates/**/obj/**;templates/**/bin/**" PackagePath="$(ContentTargetFolders)\%(RelativeDir)%(Filename)%(Extension)" />
19-
<PackageFile Include="DevleadConsole/**/*" Exclude="DevleadConsole/**/obj/**;DevleadConsole/**/bin/**" PackagePath="$(ContentTargetFolders)\templates\DevleadConsole\%(RelativeDir)%(Filename)%(Extension)" />
20-
<PackageFile Include="DevleadConsole.Tests/**/*" Exclude="DevleadConsole.Tests/**/obj/**;DevleadConsole.Tests/**/bin/**" PackagePath="$(ContentTargetFolders)\templates\DevleadConsoleNunit\%(RelativeDir)%(Filename)%(Extension)" />
21-
<PackageFile Include="DevleadConsole/**/*" Exclude="DevleadConsole/**/obj/**;DevleadConsole/**/bin/**" PackagePath="$(ContentTargetFolders)\templates\DevleadConsoleNunit\%(RelativeDir)%(Filename)%(Extension)" />
22-
<!--<Content Include="../templates/**/*" Exclude="../templates/**/bin/**;../templates/**/obj/**" /> -->
23-
<Compile Remove="**/*" />
24-
<None Include="../devlead.png" Pack="true" PackagePath=""/>
25-
<None Include="../../README.md" Pack="true" PackagePath="/" />
26-
</ItemGroup>
27-
28-
<ItemGroup>
29-
<PackageReference Include="NuGetizer" Version="1.4.7" PrivateAssets="All"/>
30-
</ItemGroup>
31-
32-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<PackageType>Template</PackageType>
5+
<AssemblyName>Devlead.Console.Template</AssemblyName>
6+
<Title>Devlead console templates for the .NET SDK.</Title>
7+
<IsPackable>true</IsPackable>
8+
<IncludeBuildOutput>false</IncludeBuildOutput>
9+
<IncludeContentInPack>true</IncludeContentInPack>
10+
<NoPackageAnalysis>true</NoPackageAnalysis>
11+
<PackageReadmeFile>README.md</PackageReadmeFile>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<Compile Remove="**/*" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<None Include="templates/**/*"
20+
Exclude="templates/**/obj/**;templates/**/bin/**"
21+
Pack="true"
22+
PackagePath="content/%(RelativeDir)%(Filename)%(Extension)"
23+
Visible="false" />
24+
<None Include="DevleadConsole/**/*"
25+
Exclude="DevleadConsole/**/obj/**;DevleadConsole/**/bin/**"
26+
Pack="true"
27+
PackagePath="content/templates/DevleadConsole/%(RelativeDir)%(Filename)%(Extension)"
28+
Visible="false" />
29+
<None Include="DevleadConsole.Tests/**/*"
30+
Exclude="DevleadConsole.Tests/**/obj/**;DevleadConsole.Tests/**/bin/**"
31+
Pack="true"
32+
PackagePath="content/templates/DevleadConsolenunit/%(RelativeDir)%(Filename)%(Extension)"
33+
Visible="false" />
34+
<None Include="DevleadConsole/**/*"
35+
Exclude="DevleadConsole/**/obj/**;DevleadConsole/**/bin/**"
36+
Pack="true"
37+
PackagePath="content/templates/DevleadConsolenunit/%(RelativeDir)%(Filename)%(Extension)"
38+
Visible="false" />
39+
<None Include="../devlead.png" Pack="true" PackagePath="" Visible="false" />
40+
<None Include="../../README.md" Pack="true" PackagePath="" Visible="false" />
41+
</ItemGroup>
42+
43+
</Project>
44+

0 commit comments

Comments
 (0)