Skip to content

Commit c3465b2

Browse files
authored
Merge pull request #32 from USACE-RMC/bug-fixes-and-enhancements
Improve table validation and prepare WPF Framework v1.0.3
2 parents 224aa07 + ebac71c commit c3465b2

19 files changed

Lines changed: 164 additions & 54 deletions

File tree

‎CITATION.cff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cff-version: 1.2.0
22
message: "If you use this software, please cite it as below."
33
type: software
44
title: "WPF Framework"
5-
version: "1.0.2"
6-
date-released: "2026-07-10"
5+
version: "1.0.3"
6+
date-released: "2026-07-14"
77
license: 0BSD
88
repository-code: "https://github.com/USACE-RMC/WPF-Framework"
99
url: "https://github.com/USACE-RMC/WPF-Framework"

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<PackageProjectUrl>https://github.com/USACE-RMC/WPF-Framework</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/USACE-RMC/WPF-Framework</RepositoryUrl>
1616
<RepositoryType>git</RepositoryType>
17-
<Version>1.0.2</Version>
18-
<AssemblyVersion>1.0.2.0</AssemblyVersion>
19-
<FileVersion>1.0.2.0</FileVersion>
17+
<Version>1.0.3</Version>
18+
<AssemblyVersion>1.0.3.0</AssemblyVersion>
19+
<FileVersion>1.0.3.0</FileVersion>
2020

2121
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
2222
<IsPackable>false</IsPackable>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dotnet test WPF-Framework.sln
5151
### Build Packages
5252

5353
```bash
54-
.\scripts\pack-wpf-framework.ps1 -Configuration Release -Version 1.0.2
54+
.\scripts\pack-wpf-framework.ps1 -Configuration Release -Version 1.0.3
5555
```
5656

5757
This creates and validates the following NuGet packages in `artifacts/packages/`:

‎codemeta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"@type": "SoftwareSourceCode",
44
"name": "WPF Framework",
55
"description": "A free and open-source .NET 10 application framework for building Windows desktop project management applications. Provides a docking application shell with theming, project explorer, undo/redo, and specialized controls for charting, numeric input, databases, expression parsing, and directed acyclic graphs.",
6-
"version": "1.0.2",
6+
"version": "1.0.3",
77
"dateCreated": "2025-12-29",
8-
"dateModified": "2026-07-10",
8+
"dateModified": "2026-07-14",
99
"license": "https://spdx.org/licenses/0BSD",
1010
"codeRepository": "https://github.com/USACE-RMC/WPF-Framework",
1111
"issueTracker": "https://github.com/USACE-RMC/WPF-Framework/issues",

‎docs/getting-started.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ For NuGet consumption, reference the Controls bundle. It brings in Core, Models,
3030

3131
```xml
3232
<ItemGroup>
33-
<PackageReference Include="RMC.Wpf.Framework.Controls" Version="1.0.2" />
33+
<PackageReference Include="RMC.Wpf.Framework.Controls" Version="1.0.3" />
3434
</ItemGroup>
3535
```
3636

‎scripts/pack-wpf-framework.ps1‎

Lines changed: 53 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,33 @@ $expectedEntries = @{
7676
"lib/net10.0-windows7.0/Xceed.Wpf.AvalonDock.Themes.VS2013.dll")
7777
}
7878

79+
$expectedVersionedEntries = @{
80+
"RMC.Wpf.Framework.Core" = @(
81+
"lib/net10.0-windows7.0/FrameworkInterfaces.dll",
82+
"lib/net10.0-windows7.0/Themes.dll")
83+
"RMC.Wpf.Framework.Models" = @(
84+
"lib/net10.0-windows7.0/DAG.dll",
85+
"lib/net10.0-windows7.0/DatabaseManager.dll",
86+
"lib/net10.0-windows7.0/ExpressionParser.dll")
87+
"RMC.Wpf.Framework.Support" = @(
88+
"lib/net10.0-windows7.0/SoftwareUpdate.dll",
89+
"contentFiles/any/net10.0-windows7.0/SoftwareUpdate.Updater.exe",
90+
"contentFiles/any/net10.0-windows7.0/SoftwareUpdate.Updater.dll")
91+
"RMC.Wpf.Framework.Controls" = @(
92+
"lib/net10.0-windows7.0/GenericControls.dll",
93+
"lib/net10.0-windows7.0/FrameworkUI.dll",
94+
"lib/net10.0-windows7.0/DAGControls.dll",
95+
"lib/net10.0-windows7.0/DatabaseControls.dll",
96+
"lib/net10.0-windows7.0/ExpressionParserControls.dll",
97+
"lib/net10.0-windows7.0/NumericControls.dll",
98+
"lib/net10.0-windows7.0/OxyPlotControls.dll")
99+
}
100+
79101
$expectedReleaseNotes = @{
80-
"RMC.Wpf.Framework.Core" = "Coordinated WPF Framework 1.0.2 release; no package-specific functional changes."
81-
"RMC.Wpf.Framework.Models" = "Coordinated WPF Framework 1.0.2 release; no package-specific functional changes."
82-
"RMC.Wpf.Framework.Support" = "Version 1.0.2 carries forward protected, transactional self-updates and ships a version-aligned updater payload."
83-
"RMC.Wpf.Framework.Controls" = "Version 1.0.2 improves time-series table validation performance, preserves ordering checks after edits, and avoids repeated full-table scans while rebuilding large series."
102+
"RMC.Wpf.Framework.Core" = "Coordinated WPF Framework 1.0.3 release; no package-specific functional changes."
103+
"RMC.Wpf.Framework.Models" = "Coordinated WPF Framework 1.0.3 release; no package-specific functional changes."
104+
"RMC.Wpf.Framework.Support" = "Coordinated WPF Framework 1.0.3 release; no package-specific functional changes."
105+
"RMC.Wpf.Framework.Controls" = "Version 1.0.3 defaults the DatabaseControls TableViewer Export Table dialog to CSV while retaining DBF, Excel, and SQLite options."
84106
}
85107

86108
foreach ($packageId in $expectedEntries.Keys) {
@@ -134,35 +156,37 @@ foreach ($packageId in $expectedEntries.Keys) {
134156
throw "$($package.Name) has unexpected NuGet release notes."
135157
}
136158

137-
if ($packageId -eq "RMC.Wpf.Framework.Support") {
138-
$numericVersion = ($packageVersion -split '-')[0]
139-
$expectedFileVersion = "$numericVersion.0"
140-
$payloadBinaryEntries = @(
141-
"contentFiles/any/net10.0-windows7.0/SoftwareUpdate.Updater.exe",
142-
"contentFiles/any/net10.0-windows7.0/SoftwareUpdate.Updater.dll")
143-
$inspectionDirectory = Join-Path ([System.IO.Path]::GetTempPath()) "wpf-framework-package-$([Guid]::NewGuid().ToString('N'))"
144-
New-Item -ItemType Directory -Path $inspectionDirectory | Out-Null
145-
146-
try {
147-
foreach ($payloadEntryName in $payloadBinaryEntries) {
148-
$payloadEntry = $zip.GetEntry($payloadEntryName)
149-
$payloadPath = Join-Path $inspectionDirectory ([System.IO.Path]::GetFileName($payloadEntryName))
150-
[System.IO.Compression.ZipFileExtensions]::ExtractToFile($payloadEntry, $payloadPath, $false)
151-
$versionInfo = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($payloadPath)
152-
153-
if ($versionInfo.FileVersion -ne $expectedFileVersion) {
154-
throw "$($package.Name) payload $payloadEntryName has file version $($versionInfo.FileVersion) instead of $expectedFileVersion."
155-
}
159+
$numericVersion = ($packageVersion -split '-')[0]
160+
$expectedBinaryVersion = "$numericVersion.0"
161+
$inspectionDirectory = Join-Path ([System.IO.Path]::GetTempPath()) "wpf-framework-package-$([Guid]::NewGuid().ToString('N'))"
162+
New-Item -ItemType Directory -Path $inspectionDirectory | Out-Null
156163

157-
if ([string]::IsNullOrWhiteSpace($versionInfo.ProductVersion) -or
158-
-not $versionInfo.ProductVersion.StartsWith($packageVersion, [System.StringComparison]::OrdinalIgnoreCase)) {
159-
throw "$($package.Name) payload $payloadEntryName has product version $($versionInfo.ProductVersion) instead of $packageVersion."
164+
try {
165+
foreach ($payloadEntryName in $expectedVersionedEntries[$packageId]) {
166+
$payloadEntry = $zip.GetEntry($payloadEntryName)
167+
$payloadPath = Join-Path $inspectionDirectory ([System.IO.Path]::GetFileName($payloadEntryName))
168+
[System.IO.Compression.ZipFileExtensions]::ExtractToFile($payloadEntry, $payloadPath, $false)
169+
$versionInfo = [System.Diagnostics.FileVersionInfo]::GetVersionInfo($payloadPath)
170+
171+
if ($versionInfo.FileVersion -ne $expectedBinaryVersion) {
172+
throw "$($package.Name) payload $payloadEntryName has file version $($versionInfo.FileVersion) instead of $expectedBinaryVersion."
173+
}
174+
175+
if ([string]::IsNullOrWhiteSpace($versionInfo.ProductVersion) -or
176+
-not $versionInfo.ProductVersion.StartsWith($packageVersion, [System.StringComparison]::OrdinalIgnoreCase)) {
177+
throw "$($package.Name) payload $payloadEntryName has product version $($versionInfo.ProductVersion) instead of $packageVersion."
178+
}
179+
180+
if ([System.IO.Path]::GetExtension($payloadPath).Equals(".dll", [System.StringComparison]::OrdinalIgnoreCase)) {
181+
$assemblyVersion = [System.Reflection.AssemblyName]::GetAssemblyName($payloadPath).Version.ToString()
182+
if ($assemblyVersion -ne $expectedBinaryVersion) {
183+
throw "$($package.Name) payload $payloadEntryName has assembly version $assemblyVersion instead of $expectedBinaryVersion."
160184
}
161185
}
162186
}
163-
finally {
164-
Remove-Item -LiteralPath $inspectionDirectory -Recurse -Force -ErrorAction SilentlyContinue
165-
}
187+
}
188+
finally {
189+
Remove-Item -LiteralPath $inspectionDirectory -Recurse -Force -ErrorAction SilentlyContinue
166190
}
167191
}
168192
finally {

‎src/DAGControls/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@
5050
// You can specify all the values or you can default the Build and Revision Numbers
5151
// by using the '*' as shown below:
5252
// [assembly: AssemblyVersion("1.0.*")]
53-
[assembly: AssemblyVersion("1.0.0.0")]
54-
[assembly: AssemblyFileVersion("1.0.0.0")]
53+
[assembly: AssemblyVersion("1.0.3.0")]
54+
[assembly: AssemblyFileVersion("1.0.3.0")]

‎src/DatabaseControls/TableViewer.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4369,7 +4369,7 @@ private void ExportTable()
43694369
string filters = "comma delimited(*.csv) |*.csv|database(*.dbf) |*.dbf|Excel(*.xlsx) |*.xlsx|Sqlite(*.sqlite) |*.sqlite";
43704370
try
43714371
{
4372-
var saveFileBrowser = new SaveFileDialog { Filter = filters, FilterIndex = 3 };
4372+
var saveFileBrowser = new SaveFileDialog { Filter = filters, FilterIndex = 1 };
43734373
if (saveFileBrowser.ShowDialog() == true)
43744374
{
43754375
switch (System.IO.Path.GetExtension(saveFileBrowser.FileName))

‎src/OxyPlotControls/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
// Build Number
2929
// Revision
3030
//
31-
[assembly: AssemblyVersion("1.0.0.0")]
32-
[assembly: AssemblyFileVersion("1.0.0.0")]
31+
[assembly: AssemblyVersion("1.0.3.0")]
32+
[assembly: AssemblyFileVersion("1.0.3.0")]
3333

3434
[assembly: ThemeInfo(
3535
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located

‎src/Packaging/RMC.Wpf.Framework.Controls/RMC.Wpf.Framework.Controls.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>net10.0-windows</TargetFramework>
44
<IsPackable>true</IsPackable>
55
<IncludeBuildOutput>false</IncludeBuildOutput>
6-
<Version>1.0.2</Version>
6+
<Version>1.0.3</Version>
77
<NuspecFile>RMC.Wpf.Framework.Controls.nuspec</NuspecFile>
88
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
99
<NuspecProperties>configuration=$(Configuration);version=$(Version);rmcNumericsPackageDependencyVersion=$(RmcNumericsPackageDependencyVersion)</NuspecProperties>

0 commit comments

Comments
 (0)