From d33b33c8b26d17d3a7459d0dcb1e54eb891afb01 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 19:25:21 +0000 Subject: [PATCH 1/5] Initial plan From a40273e5b5dac3bb4030324f719f3341d6cfd16f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 19:28:28 +0000 Subject: [PATCH 2/5] Initial analysis and plan for migrating from nuget.exe to dotnet pack Co-authored-by: Keboo <952248+Keboo@users.noreply.github.com> --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index ccbe73ca13..4ca016b44a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.300", + "version": "8.0.119", "rollForward": "latestMinor" } } From 51589ad12f7e202800c2935f9aeebb5593ea2ebf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 Aug 2025 19:33:13 +0000 Subject: [PATCH 3/5] Migrate from nuget.exe to dotnet pack with MSBuild package properties Co-authored-by: Keboo <952248+Keboo@users.noreply.github.com> --- build/BuildNugets.ps1 | 40 ++++++------------- global.json | 2 +- .../MaterialDesignColors.Wpf.csproj | 22 ++++++++++ .../MaterialDesignThemes.MahApps.csproj | 22 ++++++++++ .../MaterialDesignThemes.Wpf.csproj | 25 ++++++++++++ 5 files changed, 82 insertions(+), 29 deletions(-) diff --git a/build/BuildNugets.ps1 b/build/BuildNugets.ps1 index d398eb4dc6..270cd86673 100644 --- a/build/BuildNugets.ps1 +++ b/build/BuildNugets.ps1 @@ -8,42 +8,26 @@ $year = [System.DateTime]::Now.ToString("yyyy") $copyright = "Copyright $year James Willock/Mulholland Software Ltd" $configuration = "Release" -function Update-Versions { +function New-DotNetPackage { param ( - [string]$Path - ) - $Path = Resolve-Path $Path - [xml] $xml = Get-Content $Path - - foreach ($dependency in $xml.package.metadata.dependencies.group.dependency) { - if ($dependency.id -eq "MaterialDesignColors") { - $dependency.version = $MDIXColorsVersion - } - elseif ($dependency.id -eq "MaterialDesignThemes") { - $dependency.version = $MDIXVersion - } - } - $xml.Save($Path) -} - -function New-Nuget { - param ( - [string]$NuSpecPath, + [string]$ProjectPath, [string]$Version ) - $NuSpecPath = Resolve-Path $NuSpecPath - nuget pack "$NuSpecPath" -version "$Version" -Properties "Configuration=$configuration;Copyright=$copyright" + $ProjectPath = Resolve-Path $ProjectPath + Write-Host "Packing $ProjectPath with version $Version" + dotnet pack "$ProjectPath" -c $configuration -p:PackageVersion="$Version" -p:Copyright="$copyright" --no-build } Push-Location "$(Join-Path $PSScriptRoot "..")" -Update-Versions .\src\MaterialDesignColors.Wpf\MaterialDesignColors.nuspec -Update-Versions .\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.nuspec -Update-Versions .\src\MaterialDesignThemes.MahApps\MaterialDesignThemes.MahApps.nuspec +# Build the solution first +Write-Host "Building solution..." +dotnet build MaterialDesignToolkit.Full.sln -c $configuration --nologo -New-Nuget .\src\MaterialDesignColors.Wpf\MaterialDesignColors.nuspec $MDIXColorsVersion -New-Nuget .\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.nuspec $MDIXVersion -New-Nuget .\src\MaterialDesignThemes.MahApps\MaterialDesignThemes.MahApps.nuspec $MDIXMahAppsVersion +# Pack the projects +New-DotNetPackage .\src\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj $MDIXColorsVersion +New-DotNetPackage .\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj $MDIXVersion +New-DotNetPackage .\src\MaterialDesignThemes.MahApps\MaterialDesignThemes.MahApps.csproj $MDIXMahAppsVersion Pop-Location diff --git a/global.json b/global.json index 4ca016b44a..ccbe73ca13 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.119", + "version": "9.0.300", "rollForward": "latestMinor" } } diff --git a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj index ed1a0c31e9..4496fae685 100644 --- a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj +++ b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj @@ -11,6 +11,22 @@ Material Design in XAML Toolkit - Colors $(MDIXColorsVersion) $(MDIXColorsVersion) + + + false + MaterialDesignColors + Material Design Colors XAML Resources + James Willock + James Willock + MIT + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit + MaterialDesign.Icon.png + false + ResourceDictionary instances containing standard Google Material Design swatches, for inclusion in a XAML application. + README.md + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases + $(Copyright) + WPF XAML Material Design Colour Color UI UX @@ -19,4 +35,10 @@ <_Parameter2>$(MDIXColorsVersion) + + + + + + \ No newline at end of file diff --git a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj index 5d0eb7f639..c0d71fdd8b 100644 --- a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj +++ b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj @@ -10,6 +10,22 @@ $(MDIXMahAppsVersion) $(MDIXMahAppsVersion) true + + + false + MaterialDesignThemes.MahApps + Material Design Themes XAML Resources For MahApps Controls + James Willock + James Willock + MIT + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit + MaterialDesign.Icon.png + false + ResourceDictionary instances containing Material Design templates and styles for WPF controls in the MahApps library. + README.md + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases + $(Copyright) + WPF XAML MahApps Material Design Theme Colour Color UI UX @@ -18,4 +34,10 @@ + + + + + + \ No newline at end of file diff --git a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj index 592420a96b..52dea9bab0 100644 --- a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj +++ b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj @@ -12,6 +12,22 @@ $(MDIXVersion) CS1591;CS1574 bin\$(Configuration)\MaterialDesignThemes.Wpf.xml + + + false + MaterialDesignThemes + Material Design Themes XAML Resources + James Willock + James Willock + MIT + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit + MaterialDesign.Icon.png + false + ResourceDictionary instances containing Material Design templates and styles for WPF controls in .NET. + README.md + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases + $(Copyright) + WPF XAML Material Design Theme Colour Color UI UX @@ -42,4 +58,13 @@ <_Parameter2>$(MDIXVersion) + + + + + + + + + \ No newline at end of file From cbb332cf1c9ce8f83e8c98198495270e46da2220 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 30 Aug 2025 04:51:33 +0000 Subject: [PATCH 4/5] Refactor packaging properties to Directory.Build.props and remove unnecessary build step Co-authored-by: Keboo <952248+Keboo@users.noreply.github.com> --- Directory.Build.props | 17 +++++++++++++++++ build/BuildNugets.ps1 | 4 ---- .../MaterialDesignColors.Wpf.csproj | 13 +------------ .../MaterialDesignThemes.MahApps.csproj | 13 +------------ .../MaterialDesignThemes.Wpf.csproj | 14 ++------------ 5 files changed, 21 insertions(+), 40 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index d5c2513673..f01ab74c87 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,6 +15,17 @@ true true true + + + false + James Willock + James Willock + MIT + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit + MaterialDesign.Icon.png + false + README.md + https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases @@ -30,4 +41,10 @@ + + + + + + \ No newline at end of file diff --git a/build/BuildNugets.ps1 b/build/BuildNugets.ps1 index 270cd86673..766158b4f1 100644 --- a/build/BuildNugets.ps1 +++ b/build/BuildNugets.ps1 @@ -21,10 +21,6 @@ function New-DotNetPackage { Push-Location "$(Join-Path $PSScriptRoot "..")" -# Build the solution first -Write-Host "Building solution..." -dotnet build MaterialDesignToolkit.Full.sln -c $configuration --nologo - # Pack the projects New-DotNetPackage .\src\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj $MDIXColorsVersion New-DotNetPackage .\src\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj $MDIXVersion diff --git a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj index 4496fae685..7c6e59a7c6 100644 --- a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj +++ b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj @@ -13,19 +13,9 @@ $(MDIXColorsVersion) - false MaterialDesignColors Material Design Colors XAML Resources - James Willock - James Willock - MIT - https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit - MaterialDesign.Icon.png - false ResourceDictionary instances containing standard Google Material Design swatches, for inclusion in a XAML application. - README.md - https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases - $(Copyright) WPF XAML Material Design Colour Color UI UX @@ -38,7 +28,6 @@ - - + \ No newline at end of file diff --git a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj index c0d71fdd8b..0ad04f0994 100644 --- a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj +++ b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj @@ -12,19 +12,9 @@ true - false MaterialDesignThemes.MahApps Material Design Themes XAML Resources For MahApps Controls - James Willock - James Willock - MIT - https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit - MaterialDesign.Icon.png - false ResourceDictionary instances containing Material Design templates and styles for WPF controls in the MahApps library. - README.md - https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases - $(Copyright) WPF XAML MahApps Material Design Theme Colour Color UI UX @@ -37,7 +27,6 @@ - - + \ No newline at end of file diff --git a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj index 52dea9bab0..1b70e4ddc6 100644 --- a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj +++ b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj @@ -14,19 +14,9 @@ bin\$(Configuration)\MaterialDesignThemes.Wpf.xml - false MaterialDesignThemes Material Design Themes XAML Resources - James Willock - James Willock - MIT - https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit - MaterialDesign.Icon.png - false ResourceDictionary instances containing Material Design templates and styles for WPF controls in .NET. - README.md - https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases - $(Copyright) WPF XAML Material Design Theme Colour Color UI UX @@ -61,8 +51,8 @@ - - + + From e5d3bcd5eb4985ded949a14e1ccadd30cf52d927 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 31 Aug 2025 04:49:26 +0000 Subject: [PATCH 5/5] Remove empty Package Content sections from project files Co-authored-by: Keboo <952248+Keboo@users.noreply.github.com> --- .../MaterialDesignColors.Wpf.csproj | 6 +----- .../MaterialDesignThemes.MahApps.csproj | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj index 7c6e59a7c6..5b13473873 100644 --- a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj +++ b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj @@ -25,9 +25,5 @@ <_Parameter2>$(MDIXColorsVersion) - - - - - + \ No newline at end of file diff --git a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj index 0ad04f0994..8ed6ec4df8 100644 --- a/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj +++ b/src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj @@ -24,9 +24,5 @@ - - - - - + \ No newline at end of file