프로젝트

일반

사용자정보

개정판 6f6e7dbf

ID6f6e7dbfbc5ca2d26ebcf25986cb898fbe47b2cc
상위 0157b158
하위 a1285a1f, 06f13e11

김태성이(가) 5년 이상 전에 추가함

service 중복 convert 방지
mvvmtoolkit 수정

Change-Id: I860d70f64586b2893d4f98a6ea890f2a5512410e

차이점 보기:

ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj
62 62
    <Reference Include="ConfigParser, Version=0.3.3.6, Culture=neutral, processorArchitecture=MSIL">
63 63
      <HintPath>..\packages\Salaros.ConfigParser.0.3.3\lib\net45\ConfigParser.dll</HintPath>
64 64
    </Reference>
65
    <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
66
      <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
65
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
66
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
67
    </Reference>
68
    <Reference Include="MaterialDesignColors, Version=1.2.0.325, Culture=neutral, processorArchitecture=MSIL">
69
      <HintPath>..\packages\MaterialDesignColors.1.2.0\lib\net45\MaterialDesignColors.dll</HintPath>
67 70
    </Reference>
68 71
    <Reference Include="MaterialDesignExtensions, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
69 72
      <HintPath>..\packages\MaterialDesignExtensions.2.6.0\lib\net45\MaterialDesignExtensions.dll</HintPath>
70 73
    </Reference>
71
    <Reference Include="MaterialDesignThemes.Wpf, Version=2.5.1.1345, Culture=neutral, processorArchitecture=MSIL">
72
      <HintPath>..\packages\MaterialDesignThemes.2.5.1\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
74
    <Reference Include="MaterialDesignThemes.Wpf, Version=2.6.0.325, Culture=neutral, processorArchitecture=MSIL">
75
      <HintPath>..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
73 76
    </Reference>
74 77
    <Reference Include="Microsoft.EntityFrameworkCore">
75 78
      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.entityframeworkcore\2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>
......
105 108
      <SubType>Designer</SubType>
106 109
    </ApplicationDefinition>
107 110
    <Compile Include="AppInit.cs" />
111
    <Compile Include="AppDefine.cs" />
108 112
    <Compile Include="Data\NavigationItem.cs" />
113
    <Compile Include="ViewModel\DataBaseByStatusViewModel.cs" />
109 114
    <Compile Include="ViewModel\AliveViewModel.cs" />
110 115
    <Compile Include="ViewModel\MainViewModel.cs" />
116
    <Compile Include="Views\MergeDataView.xaml.cs">
117
      <DependentUpon>MergeDataView.xaml</DependentUpon>
118
    </Compile>
111 119
    <Compile Include="ViewModel\SettingsViewModel.cs" />
120
    <Compile Include="Views\DataBaseByStatusView.xaml.cs">
121
      <DependentUpon>DataBaseByStatusView.xaml</DependentUpon>
122
    </Compile>
112 123
    <Compile Include="Views\AliveView.xaml.cs">
113 124
      <DependentUpon>AliveView.xaml</DependentUpon>
114 125
    </Compile>
......
139 150
      <SubType>Designer</SubType>
140 151
      <Generator>MSBuild:Compile</Generator>
141 152
    </Page>
153
    <Page Include="Views\MergeDataView.xaml">
154
      <SubType>Designer</SubType>
155
      <Generator>MSBuild:Compile</Generator>
156
    </Page>
157
    <Page Include="Views\DataBaseByStatusView.xaml">
158
      <Generator>MSBuild:Compile</Generator>
159
      <SubType>Designer</SubType>
160
    </Page>
142 161
    <Page Include="Views\AliveView.xaml">
143 162
      <SubType>Designer</SubType>
144 163
      <Generator>MSBuild:Compile</Generator>

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)