Skip to content

Commit 15b96b9

Browse files
Add support for .NET 6.0
1 parent d2c574f commit 15b96b9

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

.github/workflows/ci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ jobs:
4040
uses: actions/[email protected]
4141
with:
4242
dotnet-version: "5.0.403"
43+
- name: Setup net6.0
44+
uses: actions/[email protected]
45+
with:
46+
dotnet-version: "6.0.100"
4347
- name: Run dotnet --info
4448
run: dotnet --info
4549
- uses: actions/[email protected]

Ookii.Dialogs.Wpf.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30711.63
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{85E0D2C3-A700-4A65-BFEA-1F9A29875419}"
77
EndProject
@@ -30,7 +30,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.Wpf.Sample",
3030
EndProject
3131
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.Wpf", "src\Ookii.Dialogs.Wpf\Ookii.Dialogs.Wpf.csproj", "{D01B1D20-8F5B-4834-8E5C-C7EC6DD587D4}"
3232
EndProject
33-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ookii.Dialogs", "src\Ookii.Dialogs\Ookii.Dialogs.csproj", "{50E3F3F4-9AEC-4FF9-8CF9-99721A167EC3}"
33+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs", "src\Ookii.Dialogs\Ookii.Dialogs.csproj", "{50E3F3F4-9AEC-4FF9-8CF9-99721A167EC3}"
3434
EndProject
3535
Global
3636
GlobalSection(SolutionConfigurationPlatforms) = preSolution

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": false,
4-
"version": "5.0.100",
4+
"version": "6.0.100",
55
"rollForward": "latestFeature"
66
}
77
}

sample/Ookii.Dialogs.Wpf.Sample/Ookii.Dialogs.Wpf.Sample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
55
<OutputType>WinExe</OutputType>
66
<UseWPF>true</UseWPF>
77
<UseWindowsForms>true</UseWindowsForms>

src/Ookii.Dialogs.Wpf/Ookii.Dialogs.Wpf.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77
<RootNamespace>Ookii.Dialogs.Wpf</RootNamespace>

src/Ookii.Dialogs/Ookii.Dialogs.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
4+
<TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
55
<UseWPF>true</UseWPF>
66
<UseWindowsForms>true</UseWindowsForms>
77

0 commit comments

Comments
 (0)