parent
9e3e71a4ca
commit
1fc8ba3603
|
@ -39,7 +39,7 @@
|
|||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
|
||||
<OutputPath>bin\Release_WireCheck\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -48,15 +48,6 @@
|
|||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
|
||||
<OutputPath>bin\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
|
||||
<OutputPath>bin\Release_WireCheck\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -83,7 +83,7 @@
|
|||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x86'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x86' ">
|
||||
<OutputPath>bin\x86\Release_WireCheck\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -92,24 +92,6 @@
|
|||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
|
||||
<OutputPath>bin\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x86'">
|
||||
<OutputPath>bin\x86\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\MSTest.TestFramework.2.2.10\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
|
||||
|
|
|
@ -47,5 +47,5 @@ using System.Windows;
|
|||
// 修订号
|
||||
//
|
||||
[assembly: AssemblyVersion("1.0.0.25")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.26")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.0.26")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.27")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.0.27")]
|
|
@ -105,7 +105,7 @@
|
|||
<LangVersion>12.0</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
|
||||
<OutputPath>bin\Release_WireCheck\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -114,7 +114,7 @@
|
|||
<LangVersion>12.0</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x64'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x64' ">
|
||||
<OutputPath>bin\x64\Release_WireCheck\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -124,7 +124,7 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x86'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x86' ">
|
||||
<OutputPath>bin\x86\Release_WireCheck\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -133,34 +133,6 @@
|
|||
<LangVersion>12.0</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
|
||||
<OutputPath>bin\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<LangVersion>12.0</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x64'">
|
||||
<OutputPath>bin\x64\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>12.0</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x86'">
|
||||
<OutputPath>bin\x86\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<LangVersion>12.0</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="C1.Win.C1FlexGrid.2">
|
||||
<HintPath>..\Sinvo.EplanHpD.Plugin\RefDLL\C1.Win.C1FlexGrid.2.dll</HintPath>
|
||||
|
|
|
@ -447,19 +447,28 @@ public class CableLectotypeViewModel : INotifyPropertyChanged
|
|||
if (_motor != null)
|
||||
{
|
||||
var passthroughCables = MotorExcelHelper.Instance.GetPassthroughCableCount(_motor.MotorModelStr).FirstOrDefault();
|
||||
_passthroughCableCount = passthroughCables.TotalCableCount;
|
||||
if (_passthroughCableCount == 2)
|
||||
if(passthroughCables != null)
|
||||
{
|
||||
IsEnableSecCableType = true;
|
||||
IsEnableThreeCableType = false;
|
||||
_passthroughCableCount = passthroughCables.TotalCableCount;
|
||||
if (_passthroughCableCount == 2)
|
||||
{
|
||||
IsEnableSecCableType = true;
|
||||
IsEnableThreeCableType = false;
|
||||
}
|
||||
if (_passthroughCableCount == 3)
|
||||
{
|
||||
IsEnableSecCableType = true;
|
||||
IsEnableThreeCableType = true;
|
||||
}
|
||||
if (_passthroughCableCount == 1)
|
||||
{
|
||||
IsEnableSecCableType = false;
|
||||
IsEnableThreeCableType = false;
|
||||
}
|
||||
}
|
||||
if (_passthroughCableCount == 3)
|
||||
{
|
||||
IsEnableSecCableType = true;
|
||||
IsEnableThreeCableType = true;
|
||||
}
|
||||
if (_passthroughCableCount == 1)
|
||||
else
|
||||
{
|
||||
// 如果没有对应的信息,默认为两个类型
|
||||
IsEnableSecCableType = false;
|
||||
IsEnableThreeCableType = false;
|
||||
}
|
||||
|
|
|
@ -41,12 +41,12 @@ Global
|
|||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x64.Build.0 = Release_Scanner|x64
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|x64
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|x64
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|x64
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5BDA26F8-001F-4C54-B992-7CC5AE5ED08B}.Release|x64.ActiveCfg = Release|x64
|
||||
|
@ -65,12 +65,12 @@ Global
|
|||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x64.Build.0 = Release_Scanner|x64
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|x64
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|x64
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|x64
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|x64
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{2DBCD22A-650D-4797-9908-9C4D5D6665FE}.Release|x64.ActiveCfg = Release|x64
|
||||
|
@ -89,12 +89,12 @@ Global
|
|||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AEC39474-528B-4DA8-B650-99189ACB7A2C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
|
@ -113,12 +113,12 @@ Global
|
|||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.ActiveCfg = Release_Scanner|x86
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_Scanner|x86.Build.0 = Release_Scanner|x86
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|x86
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|x86
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|x86
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|x86
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{60D3C75C-E71D-4116-BD7E-CAC68C4DD96B}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
|
@ -137,12 +137,12 @@ Global
|
|||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x64.Build.0 = Release_Scanner|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.ActiveCfg = Release_Scanner|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_Scanner|x86.Build.0 = Release_Scanner|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.Build.0 = Release_WireCheck|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.Build.0 = Release_WireCheck|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.ActiveCfg = Release_WireCheck|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.Build.0 = Release_WireCheck|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|Any CPU.Build.0 = Release_WireAndCable|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x64.Build.0 = Release_WireAndCable|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.ActiveCfg = Release_WireAndCable|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release_WireAndCable|x86.Build.0 = Release_WireAndCable|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AD1AA2BC-9289-46AE-BDC0-30AE13F51B3F}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
|
|
|
@ -28,6 +28,6 @@ using System.Runtime.InteropServices;
|
|||
// 生成号
|
||||
// 修订号
|
||||
//
|
||||
[assembly: AssemblyVersion("1.0.0.26")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.24")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.0.24-rls")]
|
||||
[assembly: AssemblyVersion("1.0.0.27")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.27")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.0.27-rls")]
|
|
@ -18,7 +18,7 @@
|
|||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<OutputPath>..\..\..\PLMCADI\Release_WireAndCable\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
|
@ -94,8 +94,8 @@
|
|||
<LangVersion>latest</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|AnyCPU'">
|
||||
<OutputPath>bin\Release_WireCheck\</OutputPath>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|AnyCPU' ">
|
||||
<OutputPath>..\..\..\PLMCADI\Release_WireAndCable\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
|
@ -103,7 +103,7 @@
|
|||
<LangVersion>latest</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x64'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x64' ">
|
||||
<OutputPath>..\..\..\PLMCADI\Release_WireAndCable\</OutputPath>
|
||||
<DefineConstants>TRACE;Release_WireAndCable</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -112,7 +112,7 @@
|
|||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_WireCheck|x86'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_WireAndCable|x86' ">
|
||||
<OutputPath>bin\x86\Release_WireCheck\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
|
@ -121,33 +121,6 @@
|
|||
<LangVersion>latest</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|AnyCPU'">
|
||||
<OutputPath>bin\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x64'">
|
||||
<OutputPath>..\..\..\PLMCADI\EPLANProDAddin\</OutputPath>
|
||||
<DefineConstants>TRACE;Release_CableLayout</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_CableLayout|x86'">
|
||||
<OutputPath>bin\x86\Release_CableLayout\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="EPLAN.Harness.API">
|
||||
<HintPath>RefDLL\EPLAN.Harness.API.dll</HintPath>
|
||||
|
|
Loading…
Reference in New Issue