Skip to content

Commit eb41544

Browse files
MichelMichelsMichelMichels
authored
Dropped net7.0-windows target framework due to EOL, add net8.0-window… (#3597)
* Dropped net7.0-windows target framework due to EOL, add net8.0-windows target framework * Mentions of .NET7 removed
1 parent 4686be6 commit eb41544

File tree

15 files changed

+21
-22
lines changed

15 files changed

+21
-22
lines changed

‎MaterialDesignToolkit.Full.sln‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesignColors.Wpf",
1010
EndProject
1111
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MahAppsDragablzDemo", "src\MahMaterialDragablzMashUp\MahAppsDragablzDemo.csproj", "{803954E5-3A35-4D8B-95A7-F6E9B63EC0DF}"
1212
EndProject
13-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web", "src\web", "{7D0AC158-FD01-4EA3-8F8A-D19C085C77DF}"
13+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web", "web", "{7D0AC158-FD01-4EA3-8F8A-D19C085C77DF}"
1414
ProjectSection(SolutionItems) = preProject
1515
src\web\images\MashUp.gif = src\web\images\MashUp.gif
16-
src\web\scripts\PaletteBuilder.js = src\web\scripts\PaletteBuilder.js
1716
src\web\PaletteBuilder.html = src\web\PaletteBuilder.html
17+
src\web\scripts\PaletteBuilder.js = src\web\scripts\PaletteBuilder.js
1818
EndProjectSection
1919
EndProject
2020
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{D34BE232-DE51-43C1-ABDC-B69003BB50FF}"
@@ -30,7 +30,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
3030
.editorconfig = .editorconfig
3131
build\BuildNugets.ps1 = build\BuildNugets.ps1
3232
Directory.Build.props = Directory.Build.props
33-
Directory.Build.targets = Directory.Build.targets
3433
Directory.packages.props = Directory.packages.props
3534
.config\dotnet-tools.json = .config\dotnet-tools.json
3635
global.json = global.json

‎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;net7.0-windows;net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;net6.0-windows;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;net7.0-windows;net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;net6.0-windows;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;net7.0-windows;net8.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;net6.0-windows;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;net7.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net462;net6.0-windows;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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependencies>
2020
<group targetFramework="net462" />
2121
<group targetFramework="net6.0" />
22-
<group targetFramework="net7.0" />
22+
<group targetFramework="net8.0" />
2323
</dependencies>
2424
</metadata>
2525
<files>
@@ -28,7 +28,7 @@
2828
exclude="**\*.json" />
2929
<file src="bin\$configuration$\net6.0-windows\MaterialDesignColors.*" target="lib\net6.0"
3030
exclude="**\*.json" />
31-
<file src="bin\$configuration$\net7.0-windows\MaterialDesignColors.*" target="lib\net7.0"
31+
<file src="bin\$configuration$\net8.0-windows\MaterialDesignColors.*" target="lib\net8.0"
3232
exclude="**\*.json" />
3333
</files>
3434
</package>

‎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;net7.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0-windows;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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency id="MaterialDesignThemes" version="0.0.0" />
2828
<dependency id="MahApps.Metro" version="2.0.0" />
2929
</group>
30-
<group targetFramework="net7.0">
30+
<group targetFramework="net8.0">
3131
<dependency id="MaterialDesignColors" version="0.0.0" />
3232
<dependency id="MaterialDesignThemes" version="0.0.0" />
3333
<dependency id="MahApps.Metro" version="2.0.0" />
@@ -40,7 +40,7 @@
4040
exclude="**\*.json" />
4141
<file src="bin\$configuration$\net6.0-windows\MaterialDesignThemes.MahApps.*"
4242
target="lib\net6.0" exclude="**\*.json" />
43-
<file src="bin\$configuration$\net7.0-windows\MaterialDesignThemes.MahApps.*"
44-
target="lib\net7.0" exclude="**\*.json" />
43+
<file src="bin\$configuration$\net8.0-windows\MaterialDesignThemes.MahApps.*"
44+
target="lib\net8.0" exclude="**\*.json" />
4545
</files>
4646
</package>

‎src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.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.WindowsDesktop">
33
<PropertyGroup>
4-
<TargetFrameworks>net462;net6.0-windows;net7.0-windows</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0-windows;net8.0-windows</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<MDIXVersion Condition="$(MDIXVersion) == '' Or $(MDIXVersion) == '*Undefined*'">1.0.1</MDIXVersion>
77
<MDIXVersion>$([System.Text.RegularExpressions.Regex]::Replace("$(MDIXVersion)", "-ci\d+$", ""))</MDIXVersion>

‎src/MaterialDesignThemes.Wpf/MaterialDesignThemes.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency id="MaterialDesignColors" version="0.0.0" />
2626
<dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
2727
</group>
28-
<group targetFramework="net7.0">
28+
<group targetFramework="net8.0">
2929
<dependency id="MaterialDesignColors" version="0.0.0" />
3030
<dependency id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" />
3131
</group>
@@ -39,8 +39,8 @@
3939
src="bin\$configuration$\net6.0-windows\MaterialDesignThemes.Wpf.*"
4040
target="lib\net6.0" exclude="**\*.json" />
4141
<file
42-
src="bin\$configuration$\net7.0-windows\MaterialDesignThemes.Wpf.*"
43-
target="lib\net7.0" exclude="**\*.json" />
42+
src="bin\$configuration$\net8.0-windows\MaterialDesignThemes.Wpf.*"
43+
target="lib\net8.0" exclude="**\*.json" />
4444
<file src="Resources\Roboto\*.ttf" target="build\Resources\Roboto" />
4545
<file src="MaterialDesignThemes.targets" target="build" />
4646
<file src="VisualStudioToolsManifest.xml" target="tools" />

0 commit comments

Comments
 (0)