Skip to content

fix(build): reference RMC.Numerics NuGet package instead of sibling c… #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HadenSmith merged 2 commits into from
May 4, 2026
Merged

fix(build): reference RMC.Numerics NuGet package instead of sibling c… #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4527d5
fix(build): reference RMC.Numerics NuGet package instead of sibling c…
HadenSmith Apr 22, 2026
30b56b4
chore(ci): eliminate build warnings and fix baseline/DPI test failures
HadenSmith Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/DatabaseControls.Demo/DatabaseControls.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
<ProjectReference Include="..\Themes\Themes.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Numerics">
<HintPath>..\..\..\numerics\Numerics\bin\$(Configuration)\net10.0\Numerics.dll</HintPath>
</Reference>
<PackageReference Include="RMC.Numerics" Version="2.0.1" />
<ProjectReference Include="..\OxyPlot\OxyPlot\OxyPlot.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf.Shared\OxyPlot.Wpf.Shared.csproj" />
Expand Down
4 changes: 1 addition & 3 deletions src/DatabaseControls/DatabaseControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@
</ItemGroup>

<ItemGroup>
<Reference Include="Numerics">
<HintPath>..\..\..\numerics\Numerics\bin\Debug\net10.0\Numerics.dll</HintPath>
</Reference>
<PackageReference Include="RMC.Numerics" Version="2.0.1" />
<ProjectReference Include="..\OxyPlot\OxyPlot\OxyPlot.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf.Shared\OxyPlot.Wpf.Shared.csproj" />
Expand Down
4 changes: 1 addition & 3 deletions src/FrameworkUI.Demo/FrameworkUI.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@
</ItemGroup>

<ItemGroup>
<Reference Include="Numerics">
<HintPath>..\..\..\numerics\Numerics\bin\$(Configuration)\net10.0\Numerics.dll</HintPath>
</Reference>
<PackageReference Include="RMC.Numerics" Version="2.0.1" />
<ProjectReference Include="..\OxyPlot\OxyPlot\OxyPlot.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf.Shared\OxyPlot.Wpf.Shared.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/FrameworkUI/Main Window/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ private void SaveLayout()
FrameworkInterfaces.Messaging.Messenger.GetInstance().Add(
new BasicMessageItem(MessageType.Warning,
$"Failed to save dock layout: {ex.Message}",
null, "MainWindow", string.Empty, "SaveLayout"));
this, "MainWindow", string.Empty, "SaveLayout"));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/FrameworkUI/Project Explorer/View Models/Node.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ protected virtual void UpdateRenameTextBox()

/// <summary>
/// When header loses focus, update rename text box.
/// </summary
/// </summary>
protected virtual void HeaderRenameTextbox_LostFocus(object sender, RoutedEventArgs e)
{
if (_hitTestResult == null || !(_hitTestResult.VisualHit is TextBox))
Expand Down
18 changes: 0 additions & 18 deletions src/FrameworkUI/Project Explorer/View Models/ProjectNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,24 +532,6 @@ private void NodeHeader_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
e.Handled = true;
}

/// <summary>
/// Raises the set properties control event.
/// </summary>
/// <param name="propertyControl">The property control to set.</param>
//protected void RaiseSetPropertiesControl(Control propertyControl)
//{
// SetPropertiesControl?.Invoke(propertyControl);
//}

/// <summary>
/// Raises the close property control event.
/// </summary>
/// <param name="propertyControl">The property control to close.</param>
//protected void RaiseClosePropertiesControl(Control propertyControl)
//{
// ClosePropertiesControl?.Invoke(propertyControl);
//}

#endregion

}
Expand Down
9 changes: 5 additions & 4 deletions src/FrameworkUI/Project Explorer/Views/NodeHeader.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ namespace FrameworkUI.ProjectExplorer
/// </summary>
/// <remarks>
/// <para>
/// Authors:
/// Woody Fields
/// Haden Smith, USACE Risk Management Center, cole.h.smith@usace.army.mil
/// </para>
/// <b>Authors:</b>
/// </para>
/// <list type="bullet">
/// <item>Woody Fields</item>
/// <item>Haden Smith, USACE Risk Management Center, cole.h.smith@usace.army.mil</item>
/// </list>
/// </remarks>
public partial class NodeHeader : UserControl
{
Expand Down
12 changes: 5 additions & 7 deletions src/FrameworkUI/Utilities/ShellPublicVariables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ namespace FrameworkUI
/// </summary>
/// <remarks>
/// <para>
/// Authors:
/// <para>
/// <b> Authors: </b>
/// <list type="bullet">
/// <item> Haden Smith, USACE Risk Management Center, cole.h.smith@usace.army.mil </item>
/// </list>
/// </para>
/// <b>Authors:</b>
/// </para>
/// <list type="bullet">
/// <item>Haden Smith, USACE Risk Management Center, cole.h.smith@usace.army.mil</item>
/// </list>
/// </remarks>
public static class ShellPublicVariables
{
Expand Down
1 change: 0 additions & 1 deletion src/FrameworkUI/Utilities/UtilityFunctions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ orderby p.Name
/// <summary>
/// Adds the handlers from the source component to the destination component
/// </summary>
/// <typeparam name="T">An IComponent type</typeparam>
/// <param name="destinationComponent">The destination component.</param>
/// <param name="sourceComponent">The source component.</param>
public static void CopyClick(this MenuItem destinationComponent, MenuItem sourceComponent)
Expand Down
4 changes: 1 addition & 3 deletions src/NumericControls.Demo/NumericControls.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
</ItemGroup>

<ItemGroup>
<Reference Include="Numerics">
<HintPath>..\..\..\numerics\Numerics\bin\$(Configuration)\net10.0\Numerics.dll</HintPath>
</Reference>
<PackageReference Include="RMC.Numerics" Version="2.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions src/NumericControls/NumericControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
</ItemGroup>

<ItemGroup>
<Reference Include="Numerics">
<HintPath>..\..\..\numerics\Numerics\bin\Debug\net10.0\Numerics.dll</HintPath>
</Reference>
<PackageReference Include="RMC.Numerics" Version="2.0.1" />
<ProjectReference Include="..\OxyPlot\OxyPlot\OxyPlot.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf.Shared\OxyPlot.Wpf.Shared.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/OxyPlot/OxyPlot.Wpf.Shared/OxyPlot.Wpf.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>OxyPlot.Wpf.Shared.snk</AssemblyOriginatorKeyFile>
<NoWarn>$(NoWarn);CS0618</NoWarn>
</PropertyGroup>
<ItemGroup>
<None Include="OxyPlot.Wpf.Shared.snk" />
Expand Down
1 change: 1 addition & 0 deletions src/OxyPlot/OxyPlot.Wpf/OxyPlot.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<LangVersion>8</LangVersion>
<SignAssembly>true</SignAssembly>
<Description>OxyPlot is a plotting library for .NET. This package targets WPF applications.</Description>
<NoWarn>$(NoWarn);CS0618</NoWarn>
</PropertyGroup>
<ItemGroup>
<None Include="OxyPlot.Wpf.snk" />
Expand Down
4 changes: 1 addition & 3 deletions src/OxyPlotControls.Demo/OxyPlotControls.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DatabaseManager\DatabaseManager.csproj" />
<Reference Include="Numerics">
<HintPath>..\..\..\numerics\Numerics\bin\$(Configuration)\net10.0\Numerics.dll</HintPath>
</Reference>
<PackageReference Include="RMC.Numerics" Version="2.0.1" />
<ProjectReference Include="..\OxyPlot\OxyPlot\OxyPlot.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf\OxyPlot.Wpf.csproj" />
<ProjectReference Include="..\OxyPlot\OxyPlot.Wpf.Shared\OxyPlot.Wpf.Shared.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/OxyPlotControls/OxyPlotControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<RootNamespace>OxyPlotControls</RootNamespace>
<AssemblyName>OxyPlotControls</AssemblyName>
<NoWarn>$(NoWarn);CA1416</NoWarn>
<NoWarn>$(NoWarn);CA1416;CS0618</NoWarn>

<IsWpfFrameworkLibrary>true</IsWpfFrameworkLibrary>
<PackageId>RMC.OxyPlotControls</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion tests/FrameworkInterfaces.Tests/Undo/Actions/ElementActionTestHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ internal class MockElementCollection : IElementCollection
/// </summary>
public event ElementRemovedEventHandler? ElementRemoved;

#pragma warning disable CS0067 // Events are never used (mock implementation satisfies interface)
/// <summary>
/// Occurs when a child element transitions from clean to dirty.
/// </summary>
Expand All @@ -238,7 +239,6 @@ internal class MockElementCollection : IElementCollection
/// <summary>
/// Occurs before the collection is saved.
/// </summary>
#pragma warning disable CS0067 // Event is never used (mock implementation satisfies interface)
public event PreviewObjectSavedEventHandler? PreviewObjectSaved;

/// <summary>
Expand Down
4 changes: 1 addition & 3 deletions tests/NumericControls.Tests/NumericControls.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
</ItemGroup>

<ItemGroup>
<Reference Include="Numerics">
<HintPath>..\..\..\numerics\Numerics\bin\$(Configuration)\net10.0\Numerics.dll</HintPath>
</Reference>
<PackageReference Include="RMC.Numerics" Version="2.0.1" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions tests/OxyPlot.ExampleLibrary/OxyPlot.ExampleLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<Description>Example models for OxyPlot.</Description>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<LangVersion>11</LangVersion>
<NoWarn>$(NoWarn);CS0618</NoWarn>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Bergensbanen.csv" />
Expand Down
3 changes: 3 additions & 0 deletions tests/OxyPlot.Tests/OxyPlot.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,8 @@
<Content Include="Imaging\TestImages\test_8bit.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="baseline\*.svg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>
Loading
Loading