Skip to content

Commit 51589ad

Browse files
CopilotKeboo
Copilot
and
Keboo
committed
Migrate from nuget.exe to dotnet pack with MSBuild package properties
Co-authored-by: Keboo <952248+Keboo@users.noreply.github.com>
1 parent a40273e commit 51589ad

File tree

5 files changed

+82
-29
lines changed

5 files changed

+82
-29
lines changed

‎build/BuildNugets.ps1‎

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,42 +8,26 @@ $year = [System.DateTime]::Now.ToString("yyyy")
88
$copyright = "Copyright $year James Willock/Mulholland Software Ltd"
99
$configuration = "Release"
1010

11-
function Update-Versions {
11+
function New-DotNetPackage {
1212
param (
13-
[string]$Path
14-
)
15-
$Path = Resolve-Path $Path
16-
[xml] $xml = Get-Content $Path
17-
18-
foreach ($dependency in $xml.package.metadata.dependencies.group.dependency) {
19-
if ($dependency.id -eq "MaterialDesignColors") {
20-
$dependency.version = $MDIXColorsVersion
21-
}
22-
elseif ($dependency.id -eq "MaterialDesignThemes") {
23-
$dependency.version = $MDIXVersion
24-
}
25-
}
26-
$xml.Save($Path)
27-
}
28-
29-
function New-Nuget {
30-
param (
31-
[string]$NuSpecPath,
13+
[string]$ProjectPath,
3214
[string]$Version
3315
)
3416

35-
$NuSpecPath = Resolve-Path $NuSpecPath
36-
nuget pack "$NuSpecPath" -version "$Version" -Properties "Configuration=$configuration;Copyright=$copyright"
17+
$ProjectPath = Resolve-Path $ProjectPath
18+
Write-Host "Packing $ProjectPath with version $Version"
19+
dotnet pack "$ProjectPath" -c $configuration -p:PackageVersion="$Version" -p:Copyright="$copyright" --no-build
3720
}
3821

3922
Push-Location "$(Join-Path $PSScriptRoot "..")"
4023

41-
Update-Versions .\src\MaterialDesignColors.Wpf\MaterialDesignColors.nuspec
42-
Update-Versions .\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.nuspec
43-
Update-Versions .\src\MaterialDesignThemes.MahApps\MaterialDesignThemes.MahApps.nuspec
24+
# Build the solution first
25+
Write-Host "Building solution..."
26+
dotnet build MaterialDesignToolkit.Full.sln -c $configuration --nologo
4427

45-
New-Nuget .\src\MaterialDesignColors.Wpf\MaterialDesignColors.nuspec $MDIXColorsVersion
46-
New-Nuget .\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.nuspec $MDIXVersion
47-
New-Nuget .\src\MaterialDesignThemes.MahApps\MaterialDesignThemes.MahApps.nuspec $MDIXMahAppsVersion
28+
# Pack the projects
29+
New-DotNetPackage .\src\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj $MDIXColorsVersion
30+
New-DotNetPackage .\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj $MDIXVersion
31+
New-DotNetPackage .\src\MaterialDesignThemes.MahApps\MaterialDesignThemes.MahApps.csproj $MDIXMahAppsVersion
4832

4933
Pop-Location

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.119",
3+
"version": "9.0.300",
44
"rollForward": "latestMinor"
55
}
66
}

‎src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,22 @@
1111
<Description>Material Design in XAML Toolkit - Colors</Description>
1212
<Version>$(MDIXColorsVersion)</Version>
1313
<AssemblyVersion>$(MDIXColorsVersion)</AssemblyVersion>
14+
15+
<!-- Package Properties -->
16+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
17+
<PackageId>MaterialDesignColors</PackageId>
18+
<Title>Material Design Colors XAML Resources</Title>
19+
<Authors>James Willock</Authors>
20+
<Owners>James Willock</Owners>
21+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
22+
<PackageProjectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</PackageProjectUrl>
23+
<PackageIcon>MaterialDesign.Icon.png</PackageIcon>
24+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
25+
<PackageDescription>ResourceDictionary instances containing standard Google Material Design swatches, for inclusion in a XAML application.</PackageDescription>
26+
<PackageReadmeFile>README.md</PackageReadmeFile>
27+
<PackageReleaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</PackageReleaseNotes>
28+
<Copyright>$(Copyright)</Copyright>
29+
<PackageTags>WPF XAML Material Design Colour Color UI UX</PackageTags>
1430
</PropertyGroup>
1531

1632
<ItemGroup>
@@ -19,4 +35,10 @@
1935
<_Parameter2>$(MDIXColorsVersion)</_Parameter2>
2036
</AssemblyAttribute>
2137
</ItemGroup>
38+
39+
<!-- Package Content -->
40+
<ItemGroup>
41+
<None Include="..\..\build\MaterialDesign.Icon.png" Pack="true" PackagePath="\" />
42+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
43+
</ItemGroup>
2244
</Project>

‎src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,22 @@
1010
<Version>$(MDIXMahAppsVersion)</Version>
1111
<AssemblyVersion>$(MDIXMahAppsVersion)</AssemblyVersion>
1212
<UseWPF>true</UseWPF>
13+
14+
<!-- Package Properties -->
15+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
16+
<PackageId>MaterialDesignThemes.MahApps</PackageId>
17+
<Title>Material Design Themes XAML Resources For MahApps Controls</Title>
18+
<Authors>James Willock</Authors>
19+
<Owners>James Willock</Owners>
20+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
21+
<PackageProjectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</PackageProjectUrl>
22+
<PackageIcon>MaterialDesign.Icon.png</PackageIcon>
23+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
24+
<PackageDescription>ResourceDictionary instances containing Material Design templates and styles for WPF controls in the MahApps library.</PackageDescription>
25+
<PackageReadmeFile>README.md</PackageReadmeFile>
26+
<PackageReleaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</PackageReleaseNotes>
27+
<Copyright>$(Copyright)</Copyright>
28+
<PackageTags>WPF XAML MahApps Material Design Theme Colour Color UI UX</PackageTags>
1329
</PropertyGroup>
1430
<ItemGroup>
1531
<ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
@@ -18,4 +34,10 @@
1834
<ItemGroup>
1935
<PackageReference Include="MahApps.Metro" />
2036
</ItemGroup>
37+
38+
<!-- Package Content -->
39+
<ItemGroup>
40+
<None Include="..\..\build\MaterialDesign.Icon.png" Pack="true" PackagePath="\" />
41+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
42+
</ItemGroup>
2143
</Project>

‎src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@
1212
<AssemblyVersion>$(MDIXVersion)</AssemblyVersion>
1313
<NoWarn>CS1591;CS1574</NoWarn>
1414
<DocumentationFile>bin\$(Configuration)\MaterialDesignThemes.Wpf.xml</DocumentationFile>
15+
16+
<!-- Package Properties -->
17+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
18+
<PackageId>MaterialDesignThemes</PackageId>
19+
<Title>Material Design Themes XAML Resources</Title>
20+
<Authors>James Willock</Authors>
21+
<Owners>James Willock</Owners>
22+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
23+
<PackageProjectUrl>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit</PackageProjectUrl>
24+
<PackageIcon>MaterialDesign.Icon.png</PackageIcon>
25+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
26+
<PackageDescription>ResourceDictionary instances containing Material Design templates and styles for WPF controls in .NET.</PackageDescription>
27+
<PackageReadmeFile>README.md</PackageReadmeFile>
28+
<PackageReleaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</PackageReleaseNotes>
29+
<Copyright>$(Copyright)</Copyright>
30+
<PackageTags>WPF XAML Material Design Theme Colour Color UI UX</PackageTags>
1531
</PropertyGroup>
1632
<ItemGroup>
1733
<Resource Include="Resources\Roboto\*.ttf" />
@@ -42,4 +58,13 @@
4258
<_Parameter2>$(MDIXVersion)</_Parameter2>
4359
</AssemblyAttribute>
4460
</ItemGroup>
61+
62+
<!-- Package Content -->
63+
<ItemGroup>
64+
<None Include="..\..\build\MaterialDesign.Icon.png" Pack="true" PackagePath="\" />
65+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
66+
<None Include="Resources\Roboto\*.ttf" Pack="true" PackagePath="build\Resources\Roboto" />
67+
<None Include="MaterialDesignThemes.targets" Pack="true" PackagePath="build" />
68+
<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
69+
</ItemGroup>
4570
</Project>

0 commit comments

Comments
 (0)