개정판 43b2e236
ConvertAddDialog DispatcherTimer 주석 후 완료
Change-Id: I18738739e0f43df7504da284fe6c8fdd6962ed1e
| ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj | ||
|---|---|---|
| 115 | 115 |
<SpecificVersion>False</SpecificVersion> |
| 116 | 116 |
<HintPath>..\Telerik\Telerik.Windows.Controls.dll</HintPath> |
| 117 | 117 |
</Reference> |
| 118 |
<Reference Include="Telerik.Windows.Controls.Docking, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
| 119 |
<HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.Docking.dll</HintPath> |
|
| 120 |
<Private>True</Private> |
|
| 121 |
</Reference> |
|
| 118 | 122 |
<Reference Include="Telerik.Windows.Controls.GridView, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
| 119 | 123 |
<SpecificVersion>False</SpecificVersion> |
| 120 | 124 |
<HintPath>..\Telerik\Telerik.Windows.Controls.GridView.dll</HintPath> |
| ... | ... | |
| 193 | 197 |
<DependentUpon>MarkusModel.tt</DependentUpon> |
| 194 | 198 |
</Compile> |
| 195 | 199 |
<Compile Include="ViewModel\AliveViewModel.cs" /> |
| 200 |
<Compile Include="ViewModel\ConvertAddDialogViewModel.cs" /> |
|
| 196 | 201 |
<Compile Include="ViewModel\DataBaseByStatusViewModel.cs" /> |
| 197 | 202 |
<Compile Include="ViewModel\DataBaseItemsModel.cs" /> |
| 198 | 203 |
<Compile Include="ViewModel\MergeDataViewModel.cs" /> |
| 199 | 204 |
<Compile Include="ViewModel\MainViewModel.cs" /> |
| 200 | 205 |
<Compile Include="ViewModel\TotalStatusViewModel.cs" /> |
| 206 |
<Compile Include="Views\ConvertAddDialog.xaml.cs"> |
|
| 207 |
<DependentUpon>ConvertAddDialog.xaml</DependentUpon> |
|
| 208 |
</Compile> |
|
| 201 | 209 |
<Compile Include="Views\DataBaseView.xaml.cs"> |
| 202 | 210 |
<DependentUpon>DataBaseView.xaml</DependentUpon> |
| 203 | 211 |
</Compile> |
| ... | ... | |
| 255 | 263 |
<SubType>Designer</SubType> |
| 256 | 264 |
<Generator>MSBuild:Compile</Generator> |
| 257 | 265 |
</Page> |
| 266 |
<Page Include="Views\ConvertAddDialog.xaml"> |
|
| 267 |
<Generator>MSBuild:Compile</Generator> |
|
| 268 |
<SubType>Designer</SubType> |
|
| 269 |
</Page> |
|
| 258 | 270 |
<Page Include="Views\DataBaseView.xaml"> |
| 259 | 271 |
<Generator>MSBuild:Compile</Generator> |
| 260 | 272 |
<SubType>Designer</SubType> |
내보내기 Unified diff
