Add support for .NET 6.0

ookii-dialogs · Nov 11, 2021 · d9a564e · d9a564e
1 parent 168cf25
commit d9a564e
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,10 @@ jobs:
         uses: actions/setup-dotnet@v1.8.2
         with:
           dotnet-version: "5.0.403"
+      - name: Setup net6.0
+        uses: actions/setup-dotnet@v1.8.2
+        with:
+          dotnet-version: "6.0.100"
       - name: Run dotnet --info
         run: dotnet --info
       - uses: actions/checkout@v2.4.0

diff --git a/Ookii.Dialogs.WinForms.sln b/Ookii.Dialogs.WinForms.sln
@@ -28,14 +28,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{22DAE7
 		SECURITY.md = SECURITY.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.WinForms.SampleNet50", "sample\net5.0\Ookii.Dialogs.WinForms.SampleNet50.csproj", "{0E90268B-720E-40C0-8A2F-6EA409451CCB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.WinForms.SampleNet50", "sample\net50\Ookii.Dialogs.WinForms.SampleNet50.csproj", "{0E90268B-720E-40C0-8A2F-6EA409451CCB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.WinForms.SampleNet462", "sample\net462\Ookii.Dialogs.WinForms.SampleNet462.csproj", "{AE0A9FDB-2BFF-4647-A1DB-4B6D17AC443D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.WinForms.SampleNetCoreApp31", "sample\netcoreapp3.1\Ookii.Dialogs.WinForms.SampleNetCoreApp31.csproj", "{01648956-1C06-4B52-914E-C370DA4EE881}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.WindowsForms", "src\Ookii.Dialogs.WindowsForms\Ookii.Dialogs.WindowsForms.csproj", "{732A304D-AA7E-4768-AAE3-5021EF3BFD3F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ookii.Dialogs.WinForms.SampleNet60", "sample\net60\Ookii.Dialogs.WinForms.SampleNet60.csproj", "{045DEB04-262C-41E6-BCAA-8DD0EFCD7F98}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -62,6 +64,10 @@ Global
 		{732A304D-AA7E-4768-AAE3-5021EF3BFD3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{732A304D-AA7E-4768-AAE3-5021EF3BFD3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{732A304D-AA7E-4768-AAE3-5021EF3BFD3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{045DEB04-262C-41E6-BCAA-8DD0EFCD7F98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{045DEB04-262C-41E6-BCAA-8DD0EFCD7F98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{045DEB04-262C-41E6-BCAA-8DD0EFCD7F98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{045DEB04-262C-41E6-BCAA-8DD0EFCD7F98}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -72,6 +78,7 @@ Global
 		{AE0A9FDB-2BFF-4647-A1DB-4B6D17AC443D} = {B82D79EE-58EA-44D5-9913-650BD9EFA8E0}
 		{01648956-1C06-4B52-914E-C370DA4EE881} = {B82D79EE-58EA-44D5-9913-650BD9EFA8E0}
 		{732A304D-AA7E-4768-AAE3-5021EF3BFD3F} = {68ED7CF2-8E33-460B-AF18-15143BF954F6}
+		{045DEB04-262C-41E6-BCAA-8DD0EFCD7F98} = {B82D79EE-58EA-44D5-9913-650BD9EFA8E0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {223C1782-9064-416B-B539-EEBCABF427F5}

diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
     "allowPrerelease": true,
-    "version": "5.0.100",
-    "rollForward": "latestMajor"
+    "version": "6.0.100",
+    "rollForward": "latestMinor"
   }
 }
diff --git a/...Ookii.Dialogs.WinForms.SampleNet50.csproj → ...Ookii.Dialogs.WinForms.SampleNet50.csproj b/...Ookii.Dialogs.WinForms.SampleNet50.csproj → ...Ookii.Dialogs.WinForms.SampleNet50.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net50-windows</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <Copyright>Copyright (c) 2009-2021 Ookii Dialogs Contributors</Copyright>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
@@ -42,4 +42,4 @@
     <ProjectReference Include="..\..\src\Ookii.Dialogs.WinForms\Ookii.Dialogs.WinForms.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/sample/net60/Ookii.Dialogs.WinForms.SampleNet60.csproj b/sample/net60/Ookii.Dialogs.WinForms.SampleNet60.csproj
@@ -0,0 +1,42 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Copyright>Copyright (c) 2009-2021 Ookii Dialogs Contributors</Copyright>
+    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
+    <Authors>Ookii Dialogs Contributors</Authors>
+    <Description>Ookii.Dialogs.WinForms is a class library for .NET applications providing several common dialogs. Included are classes for task dialogs, credential dialog, progress dialog, input dialog, folder browser dialog, and more.</Description>
+    <PackageProjectUrl>https://github.com/ookii-dialogs/ookii-dialogs-winforms</PackageProjectUrl>
+    <PackageIcon>ookii-dialogs-winforms-nuget.png</PackageIcon>
+    <RepositoryUrl>https://github.com/ookii-dialogs/ookii-dialogs-winforms</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageTags>ookii dialogs winforms windowsforms windows-forms progress-dialog task-dialog credential-dialog input-dialog common-file-dialog</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\shared\MainForm.cs" Link="MainForm.cs" />
+    <Compile Include="..\shared\MainForm.Designer.cs" Link="MainForm.Designer.cs" />
+    <Compile Include="..\shared\Program.cs" Link="Program.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\shared\ookii.ico" Link="ookii.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="..\shared\MainForm.resx" Link="MainForm.resx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="..\..\assets\ookii-dialogs-winforms-nuget.png" Pack="True" PackagePath="/" />
+    <None Include="..\shared\App.config" Link="App.config" />
+    <None Include="..\shared\app.manifest" Link="app.manifest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Ookii.Dialogs.WinForms\Ookii.Dialogs.WinForms.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Ookii.Dialogs.WinForms/Ookii.Dialogs.WinForms.csproj b/src/Ookii.Dialogs.WinForms/Ookii.Dialogs.WinForms.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>Ookii.Dialogs.WinForms</RootNamespace>
 

diff --git a/src/Ookii.Dialogs.WindowsForms/Ookii.Dialogs.WindowsForms.csproj b/src/Ookii.Dialogs.WindowsForms/Ookii.Dialogs.WindowsForms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net5.0-windows;netcoreapp3.1;net462</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>