개정판 2917ab4a
- build version Change
Change-Id: Ib1fb747375e9558f992a3a53e03d847bfd8ddb18
ConvertService/ServiceBase/ConnectionStringBuild/Properties/AssemblyInfo.cs | ||
---|---|---|
51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
52 | 52 |
// 지정되도록 할 수 있습니다. |
53 | 53 |
// [assembly: AssemblyVersion("1.0.*")] |
54 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
55 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
54 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
55 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/ConvertionWebService/Properties/AssemblyInfo.cs | ||
---|---|---|
31 | 31 |
// |
32 | 32 |
// You can specify all the values or you can default the Revision and Build Numbers |
33 | 33 |
// by using the '*' as shown below: |
34 |
[assembly: AssemblyVersion("2.5.1.0")]
|
|
35 |
[assembly: AssemblyFileVersion("2.5.1.0")]
|
|
34 |
[assembly: AssemblyVersion("2.5.6.0")]
|
|
35 |
[assembly: AssemblyFileVersion("2.5.6.0")]
|
|
36 | 36 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
ConvertService/ServiceBase/FileDownloadTest/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
33 | 33 |
// 지정되도록 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/IServiceBase/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/Markus.Service.Convert.IPlugin/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.0")] |
|
36 |
[assembly: AssemblyFileVersion("1.0.0.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/Markus.Service.Convert/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")]
|
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")]
|
|
35 |
[assembly: AssemblyVersion("2.5.6.0")]
|
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")]
|
|
37 | 37 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
ConvertService/ServiceBase/Markus.Service.ConvertProcess/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
33 | 33 |
// 지정되도록 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")]
|
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")]
|
|
35 |
[assembly: AssemblyVersion("2.5.6.0")]
|
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")]
|
|
37 | 37 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
ConvertService/ServiceBase/Markus.Service.DataBase/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/Markus.Service.Extensions/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/Markus.Service.Station/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
33 | 33 |
// 지정되도록 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")]
|
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")]
|
|
35 |
[assembly: AssemblyVersion("2.5.6.0")]
|
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")]
|
|
37 | 37 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
ConvertService/ServiceBase/Markus.Service.WcfService/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
33 | 33 |
// 지정되도록 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/PemssDocumentInfo/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.0")] |
|
36 |
[assembly: AssemblyFileVersion("1.0.0.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/PemssDocumentInfoTest/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
33 | 33 |
// 지정되도록 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.0")] |
|
36 |
[assembly: AssemblyFileVersion("1.0.0.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/PlugInTest/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
33 | 33 |
// 지정되도록 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.0")] |
|
36 |
[assembly: AssemblyFileVersion("1.0.0.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/ServiceTestApp/Properties/AssemblyInfo.cs | ||
---|---|---|
51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
52 | 52 |
// 지정되도록 할 수 있습니다. |
53 | 53 |
// [assembly: AssemblyVersion("1.0.*")] |
54 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
55 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
54 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
55 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/TestDocumentInfo/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 |
33 | 33 |
// 기본값으로 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.0")] |
|
36 |
[assembly: AssemblyFileVersion("1.0.0.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
ConvertService/ServiceBase/UnitTest.Markus.Service/UnitTest.Markus.Service.csproj | ||
---|---|---|
5 | 5 |
<TargetFramework>net472</TargetFramework> |
6 | 6 |
|
7 | 7 |
<IsPackable>false</IsPackable> |
8 |
|
|
9 |
<Version>2.5.6.0</Version> |
|
8 | 10 |
</PropertyGroup> |
9 | 11 |
|
10 | 12 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> |
ConvertService/ServiceBase/WcfCheck/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
33 | 33 |
// 지정되도록 할 수 있습니다. |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("2.5.1.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.1.0")] |
|
35 |
[assembly: AssemblyVersion("2.5.6.0")] |
|
36 |
[assembly: AssemblyFileVersion("2.5.6.0")] |
KCOM/App.xaml.cs | ||
---|---|---|
141 | 141 |
splashScreen.Show(); |
142 | 142 |
|
143 | 143 |
/// create log database and table |
144 |
using (IAbstractDatabase database = new AppSQLiteDatabase() { FilePath = Path.Combine(AppDataFolder, "log4net.db") }) |
|
145 |
{ |
|
146 |
string sSql = "CREATE TABLE IF NOT EXISTS Log (LogId INTEGER PRIMARY KEY,Date DATETIME NOT NULL,Level VARCHAR(50) NOT NULL,Logger VARCHAR(255) NOT NULL,Message TEXT DEFAULT NULL,StackTrace TEXT DEFAULT NULL);"; |
|
147 |
database.ExecuteNonQuery(sSql); |
|
148 |
} |
|
144 |
//using (IAbstractDatabase database = new AppSQLiteDatabase() { FilePath = Path.Combine(AppDataFolder, "log4net.db") }) |
|
145 |
//{ |
|
146 |
// string sSql = "CREATE TABLE IF NOT EXISTS Log (LogId INTEGER PRIMARY KEY,Date DATETIME NOT NULL,Level VARCHAR(50) NOT NULL,Logger VARCHAR(255) NOT NULL,Message TEXT DEFAULT NULL,StackTrace TEXT DEFAULT NULL);"; |
|
147 |
// database.ExecuteNonQuery(sSql); |
|
148 |
//} |
|
149 |
|
|
150 |
//log4net.GlobalContext.Properties["LogDBFilePath"] = Path.Combine(AppDataFolder, "log4net.db"); |
|
151 |
//App.DBLogger = LogManager.GetLogger("DBLogger"); |
|
152 |
|
|
149 | 153 |
/// up to here |
150 | 154 |
AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException); |
151 |
log4net.GlobalContext.Properties["LogDBFilePath"] = Path.Combine(AppDataFolder, "log4net.db"); |
|
155 |
|
|
152 | 156 |
log4net.GlobalContext.Properties["LogFilePath"] = Path.Combine(AppDataFolder, "Log", "log4net.log"); |
153 |
App.DBLogger = LogManager.GetLogger("DBLogger"); |
|
157 |
|
|
154 | 158 |
App.FileLogger = LogManager.GetLogger("EventLogger"); |
155 | 159 |
|
156 | 160 |
#region // DNS 체크 |
... | ... | |
290 | 294 |
Task.Factory.StartNew(() => |
291 | 295 |
{ |
292 | 296 |
splashScreen.Dispatcher.Invoke(() => splashScreen.SplashText = text); |
293 |
}); |
|
297 |
}).ConfigureAwait(false);
|
|
294 | 298 |
} |
295 | 299 |
|
296 | 300 |
|
KCOM/KCOM.csproj.user | ||
---|---|---|
13 | 13 |
<VerifyUploadedFiles>false</VerifyUploadedFiles> |
14 | 14 |
</PropertyGroup> |
15 | 15 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjUwMDAwMDEwIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIiwiTW9kZSI6MH0=/</StartArguments>
|
|
16 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjMwMDAwMTE3IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJkb2Z0ZWNoIiwiTW9kZSI6MH0=/</StartArguments>
|
|
17 | 17 |
</PropertyGroup> |
18 | 18 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
19 | 19 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
... | ... | |
62 | 62 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQ5IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
63 | 63 |
</PropertyGroup> |
64 | 64 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug_HyoSung|x86'"> |
65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjE0NTExIiwiYlBhcnRuZXIiOiJmYWxzZSIsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6ImZhbHNlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJmYWxzZSIsIlByb2plY3ROTyI6IlBQNCIsIlVzZXJJRCI6IlJFUE9JTlRcXHN5c3RlbSIsIk1vZGUiOjB9/</StartArguments>
|
|
65 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjIxMTA3IiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiJMUEciLCJVc2VySUQiOiJkb2Z0ZWNoIiwiTW9kZSI6MH0=/</StartArguments>
|
|
66 | 66 |
</PropertyGroup> |
67 | 67 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> |
68 | 68 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjExMDAwMTAyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOiJ0cnVlIiwiTmV3Q29tbWVudFBlcm1pc3Npb24iOiJ0cnVlIiwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiSmFtZXMiLCJNb2RlIjowfQ==/</StartArguments> |
KCOM_API/Web.config | ||
---|---|---|
10 | 10 |
</sectionGroup> |
11 | 11 |
</configSections> |
12 | 12 |
<connectionStrings> |
13 |
<!--효성 Connection String--> |
|
14 | 13 |
<add name="ConnectionString" |
15 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
14 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
16 | 15 |
providerName="System.Data.EntityClient"/> |
17 | 16 |
<add name="CIConnectionString" |
18 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
17 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
19 | 18 |
providerName="System.Data.EntityClient"/> |
20 | 19 |
</connectionStrings> |
21 | 20 |
<!-- |
... | ... | |
82 | 81 |
<applicationSettings> |
83 | 82 |
<KCOM_API.Properties.Settings> |
84 | 83 |
<setting name="TileSoucePath" serializeAs="String"> |
85 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
84 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
86 | 85 |
</setting> |
87 | 86 |
<setting name="TileSoucePath_SUB" serializeAs="String"> |
88 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
87 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
89 | 88 |
</setting> |
90 | 89 |
<setting name="IsProjectNoPass" serializeAs="String"> |
91 | 90 |
<value>True</value> |
내보내기 Unified diff