개정판 902f397c
DatabaseFilter 수정
Change-Id: I44d6697b18f74f21cd98d46243a56e1d3b50cc26
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj | ||
---|---|---|
87 | 87 |
<Reference Include="MaterialDesignThemes.Wpf, Version=2.6.0.325, Culture=neutral, processorArchitecture=MSIL"> |
88 | 88 |
<HintPath>..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath> |
89 | 89 |
</Reference> |
90 |
<Reference Include="Microsoft.EntityFrameworkCore"> |
|
91 |
<HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.entityframeworkcore\2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath> |
|
92 |
</Reference> |
|
93 | 90 |
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> |
94 | 91 |
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath> |
95 | 92 |
</Reference> |
... | ... | |
133 | 130 |
<SpecificVersion>False</SpecificVersion> |
134 | 131 |
<HintPath>..\Telerik\Telerik.Windows.Data.dll</HintPath> |
135 | 132 |
</Reference> |
136 |
<Reference Include="Telerik.Windows.Themes.VisualStudio2013, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
|
137 |
<SpecificVersion>False</SpecificVersion> |
|
138 |
<HintPath>..\lib\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath> |
|
133 |
<Reference Include="Telerik.Windows.Themes.VisualStudio2013"> |
|
134 |
<HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries.NoXaml\WPF45\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath> |
|
139 | 135 |
</Reference> |
140 | 136 |
<Reference Include="Telerik.Windows.Zip, Version=2019.3.903.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL"> |
141 | 137 |
<SpecificVersion>False</SpecificVersion> |
... | ... | |
177 | 173 |
<Compile Include="ViewModel\MergeDataViewModel.cs" /> |
178 | 174 |
<Compile Include="ViewModel\MainViewModel.cs" /> |
179 | 175 |
<Compile Include="ViewModel\TotalStatusViewModel.cs" /> |
176 |
<Compile Include="Views\DatabaseFilter.xaml.cs"> |
|
177 |
<DependentUpon>DatabaseFilter.xaml</DependentUpon> |
|
178 |
</Compile> |
|
180 | 179 |
<Compile Include="Views\DataBaseView.xaml.cs"> |
181 | 180 |
<DependentUpon>DataBaseView.xaml</DependentUpon> |
182 | 181 |
</Compile> |
... | ... | |
230 | 229 |
<SubType>Designer</SubType> |
231 | 230 |
<Generator>MSBuild:Compile</Generator> |
232 | 231 |
</Page> |
232 |
<Page Include="Views\DatabaseFilter.xaml"> |
|
233 |
<Generator>MSBuild:Compile</Generator> |
|
234 |
<SubType>Designer</SubType> |
|
235 |
</Page> |
|
233 | 236 |
<Page Include="Views\DataBaseView.xaml"> |
234 | 237 |
<Generator>MSBuild:Compile</Generator> |
235 | 238 |
<SubType>Designer</SubType> |
내보내기 Unified diff