Skip to content

Commit 3b4c97b

Browse files
committed
Removes net6.0 target framework
Removes the net6.0 target framework from the MaterialDesignColors, MaterialDesignThemes.MahApps, and MaterialDesignThemes projects. This simplifies the build process and reduces the number of target frameworks.
1 parent 95c10aa commit 3b4c97b

File tree

5 files changed

+4
-24
lines changed

5 files changed

+4
-24
lines changed

MaterialDesignToolkit.Full.sln

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3333
Directory.packages.props = Directory.packages.props
3434
.config\dotnet-tools.json = .config\dotnet-tools.json
3535
global.json = global.json
36-
MaterialDesignColors.nuspec = MaterialDesignColors.nuspec
37-
MaterialDesignThemes.MahApps.nuspec = MaterialDesignThemes.MahApps.nuspec
38-
MaterialDesignThemes.nuspec = MaterialDesignThemes.nuspec
3936
build\MigrateBrushes.ps1 = build\MigrateBrushes.ps1
4037
nuget.config = nuget.config
4138
README.md = README.md

src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<RootNamespace>MaterialDesignColors</RootNamespace>
44
<AssemblyName>MaterialDesignColors</AssemblyName>
5-
<TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net462;net8.0-windows</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<MDIXColorsVersion Condition="$(MDIXColorsVersion) == '' Or $(MDIXColorsVersion) == '*Undefined*'">1.0.1</MDIXColorsVersion>
88
<MDIXColorsVersion>$([System.Text.RegularExpressions.Regex]::Replace("$(MDIXColorsVersion)", "-ci\d+$", ""))</MDIXColorsVersion>

src/MaterialDesignColors.Wpf/MaterialDesignColors.nuspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
<file src="..\..\README.md" target="docs\" />
2727
<file src="bin\$configuration$\net462\MaterialDesignColors.*" target="lib\net462"
2828
exclude="**\*.json" />
29-
<file src="bin\$configuration$\net6.0-windows\MaterialDesignColors.*" target="lib\net6.0"
30-
exclude="**\*.json" />
3129
<file src="bin\$configuration$\net8.0-windows\MaterialDesignColors.*" target="lib\net8.0"
3230
exclude="**\*.json" />
3331
</files>
34-
</package>
32+
</package>

src/MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.nuspec

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
<dependency id="MaterialDesignThemes" version="0.0.0" />
2323
<dependency id="MahApps.Metro" version="2.0.0" />
2424
</group>
25-
<group targetFramework="net6.0">
26-
<dependency id="MaterialDesignColors" version="0.0.0" />
27-
<dependency id="MaterialDesignThemes" version="0.0.0" />
28-
<dependency id="MahApps.Metro" version="2.0.0" />
29-
</group>
3025
<group targetFramework="net8.0">
3126
<dependency id="MaterialDesignColors" version="0.0.0" />
3227
<dependency id="MaterialDesignThemes" version="0.0.0" />
@@ -38,9 +33,7 @@
3833
<file src="..\..\README.md" target="docs\" />
3934
<file src="bin\$configuration$\net462\MaterialDesignThemes.MahApps.*" target="lib\net462"
4035
exclude="**\*.json" />
41-
<file src="bin\$configuration$\net6.0-windows\MaterialDesignThemes.MahApps.*"
42-
target="lib\net6.0" exclude="**\*.json" />
4336
<file src="bin\$configuration$\net8.0-windows\MaterialDesignThemes.MahApps.*"
4437
target="lib\net8.0" exclude="**\*.json" />
4538
</files>
46-
</package>
39+
</package>

src/MaterialDesignThemes.Wpf/MaterialDesignThemes.nuspec

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
<dependency id="MaterialDesignColors" version="0.0.0" />
2222
<dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
2323
</group>
24-
<group targetFramework="net6.0">
25-
<dependency id="MaterialDesignColors" version="0.0.0" />
26-
<dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
27-
</group>
2824
<group targetFramework="net8.0">
2925
<dependency id="MaterialDesignColors" version="0.0.0" />
3026
<dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
@@ -35,14 +31,10 @@
3531
<file src="..\..\README.md" target="docs\" />
3632
<file src="bin\$configuration$\net462\MaterialDesignThemes.Wpf.*"
3733
target="lib\net462" exclude="**\*.json" />
38-
<file
39-
src="bin\$configuration$\net6.0-windows\MaterialDesignThemes.Wpf.*"
40-
target="lib\net6.0" exclude="**\*.json" />
41-
<file
4234
src="bin\$configuration$\net8.0-windows\MaterialDesignThemes.Wpf.*"
4335
target="lib\net8.0" exclude="**\*.json" />
4436
<file src="Resources\Roboto\*.ttf" target="build\Resources\Roboto" />
4537
<file src="MaterialDesignThemes.targets" target="build" />
4638
<file src="VisualStudioToolsManifest.xml" target="tools" />
4739
</files>
48-
</package>
40+
</package>

0 commit comments

Comments
 (0)