Skip to content

Commit b8d5229

Browse files
author
dahall
committed
Added support for .NET 7, 8, and 9 (9 not supported yet for TaskSchedulerEditor and changed version to 2.12.0.
1 parent fc3bcad commit b8d5229

File tree

2,637 files changed

+20984
-64964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,637 files changed

+20984
-64964
lines changed

‎Directory.Build.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<Authors>David Hall</Authors>
44
<Company>GitHub Community</Company>
5-
<Copyright>Copyright © 2002-2024</Copyright>
5+
<Copyright>Copyright © 2002-2025</Copyright>
66
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
77
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
88
<IncludeSource>true</IncludeSource>
@@ -14,7 +14,7 @@
1414
<PackageIcon>tsnew48.png</PackageIcon>
1515
<RepositoryUrl>https://github.com/dahall/taskscheduler</RepositoryUrl>
1616
<RepositoryType>Git</RepositoryType>
17-
<Version>2.11.1</Version>
17+
<Version>2.12.0</Version>
1818
<SignAssembly>True</SignAssembly>
1919
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Microsoft.Windows.TaskScheduler.snk</AssemblyOriginatorKeyFile>
2020
<NoWarn>$(NoWarn);NETSDK1138;SYSLIB0003;SYSLIB0004;SYSLIB0011;SYSLIB0051;CS0672;NU1701</NoWarn>
@@ -33,7 +33,7 @@
3333
<DeterministicSourcePaths>$(CIBUILD)</DeterministicSourcePaths>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<PackageReference Condition="!$(MSBuildProjectDirectory.Contains('UnitTests'))" Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
36+
<PackageReference Condition="!$(MSBuildProjectDirectory.Contains('UnitTests'))" Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3737
<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
3838
</ItemGroup>
3939
<!-- END: Source Link configuration. -->

‎TaskSchedulerHelp/TaskSchedulerHelp.shfbproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<NamespaceSummaryItem name="System.Reflection" isDocumented="False" />
111111
<NamespaceSummaryItem name="System.Security.AccessControl" isDocumented="False" />
112112
</NamespaceSummaries>
113-
<HelpFileVersion>2.11.1</HelpFileVersion>
113+
<HelpFileVersion>2.12.0</HelpFileVersion>
114114
<HelpFileFormat>Website</HelpFileFormat>
115115
<CopyrightHref>https://github.com/dahall/TaskScheduler/blob/master/license.md</CopyrightHref>
116116
<SdkLinkTarget>Blank</SdkLinkTarget>

‎TaskSchedulerMockup/FolderPanel.cs

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Microsoft.Win32.TaskScheduler;
22
using System;
3+
using System.ComponentModel;
34
using System.Windows.Forms;
45

56
namespace TaskSchedulerMockup
@@ -16,6 +17,7 @@ public FolderPanel()
1617

1718
public ToolStrip MenuItems => itemMenuStrip;
1819

20+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
1921
public TaskFolder TaskFolder
2022
{
2123
get { return TaskListView.Folder; }
@@ -29,6 +31,7 @@ public TaskFolder TaskFolder
2931
}
3032
}
3133

34+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
3235
public TaskService TaskService { get; set; }
3336

3437
private void deleteMenu_Click(object sender, EventArgs e)

‎TaskSchedulerMockup/HomePanel.cs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public HomePanel()
2828

2929
public ToolStrip MenuItems => null;
3030

31+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
3132
public TaskService TaskService
3233
{
3334
get { return ts; }

‎TaskSchedulerMockup/NewFolderDlg.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.ComponentModel;
23
using System.Windows.Forms;
34

45
namespace TaskSchedulerMockup
@@ -12,6 +13,7 @@ public NewFolderDlg()
1213
InitializeComponent();
1314
}
1415

16+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
1517
public string FolderName
1618
{
1719
get

‎TaskSchedulerMockup/TaskSchedulerMockup.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net9.0-windows7.0</TargetFramework>
55
<AssemblyTitle>TaskSchedulerMockup</AssemblyTitle>
66
<Description>https://github.com/dahall/TaskScheduler</Description>
77
<OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>
@@ -10,7 +10,7 @@
1010
<ApplicationIcon>Resources\ts.ico</ApplicationIcon>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
13+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
1414
<PackageReference Include="TimeSpan2" Version="2.4.3" />
1515
</ItemGroup>
1616
<ItemGroup>

‎TaskService/TaskService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net45;net48;net6.0-windows;net7.0-windows;net8.0-windows;netstandard2.0;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks>net45;net48;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows;netstandard2.0;netcoreapp3.1</TargetFrameworks>
44
<AssemblyName>Microsoft.Win32.TaskScheduler</AssemblyName>
55
<RootNamespace>Microsoft.Win32.TaskScheduler</RootNamespace>
66
<PackageId>TaskScheduler</PackageId>

‎TestTaskService/ScriptTestDlg.cs

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Windows.Forms;
77
using Microsoft.CSharp;
88
using Microsoft.Win32.TaskScheduler;
9+
using System.ComponentModel;
910

1011
namespace TestTaskService
1112
{
@@ -25,6 +26,7 @@ public ScriptTestDlg()
2526
codeEditor.DragEnter += CodeEditor_DragEnter;
2627
}
2728

29+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
2830
public TaskService TaskService { get; set; }
2931

3032
private void closeBtn_Click(object sender, EventArgs e)

‎TestTaskService/TestTaskService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0-windows</TargetFramework>
4+
<TargetFramework>net9.0-windows7.0</TargetFramework>
55
<!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>-->
66
<AssemblyTitle>TestTaskService</AssemblyTitle>
77
<OutputPath>bin\$(Configuration)\$(TargetFrameworkVersion)</OutputPath>

‎docs/GeneralError.html

-32
This file was deleted.

‎docs/PageNotFound.html

-34
This file was deleted.

‎docs/SearchHelp.aspx

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// System : Sandcastle Help File Builder
66
// File : SearchHelp.aspx
77
// Author : Eric Woodruff ([email protected])
8-
// Updated : 08/13/2022
9-
// Note : Copyright 2007-202, Eric Woodruff, All rights reserved
8+
// Updated : 08/02/2024
9+
// Note : Copyright 2007-2024, Eric Woodruff, All rights reserved
1010
//
1111
// This file contains the code used to search for keywords within the help topics using the full-text index
1212
// files created by the help file builder.
@@ -119,7 +119,7 @@ private List<string> ParseKeywords(string keywords)
119119
{
120120
checkWord = word.ToLower(CultureInfo.InvariantCulture);
121121
122-
if(checkWord.Length >= 2 && !Char.IsDigit(checkWord[0]) && !keywordList.Contains(checkWord))
122+
if(checkWord.Length >= 2 && !keywordList.Contains(checkWord))
123123
keywordList.Add(checkWord);
124124
}
125125

‎docs/SearchHelp.inc.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ function ParseKeywords($keywords)
2929
foreach($words as $word)
3030
{
3131
$checkWord = strtolower($word);
32-
$first = substr($checkWord, 0, 1);
33-
if(strlen($checkWord) >= 2 && !ctype_digit($first) && !in_array($checkWord, $keywordList))
32+
33+
if(strlen($checkWord) >= 2 && !in_array($checkWord, $keywordList))
3434
{
3535
array_push($keywordList, $checkWord);
3636
}

‎docs/Web.Config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0"?>
22
<configuration xmlns="http://schemas.microsoft.com/.NetConfiguration/v2.0">
33
<system.web>
4-
<customErrors mode="On" defaultRedirect="~/GeneralError.html">
5-
<error statusCode="404" redirect="~/PageNotFound.html" />
4+
<customErrors mode="On" defaultRedirect="~/html/GeneralError.htm">
5+
<error statusCode="404" redirect="~/html/PageNotFound.htm" />
66
</customErrors>
77
<compilation debug="false">
88
<assemblies>
9-
<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
9+
<add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
1010
</assemblies>
1111
</compilation>
1212
<pages>

0 commit comments

Comments
 (0)