Skip to content

Commit cb77c0b

Browse files
EWSoftwareEWSoftware
committed
Added support for .NET 6 or later Windows Forms controls
1 parent a27565d commit cb77c0b

83 files changed

Lines changed: 747 additions & 2818 deletions

File tree

Some content is hidden

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

‎Doc/Content/VersionHistory/VersionHistory.aml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ Data Interchange (PDI) Library </legacyBold> over the life of the project.</para
1515
<para>Select a version below to see a description of its changes.</para>
1616

1717
<list class="bullet">
18+
<listItem>
19+
<para>
20+
<link xlink:href="d1d9a1d2-7495-457e-9095-880ab00515a3" />
21+
</para>
22+
</listItem>
1823
<listItem>
1924
<para>
2025
<link xlink:href="3ebeed58-ecb5-475f-93c1-c9e0098ac5a0" />

‎Doc/Content/VersionHistory/v2023.1.2.0.aml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<topic id="d1d9a1d2-7495-457e-9095-880ab00515a3" revisionNumber="1">
3+
<developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
4+
<introduction>
5+
<para>Release notes for version 2023.1.2.0.</para>
6+
</introduction>
7+
8+
<section>
9+
<content>
10+
<list class="bullet">
11+
<listItem>
12+
<para>Added support for <codeInline>net6.0-windows</codeInline> to the
13+
<localUri>EWSoftware.PDI.Windows.Forms</localUri> library.</para>
14+
</listItem>
15+
16+
<listItem>
17+
<para>Updated all Windows Forms demo projects to support .NET 6.0.</para>
18+
</listItem>
19+
</list>
20+
21+
</content>
22+
</section>
23+
24+
<relatedTopics>
25+
<link xlink:href="8885fe94-537b-45a2-84e9-112fa9c976ff" />
26+
</relatedTopics>
27+
28+
</developerConceptualDocument>
29+
</topic>

‎Doc/ContentLayout.content‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,16 @@
112112
<HelpKeyword index="K" term="support, donate" />
113113
</HelpKeywords>
114114
</Topic>
115-
<Topic id="8885fe94-537b-45a2-84e9-112fa9c976ff" visible="True" isExpanded="true" isSelected="true" title="Version History">
115+
<Topic id="8885fe94-537b-45a2-84e9-112fa9c976ff" visible="True" isExpanded="true" title="Version History">
116116
<HelpKeywords>
117117
<HelpKeyword index="K" term="history" />
118118
<HelpKeyword index="K" term="version history" />
119119
</HelpKeywords>
120+
<Topic id="d1d9a1d2-7495-457e-9095-880ab00515a3" visible="True" isSelected="true" title="Version 2023.1.2.0">
121+
<HelpKeywords>
122+
<HelpKeyword index="K" term="versions, 2023.1.2.0" />
123+
</HelpKeywords>
124+
</Topic>
120125
<Topic id="3ebeed58-ecb5-475f-93c1-c9e0098ac5a0" visible="True" title="Version 2021.11.23.0">
121126
<HelpKeywords>
122127
<HelpKeyword index="K" term="versions, 2021.11.23.0" />

‎Doc/EWSoftwarePDI.shfbproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
3030
<HelpTitle>EWSoftware.PDI Namespace Documentation</HelpTitle>
3131
<CopyrightHref>https://github.com/EWSoftware/PDI</CopyrightHref>
32-
<CopyrightText>[v{%40HelpFileVersion}] Copyright \xA9 2003-2021, Eric Woodruff, All Rights Reserved</CopyrightText>
32+
<CopyrightText>[v{%40HelpFileVersion}] Copyright \xA9 2003-2023, Eric Woodruff, All Rights Reserved</CopyrightText>
3333
<FeedbackEMailAddress>Eric%40EWoodruff.us</FeedbackEMailAddress>
3434
<PresentationStyle>Default2022</PresentationStyle>
3535
<SyntaxFilters>Standard</SyntaxFilters>
@@ -49,7 +49,7 @@
4949
<NamespaceSummaryItem name="EWSoftware.PDI.Web.Design" isDocumented="True">Personal Data Interchange ASP.NET web server control designers developed by Eric Woodruff.</NamespaceSummaryItem>
5050
<NamespaceSummaryItem name="EWSoftware.PDI.Windows.Forms" isDocumented="True">Personal Data Interchange Windows Forms controls developed by Eric Woodruff.</NamespaceSummaryItem>
5151
</NamespaceSummaries>
52-
<HelpFileVersion>2021.11.23.0</HelpFileVersion>
52+
<HelpFileVersion>2022.1.2.0</HelpFileVersion>
5353
<ApiFilter />
5454
<PlugInConfigurations>
5555
<PlugInConfig id="Output Deployment" enabled="True">
@@ -194,6 +194,7 @@
194194
<None Include="Content\VersionHistory\v2020.11.25.0.aml" />
195195
<None Include="Content\VersionHistory\v2020.7.24.0.aml" />
196196
<None Include="Content\VersionHistory\v2021.11.23.0.aml" />
197+
<None Include="Content\VersionHistory\v2023.1.2.0.aml" />
197198
<None Include="Content\Welcome.aml" />
198199
<None Include="Content\VersionHistory\v2.0.0.2.aml" />
199200
<None Include="Content\VersionHistory\v2.0.0.0.aml" />

‎MasterBuild.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15
1616
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\bin\MSBuild.exe"
1717
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\MSBuild\Current" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\MSBuild\Current\bin\MSBuild.exe"
1818
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\bin\MSBuild.exe"
19-
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Community\MSBuild\Current" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\MSBuild.exe"
20-
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Professional\MSBuild\Current" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\bin\MSBuild.exe"
21-
IF EXIST "%ProgramFiles(x86)%\Microsoft Visual Studio\202\Enterprise\MSBuild\Current" SET "MSBUILD=%ProgramFiles(x86)%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\bin\MSBuild.exe"
19+
IF EXIST "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current" SET "MSBUILD=%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\MSBuild.exe"
20+
IF EXIST "%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current" SET "MSBUILD=%ProgramFiles%\Microsoft Visual Studio\2022\Professional\MSBuild\Current\bin\MSBuild.exe"
21+
IF EXIST "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current" SET "MSBUILD=%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\bin\MSBuild.exe"
2222

2323
"%MSBUILD%" /nologo /v:m /m Source\EWSPDI.sln /t:Clean;Build "/p:Configuration=Release;Platform=Any CPU"
2424

‎Source/.editorconfig‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ dotnet_style_explicit_tuple_names = true : error
3535
dotnet_style_null_propagation = true : suggestion
3636
dotnet_style_object_initializer = true : suggestion
3737

38+
# CA1303: Do not pass literals as localized parameters
39+
dotnet_diagnostic.CA1303.severity = none
40+
41+
# IDE1006: Naming Styles
42+
dotnet_diagnostic.IDE1006.severity = none
43+
3844
# CSharp code style settings
3945
[*.cs]
4046
csharp_style_var_elsewhere = false : none
@@ -94,9 +100,6 @@ csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
94100
csharp_space_between_method_declaration_name_and_open_parenthesis = false
95101
csharp_space_between_method_declaration_parameter_list_parentheses = false
96102

97-
# CA1303: Do not pass literals as localized parameters
98-
dotnet_diagnostic.CA1303.severity = none
99-
100103
# IDE0010: Add missing cases
101104
dotnet_diagnostic.IDE0010.severity = none
102105

@@ -118,9 +121,6 @@ dotnet_diagnostic.IDE0055.severity = none
118121
# IDE0058: Expression value is never used
119122
dotnet_diagnostic.IDE0058.severity = none
120123

121-
# IDE1006: Naming Styles
122-
dotnet_diagnostic.IDE1006.severity = none
123-
124124
# These are disabled as we're still targeting .NET Framework as well and I don't want a lot of conditional code
125125
# to suppress these.
126126
# IDE0056: Use index operator
@@ -131,3 +131,9 @@ dotnet_diagnostic.IDE0057.severity = none
131131

132132
# IDE0063: Use simple 'using' statement
133133
dotnet_diagnostic.IDE0063.severity = none
134+
135+
# IDE0066: Convert switch statement to expression
136+
dotnet_diagnostic.IDE0066.severity = none
137+
138+
# IDE0090: Use 'new(...)'
139+
dotnet_diagnostic.IDE0090.severity = none

‎Source/CSharpDemos.sln‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27004.2002
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.4.33205.214
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CalendarBrowser", "CSharpDemos\CalendarBrowser\CalendarBrowser.csproj", "{20487237-F96A-4725-A82D-96FD26AF9DFE}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CalendarBrowser", "CSharpDemos\CalendarBrowser\CalendarBrowser.csproj", "{20487237-F96A-4725-A82D-96FD26AF9DFE}"
66
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDIWinFormsTest", "CSharpDemos\PDIWinFormsTest\PDIWinFormsTest.csproj", "{011CC2DB-A5AE-4788-AF84-C4C1A8CDF10A}"
8-
EndProject
9-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vCardBrowser", "CSharpDemos\vCardBrowser\vCardBrowser.csproj", "{AC9020EB-63D3-4515-A868-8D290356FBE5}"
7+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vCardBrowser", "CSharpDemos\vCardBrowser\vCardBrowser.csproj", "{AC9020EB-63D3-4515-A868-8D290356FBE5}"
108
EndProject
119
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D3E23A2C-E571-4DF2-BCA1-172B2C994300}"
1210
ProjectSection(SolutionItems) = preProject
1311
.editorconfig = .editorconfig
1412
Common.vsspell = Common.vsspell
1513
CSharpDemos.sln.vsspell = CSharpDemos.sln.vsspell
16-
EWSPDIDemos.ruleset = EWSPDIDemos.ruleset
1714
EndProjectSection
1815
EndProject
1916
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EWSoftware.PDI", "EWSPDI\EWSoftware.PDI.csproj", "{024821DE-3508-476A-97E7-441334A1B2DF}"
@@ -28,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PDIParserTest", "CSharpDemo
2825
EndProject
2926
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RFC2445RecurTest", "CSharpDemos\RFC2445RecurTest\RFC2445RecurTest.csproj", "{E0D46484-AAAE-41A1-85A7-9903B3DACB28}"
3027
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PDIWinFormsTest", "CSharpDemos\PDIWinFormsTest\PDIWinFormsTest.csproj", "{969B43B1-5E6E-4C96-AE49-36A4D88119D8}"
29+
EndProject
3130
Global
3231
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3332
Debug|Any CPU = Debug|Any CPU
@@ -38,10 +37,6 @@ Global
3837
{20487237-F96A-4725-A82D-96FD26AF9DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
3938
{20487237-F96A-4725-A82D-96FD26AF9DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
4039
{20487237-F96A-4725-A82D-96FD26AF9DFE}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{011CC2DB-A5AE-4788-AF84-C4C1A8CDF10A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{011CC2DB-A5AE-4788-AF84-C4C1A8CDF10A}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{011CC2DB-A5AE-4788-AF84-C4C1A8CDF10A}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{011CC2DB-A5AE-4788-AF84-C4C1A8CDF10A}.Release|Any CPU.Build.0 = Release|Any CPU
4540
{AC9020EB-63D3-4515-A868-8D290356FBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4641
{AC9020EB-63D3-4515-A868-8D290356FBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
4742
{AC9020EB-63D3-4515-A868-8D290356FBE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -70,6 +65,10 @@ Global
7065
{E0D46484-AAAE-41A1-85A7-9903B3DACB28}.Debug|Any CPU.Build.0 = Debug|Any CPU
7166
{E0D46484-AAAE-41A1-85A7-9903B3DACB28}.Release|Any CPU.ActiveCfg = Release|Any CPU
7267
{E0D46484-AAAE-41A1-85A7-9903B3DACB28}.Release|Any CPU.Build.0 = Release|Any CPU
68+
{969B43B1-5E6E-4C96-AE49-36A4D88119D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69+
{969B43B1-5E6E-4C96-AE49-36A4D88119D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
70+
{969B43B1-5E6E-4C96-AE49-36A4D88119D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
71+
{969B43B1-5E6E-4C96-AE49-36A4D88119D8}.Release|Any CPU.Build.0 = Release|Any CPU
7372
EndGlobalSection
7473
GlobalSection(SolutionProperties) = preSolution
7574
HideSolutionNode = FALSE

‎Source/CSharpDemos/CalendarBrowser/AttachmentsControl.cs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
// System : EWSoftware PDI Demonstration Applications
33
// File : AttachmentsControl.cs
44
// Author : Eric Woodruff (Eric@EWoodruff.us)
5-
// Updated : 11/24/2018
6-
// Note : Copyright 2004-2018, Eric Woodruff, All rights reserved
7-
// Compiler: Visual C#
5+
// Updated : 01/02/2023
6+
// Note : Copyright 2004-2023, Eric Woodruff, All rights reserved
87
//
98
// This is used to edit a calendar object's attachment properties
109
//
@@ -82,9 +81,9 @@ public void SetValues(AttachPropertyCollection attachments)
8281
foreach(AttachProperty a in attach)
8382
{
8483
if(a.ValueLocation == ValLocValue.Binary)
85-
desc = String.Format("Inline - {0}", a.FormatType);
84+
desc = $"Inline - {a.FormatType}";
8685
else
87-
desc = String.Format("External - {0}, {1}", a.FormatType, a.Value);
86+
desc = $"External - {a.FormatType}, {a.Value}";
8887

8988
lbAttachments.Items.Add(desc);
9089
}
@@ -103,8 +102,8 @@ public void SetValues(AttachPropertyCollection attachments)
103102
/// <param name="attachments">The attachments collection to update</param>
104103
public void GetValues(AttachPropertyCollection attachments)
105104
{
106-
attachments.Clear();
107-
attachments.CloneRange(attach);
105+
attachments?.Clear();
106+
attachments?.CloneRange(attach);
108107
}
109108
#endregion
110109

@@ -177,7 +176,7 @@ private void btnAdd_Click(object sender, EventArgs e)
177176
{
178177
a.ValueLocation = ValLocValue.Uri;
179178
a.Value = txtFilename.Text;
180-
desc = String.Format("External - {0}, {1}", a.FormatType, a.Value);
179+
desc = $"External - {a.FormatType}, {a.Value}";
181180
}
182181
else
183182
{
@@ -190,15 +189,15 @@ private void btnAdd_Click(object sender, EventArgs e)
190189
a.SetAttachmentBytes(byData);
191190
}
192191

193-
desc = String.Format("Inline - {0}", a.FormatType);
192+
desc = $"Inline - {a.FormatType}";
194193
}
195194

196195
attach.Add(a);
197196
lbAttachments.Items.Add(desc);
198197
}
199198
catch(Exception ex)
200199
{
201-
string error = String.Format("Unable to add attachment:\n{0}", ex.Message);
200+
string error = $"Unable to add attachment:\n{ex.Message}";
202201

203202
if(ex.InnerException != null)
204203
{
@@ -278,7 +277,7 @@ private void btnDetach_Click(object sender, EventArgs e)
278277
}
279278
catch(Exception ex)
280279
{
281-
string error = String.Format("Unable to save attachment:\n{0}", ex.Message);
280+
string error = $"Unable to save attachment:\n{ex.Message}";
282281

283282
if(ex.InnerException != null)
284283
{

0 commit comments

Comments
 (0)