Egalware/EgtWPFLib5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
NicolaP
2022-07-05 15:26:09 +02:00
parent f35555f129 b3f75b146d
commit a8ac8d5da1
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtWPFLib5.vbproj
+2 -2
View File
@@ -45,8 +45,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="EgtUILib, Version=2.4.5.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\EgtUILib.2.4.5.3\lib\EgtUILib.dll</HintPath>
<Reference Include="EgtUILib, Version=2.4.6.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\EgtUILib.2.4.6.1\lib\EgtUILib.dll</HintPath>
</Reference>
<Reference Include="EgtWPFLib, Version=2.4.5.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\EgtWPFLib.2.4.5.1\lib\EgtWPFLib.dll</HintPath>
My Project/AssemblyInfo.vb
+2 -2
View File
@@ -62,5 +62,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.5.1")>
<Assembly: AssemblyFileVersion("2.4.5.1")>
<Assembly: AssemblyVersion("2.4.6.1")>
<Assembly: AssemblyFileVersion("2.4.6.1")>
ToolDbWindow/ToolTreeView.vb
+1 -1
View File
@@ -2870,7 +2870,7 @@ Public Class ToolTreeViewItem
Dim dThick As Double = 0
StringToLen(m_Thick, dThick)
If (m_Type = MCH_TY.SAW_FLAT Or m_Type = MCH_TY.SAW_STD) And dCornRad > 0.5 * dThick Then
m_CornRadError = EgtMsg(MSG_TOOLDBERRORS + 42)
m_CornRadError = EgtMsg(31135) ' Raggio Corner ha un valore troppo grande
End If
End If
NotifyPropertyChanged("CornRadErrorMsg")
packages.config
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EgtUILib" version="2.4.5.3" targetFramework="net40-client" />
<package id="EgtUILib" version="2.4.6.1" targetFramework="net40-client" />
<package id="EgtWPFLib" version="2.4.5.1" targetFramework="net40-client" />
</packages>