Skip to content

Commit cf1afbc

Browse files
L1nsteadL1nstead
authored
Remove .NET 6 as EOL (#3859)
1 parent 556b412 commit cf1afbc

File tree

14 files changed

+12
-33
lines changed

14 files changed

+12
-33
lines changed

‎.github/workflows/build_artifacts.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ jobs:
3232
uses: actions/setup-dotnet@v4
3333
with:
3434
dotnet-version: |
35-
6.x
3635
8.x
3736
9.x
3837

‎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/MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net472;net6.0-windows;net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
88
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

‎src/MainDemo.Wpf/MaterialDesignDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net472;net6.0-windows;net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<Prefer32Bit Condition="'$(TargetFramework)' == 'net472'">true</Prefer32Bit>
88
<ApplicationIcon>favicon.ico</ApplicationIcon>

‎src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net472;net6.0-windows;net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<Prefer32Bit Condition="'$(TargetFramework)' == 'net472'">true</Prefer32Bit>
88
<ApplicationIcon>favicon.ico</ApplicationIcon>

‎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/MaterialDesignDemo.Shared/MaterialDesignDemo.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net472;net6.0-windows;net8.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net472;net8.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net462;net8.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<MDIXMahAppsVersion Condition="$(MDIXMahAppsVersion) == '' Or $(MDIXMahAppsVersion) == '*Undefined*'">1.0.1</MDIXMahAppsVersion>
77
<MDIXMahAppsVersion>$([System.Text.RegularExpressions.Regex]::Replace("$(MDIXMahAppsVersion)", "-ci\d+$", ""))</MDIXMahAppsVersion>

‎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>

0 commit comments

Comments
 (0)