프로젝트

일반

사용자정보

개정판 c923343b

IDc923343bb2b4d6c9d6a94117f4d718439080b7af
상위 9ce15cf0
하위 ff2f8d1d

이지연이(가) 5달 전에 추가함

issue #000: ConvertService 빌드 에러 수정, AssemblyInfo Version Up

Change-Id: Ieba9d13acceccc3504a19c6c5c5afe88e15d84d1

차이점 보기:

ConvertService/ServiceController/Markus.Service.StationController/Markus.Service.StationController.csproj
144 144 
    </Reference>
145 145 
    <Reference Include="Telerik.Windows.Controls, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
146 146 
      <SpecificVersion>False</SpecificVersion>
147 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.dll</HintPath>
147 
      <HintPath>..\Telerik\Telerik.Windows.Controls.dll</HintPath>
148 148 
    </Reference>
149 149 
    <Reference Include="Telerik.Windows.Controls.Chart, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
150 150 
      <SpecificVersion>False</SpecificVersion>
151 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.Chart.dll</HintPath>
151 
      <HintPath>..\Telerik\Telerik.Windows.Controls.Chart.dll</HintPath>
152 152 
    </Reference>
153 153 
    <Reference Include="Telerik.Windows.Controls.Charting, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
154 154 
      <SpecificVersion>False</SpecificVersion>
155 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.Charting.dll</HintPath>
155 
      <HintPath>..\Telerik\Telerik.Windows.Controls.Charting.dll</HintPath>
156 156 
    </Reference>
157 157 
    <Reference Include="Telerik.Windows.Controls.Data, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
158 158 
      <SpecificVersion>False</SpecificVersion>
159 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.Data.dll</HintPath>
159 
      <HintPath>..\Telerik\Telerik.Windows.Controls.Data.dll</HintPath>
160 160 
    </Reference>
161 161 
    <Reference Include="Telerik.Windows.Controls.Docking, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
162 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.Docking.dll</HintPath>
162 
      <HintPath>..\Telerik\Telerik.Windows.Controls.Docking.dll</HintPath>
163 163 
      <SpecificVersion>False</SpecificVersion>
164 164 
      <Private>True</Private>
165 165 
    </Reference>
166 166 
    <Reference Include="Telerik.Windows.Controls.FileDialogs, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
167 167 
      <SpecificVersion>False</SpecificVersion>
168 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Controls.FileDialogs.dll</HintPath>
168 
      <HintPath>..\Telerik\Telerik.Windows.Controls.FileDialogs.dll</HintPath>
169 169 
    </Reference>
170 170 
    <Reference Include="Telerik.Windows.Controls.GridView, Version=2019.3.917.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
171 171 
      <SpecificVersion>False</SpecificVersion>
......
181 181 
    </Reference>
182 182 
    <Reference Include="Telerik.Windows.Data, Version=2020.1.218.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
183 183 
      <SpecificVersion>False</SpecificVersion>
184 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries\WPF45\Telerik.Windows.Data.dll</HintPath>
184 
      <HintPath>..\Telerik\Telerik.Windows.Data.dll</HintPath>
185 185 
    </Reference>
186 186 
    <Reference Include="Telerik.Windows.Themes.VisualStudio2013">
187 
      <HintPath>C:\Program Files (x86)\Progress\Telerik UI for WPF R1 2020\Binaries.NoXaml\WPF45\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath>
187 
      <HintPath>..\Telerik\Telerik.Windows.Themes.VisualStudio2013.dll</HintPath>
188 188 
    </Reference>
189 189 
    <Reference Include="Telerik.Windows.Zip, Version=2019.3.903.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
190 190 
      <SpecificVersion>False</SpecificVersion>
ConvertService/ServiceController/StationControllerService/Web.config
2 2 
<configuration>
3 3 
  <configSections>
4 4 
    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5 
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5 
    <section name="entityFramework"
6 
      type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
7 
      requirePermission="false"/>
6 8 
  </configSections>
7 9 
  <appSettings>
8 
    <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true" />
10 
    <add key="aspnet:UseTaskFriendlySynchronizationContext" value="true"/>
9 11 
  </appSettings>
10 12 
  <!--
11 13 
    web.config 변경 내용에 대한 설명은  http://go.microsoft.com/fwlink/?LinkId=235367을 참고하십시오.
......
16 18 
      </system.Web>
17 19 
  -->
18 20 
  <system.web>
19 
    <compilation targetFramework="4.6.1" debug="true" />
20 
    <httpRuntime targetFramework="4.5" />
21 
    <compilation targetFramework="4.6.1" debug="true"/>
22 
    <httpRuntime targetFramework="4.5"/>
21 23 
  </system.web>
22 24 
  <system.serviceModel>
23 25 
    <behaviors>
24 26 
      <serviceBehaviors>
25 27 
        <behavior>
26 28 
          <!--메타데이터 정보를 공개하지 않으려면 배포하기 전에 아래 값을 false로 설정하십시오.-->
27 
          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true" />
29 
          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="true"/>
28 30 
          <!--디버깅 목적으로 오류에서 예외 정보를 받으려면 아래의 값을 true로 설정하십시오. 예외 정보를 공개하지 않으려면 배포하기 전에 false로 설정하십시오.-->
29 
          <serviceDebug includeExceptionDetailInFaults="false" />
31 
          <serviceDebug includeExceptionDetailInFaults="false"/>
30 32 
        </behavior>
31 33 
      </serviceBehaviors>
32 34 
    </behaviors>
33 35 
    <protocolMapping>
34 
      <add binding="basicHttpsBinding" scheme="https" />
36 
      <add binding="basicHttpsBinding" scheme="https"/>
35 37 
    </protocolMapping>
36 
    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
38 
    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
37 39 
  </system.serviceModel>
38 40 
  <system.webServer>
39 
    <modules runAllManagedModulesForAllRequests="true" />
41 
    <modules runAllManagedModulesForAllRequests="true"/>
40 42 
    <!--
41 43 
        디버깅 중에 웹 응용 프로그램 루트 디렉터리를 찾으려면 아래 값을 true로 설정하십시오.
42 44 
        웹 응용 프로그램 폴더 정보를 공개하지 않으려면 배포 전에 false로 설정하십시오.
43 45 
      -->
44 
    <directoryBrowse enabled="true" />
46 
    <directoryBrowse enabled="true"/>
45 47 
  </system.webServer>
46 48 
  <entityFramework>
47 49 
    <providers>
48 
      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
50 
      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
49 51 
    </providers>
50 52 
  </entityFramework>
51 53 
  <connectionStrings>
52 
    <!--doftech Connection String-->
54 
    <!--효성 Connection String-->
53 55 
    <add name="markusEntities"
54 
      connectionString="metadata=res://*/MarkusModel.csdl|res://*/MarkusModel.ssdl|res://*/MarkusModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=192.168.0.67;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;application name=EntityFramework&quot;"
56 
      connectionString="metadata=res://*/MarkusModel.csdl|res://*/MarkusModel.ssdl|res://*/MarkusModel.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;application name=EntityFramework&quot;"
55 57 
      providerName="System.Data.EntityClient"/>
56 58 
  </connectionStrings>
57 59 
</configuration>
KCOM/Properties/AssemblyInfo.cs
51 51 
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52 
// 지정되도록 할 수 있습니다.
53 53 
// [assembly: AssemblyVersion("1.0.*")]
54 
[assembly: AssemblyVersion("5.5.16.0")]
55 
[assembly: AssemblyFileVersion("5.5.16.0")]
54 
[assembly: AssemblyVersion("5.5.19.0")]
55 
[assembly: AssemblyFileVersion("5.5.19.0")]
56 56 
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]

내보내기 Unified diff

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