Updated version to 2.10.0 and added support for .NET 6.0

dahall · dahall · commit f4d21c5c8c72 · 2021-12-13T16:15:25.000-07:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,7 +16,7 @@
     <RepositoryType>Git</RepositoryType>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Microsoft.Windows.TaskScheduler.pfx</AssemblyOriginatorKeyFile>
-    <Version>2.9.3</Version>
+    <Version>2.10.0</Version>
     <NoWarn>$(NoWarn);NETSDK1138;SYSLIB0003;SYSLIB0004;SYSLIB0011</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Once referenced by your project, all classes can be found in the `Microsoft.Win3
 ### Main Library
 Microsoft introduced version 2.0 (internally version 1.2) with a completely new object model with Windows Vista. The managed assembly closely resembles the new object model, but allows the 1.0 (internally version 1.1) COM objects to be manipulated. It will automatically choose the most recent version of the library found on the host system (up through 1.4). Core features include:
 
-* Separate, functionally identical, libraries for .NET 2.0, 3.5, 4.0, 4.52, 5.0, .NET Standard 2.0, .NET Core 2.0, 2.1, 3.0, 3.1.
+* Separate, functionally identical, libraries for .NET 2.0, 3.5, 4.0, 4.52, 5.0, 6.0, .NET Standard 2.0, .NET Core 2.0, 2.1, 3.0, 3.1.
 * Unlike the base COM libraries, this wrapper helps to create and view tasks up and down stream.
 * Written in C#, but works with any .NET language including scripting languages (e.g. PowerShell).
 * Supports all V2 native properties, even under V1 systems.
diff --git a/TaskEditor/DialogBase.cs b/TaskEditor/DialogBase.cs
@@ -657,7 +657,7 @@ public DialogBase()
 			}
 		}
 
-#if !NET5_0
+#if !NET5_0_OR_GREATER
 		/// <summary>
 		/// Occurs when the value of the <see cref="P:System.Windows.Forms.Control.ContextMenu"/> property changes.
 		/// </summary>
@@ -1397,7 +1397,7 @@ public override ImageLayout BackgroundImageLayout
 			}
 		}
 
-#if !NET5_0
+#if !NET5_0_OR_GREATER
 		/// <summary>
 		/// Gets or sets the shortcut menu associated with the control.
 		/// </summary>
@@ -1865,7 +1865,7 @@ public override Color ForeColor
 			}
 		}
 
-#if !NET5_0
+#if !NET5_0_OR_GREATER
 		/// <summary>
 		/// Gets or sets the <see cref="T:System.Windows.Forms.MainMenu"/> that is displayed in the form.
 		/// </summary>
diff --git a/TaskEditor/TaskEditor.csproj b/TaskEditor/TaskEditor.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <UseWindowsForms>true</UseWindowsForms>
-    <TargetFrameworks>net20;net35;net40;net452;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net452;net5.0-windows;net6.0-windows</TargetFrameworks>
     <AssemblyName>Microsoft.Win32.TaskSchedulerEditor</AssemblyName>
     <RootNamespace>Microsoft.Win32.TaskScheduler</RootNamespace>
     <PackageId>TaskSchedulerEditor</PackageId>
diff --git a/TaskSchedulerMockup/TaskSchedulerMockup.csproj b/TaskSchedulerMockup/TaskSchedulerMockup.csproj
@@ -7,7 +7,7 @@
     <Product>TaskService</Product>
     <Description>https://github.com/dahall/TaskScheduler</Description>
     <Copyright>Copyright © 2020</Copyright>
-    <Version>2.9.2</Version>
+    <Version>2.10.0</Version>
     <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/TaskService.sln b/TaskService.sln
@@ -1,14 +1,14 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestTaskService", "TestTaskService\TestTaskService.csproj", "{207F8F60-0A74-4959-8623-5D258EB133EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTaskService", "TestTaskService\TestTaskService.csproj", "{207F8F60-0A74-4959-8623-5D258EB133EB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{5279D487-59FA-4D01-9D7A-EA7387D8B67C} = {5279D487-59FA-4D01-9D7A-EA7387D8B67C}
 	EndProjectSection
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VBTestTaskService", "VBTestTaskService\VBTestTaskService.vbproj", "{8C410535-95B6-434B-A03D-1359884D0410}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VBTestTaskService", "VBTestTaskService\VBTestTaskService.vbproj", "{8C410535-95B6-434B-A03D-1359884D0410}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskEditor", "TaskEditor\TaskEditor.csproj", "{5279D487-59FA-4D01-9D7A-EA7387D8B67C}"
 EndProject
@@ -21,15 +21,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskService", "TaskService\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTaskServiceConsole", "TestTaskServiceConsole\TestTaskServiceConsole.csproj", "{7091A61E-0F5C-4FEA-B2F3-2538D53790CD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskSchedulerMockup", "TaskSchedulerMockup\TaskSchedulerMockup.csproj", "{E9B8220B-6104-4FB2-BE74-18562ED032B7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskSchedulerMockup", "TaskSchedulerMockup\TaskSchedulerMockup.csproj", "{E9B8220B-6104-4FB2-BE74-18562ED032B7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5CAA4778-BF5D-46AA-A92E-04F233FE1D16}"
 	ProjectSection(SolutionItems) = preProject
 		code-of-conduct.md = code-of-conduct.md
 		contributing.md = contributing.md
 		VBTestTaskService\Directory.Build.props = VBTestTaskService\Directory.Build.props
+		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		license.md = license.md
+		Microsoft.Windows.TaskScheduler.pfx = Microsoft.Windows.TaskScheduler.pfx
 		README.md = README.md
 	EndProjectSection
 EndProject
diff --git a/TaskService/TaskService.csproj b/TaskService/TaskService.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net20;net35;net40;net452;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;net452;netstandard2.0;netcoreapp2.0;netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0-windows;net6.0-windows</TargetFrameworks>
     <!--<TargetFrameworks>netcoreapp3.1</TargetFrameworks>-->
     <AssemblyName>Microsoft.Win32.TaskScheduler</AssemblyName>
     <RootNamespace>Microsoft.Win32.TaskScheduler</RootNamespace>
@@ -9,9 +9,10 @@
     <Description>Provides a single assembly wrapper for the 1.0 and 2.0 versions of Task Scheduler found in all Microsoft operating systems post Windows 98. It simplifies the coding, aggregates the multiple versions and allows for localization support.</Description>
     <PackageTags>task;interop;windows;taskscheduler;scheduler;.net;task scheduler</PackageTags>
     <PackageReadmeFile>TaskService.md</PackageReadmeFile>
+    <SignAssembly>True</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="TaskService.md" Pack="true" PackagePath="\"/>
+    <None Include="TaskService.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="TaskService.bmp" />
@@ -37,7 +38,7 @@
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or $(TargetFramework.StartsWith('netcoreapp')) Or $(TargetFramework.StartsWith('net5')) ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or $(TargetFramework.StartsWith('netcoreapp')) Or $(TargetFramework.StartsWith('net5')) Or $(TargetFramework.StartsWith('net6')) ">
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0" />
     <PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
diff --git a/TaskService/TaskService.md b/TaskService/TaskService.md
@@ -14,7 +14,7 @@ Below are links to sites that provide in-depth examples, documentation and discu
 ## Key Features
 Microsoft introduced version 2.0 (internally version 1.2) with a completely new object model with Windows Vista. The managed assembly closely resembles the new object model but allows the 1.0 (internally version 1.1) COM objects to be manipulated. It will automatically choose the most recent version of the library found on the host system (up through 1.4). Core features include:
 
-* Separate, functionally identical, libraries for .NET 2.0, 3.5, 4.0, 4.52, 5.0, .NET Standard 2.0, .NET Core 2.0, 2.1, 3.0, 3.1.
+* Separate, functionally identical, libraries for .NET 2.0, 3.5, 4.0, 4.52, 5.0, 6.0, .NET Standard 2.0, .NET Core 2.0, 2.1, 3.0, 3.1.
 * Unlike the base COM libraries, this wrapper accommodates creating and viewing tasks up and down stream.
 * Supports all V2 native properties, even under V1 tasks.
 * Maintain EmailAction and ShowMessageAction using PowerShell scripts for systems after Win8 where these actions have been deprecated.
diff --git a/TestTaskService/TestTaskService.csproj b/TestTaskService/TestTaskService.csproj
@@ -8,7 +8,7 @@
     <Product>TaskService</Product>
     <Description>https://github.com/dahall/TaskScheduler</Description>
     <Copyright>Copyright © 2020</Copyright>
-    <Version>2.9.2</Version>
+    <Version>2.10.0</Version>
     <OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/TestTaskServiceConsole/TestTaskServiceConsole.csproj b/TestTaskServiceConsole/TestTaskServiceConsole.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <StartupObject>TestTaskServiceConsole.Program</StartupObject>
-    <Version>2.9.2</Version>
+    <Version>2.10.0</Version>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
diff --git a/VBTestTaskService/My Project/Resources.Designer.vb b/VBTestTaskService/My Project/Resources.Designer.vb
diff --git a/VBTestTaskService/VBTestTaskService.vbproj b/VBTestTaskService/VBTestTaskService.vbproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.9.3</Version>
+    <Version>2.10.0</Version>
     <OutputType>WinExe</OutputType>
     <StartupObject>VBTestTaskService.Module1</StartupObject>
     <MyType>WindowsFormsWithCustomSubMain</MyType>

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ public DialogBase()`
`657`	`657`	`}`
`658`	`658`	`}`
`659`	`659`
`660`		`-#if !NET5_0`
	`660`	`+#if !NET5_0_OR_GREATER`
`661`	`661`	`/// <summary>`
`662`	`662`	`/// Occurs when the value of the <see cref="P:System.Windows.Forms.Control.ContextMenu"/> property changes.`
`663`	`663`	`/// </summary>`
`@@ -1397,7 +1397,7 @@ public override ImageLayout BackgroundImageLayout`
`1397`	`1397`	`}`
`1398`	`1398`	`}`
`1399`	`1399`
`1400`		`-#if !NET5_0`
	`1400`	`+#if !NET5_0_OR_GREATER`
`1401`	`1401`	`/// <summary>`
`1402`	`1402`	`/// Gets or sets the shortcut menu associated with the control.`
`1403`	`1403`	`/// </summary>`
`@@ -1865,7 +1865,7 @@ public override Color ForeColor`
`1865`	`1865`	`}`
`1866`	`1866`	`}`
`1867`	`1867`
`1868`		`-#if !NET5_0`
	`1868`	`+#if !NET5_0_OR_GREATER`
`1869`	`1869`	`/// <summary>`
`1870`	`1870`	`/// Gets or sets the <see cref="T:System.Windows.Forms.MainMenu"/> that is displayed in the form.`
`1871`	`1871`	`/// </summary>`