프로젝트

일반

사용자정보

개정판 274cde11

ID274cde11c87096a631514c2e6c3f8f5ce97c24e7
상위 c0ec90f3
하위 174cdd68

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

after build event에서 version을 가져오도록 수정

Change-Id: I7a5cc54cabf6e2080c89d22b7631683eaecfebe4

차이점 보기:

CommonLib/CommonLib.csproj
191 191
    <Compile Include="Properties\AssemblyInfo.cs" />
192 192
  </ItemGroup>
193 193
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
194
  <PropertyGroup>
195
    <PostBuildEvent>
196
    </PostBuildEvent>
197
  </PropertyGroup>
194 198
</Project>
KCOM.sln
86 86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DownloadManager", "DownloadManager\DownloadManager.csproj", "{E1AEB641-7B2B-4231-8518-2E4CF79AA64B}"
87 87
EndProject
88 88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppCast", "AppCast", "{489F635A-BEA1-4C3F-940D-C161122064E4}"
89
	ProjectSection(SolutionItems) = preProject
90
		appCast.bat = appCast.bat
91
		appCast_All_Build.bat = appCast_All_Build.bat
92
		appCast_Daelim.bat = appCast_Daelim.bat
93
		appCast_HS.bat = appCast_HS.bat
94
		appCast_SNI.bat = appCast_SNI.bat
95
	EndProjectSection
89 96
EndProject
90 97
Global
91 98
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
KCOM/App.xaml.cs
250 250
            }
251 251
            catch (Exception ex)
252 252
            {
253
                //Logger.sendReqLog("OnStartUp",ex.ToString() + " " + ex.InnerException?.ToString(),1);
253
                Logger.sendReqLog("OnStartUp",ex.ToString() + " " + ex.InnerException?.ToString(),1);
254 254
            }
255 255
            finally
256 256
            {
KCOM/Controls/CheckList.xaml.cs
224 224
            }
225 225
            catch (Exception ex)
226 226
            {
227
                //Logger.sendResLog("Checklist DataBind", ex.Message, 0);
227
                Logger.sendResLog("Checklist DataBind", ex.Message, 0);
228 228
            }
229 229

  
230 230

  
......
798 798
                                        UPDATE_TIME = DateTime.Now
799 799
                                    };
800 800

  
801
                                    //Logger.sendReqLog("AddCheckListHistory: ", App.ViewInfo.ProjectNO + "," + Check_History, 1);
802
                                    //Logger.sendResLog("AddCheckListHistory", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddCheckListHistory(App.ViewInfo.ProjectNO, Check_History).ToString(), 1);
803
                                    //Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddCheckListHistory(App.ViewInfo.ProjectNO, Check_History);
801
                                    var result = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddCheckListHistory(App.ViewInfo.ProjectNO, Check_History).ToString();
802

  
803
                                    Logger.sendReqLog("AddCheckListHistory: ", App.ViewInfo.ProjectNO + "," + Check_History, 1);
804
                                    Logger.sendResLog("AddCheckListHistory", result, 1);
805

  
806
                                    Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddCheckListHistory(App.ViewInfo.ProjectNO, Check_History);
804 807

  
805 808
                                    Check_value.REVISION = Current_Revision;
806 809
                                }
......
822 825
                                        Check_History.STATUS_DESC = Check_value.STATUS_DESC_CLOSE;
823 826
                                    }
824 827

  
825
                                    //Logger.sendReqLog("SaveCheckListHistory: ", App.ViewInfo.ProjectNO + "," + ViewerDataModel.Instance.SystemMain.dzMainMenu.CurrentDoc.Revision + "," + Check_History, 1);
828
                                    Logger.sendReqLog("SaveCheckListHistory: ", App.ViewInfo.ProjectNO + "," + ViewerDataModel.Instance.SystemMain.dzMainMenu.CurrentDoc.Revision + "," + Check_History, 1);
826 829
                                    //Logger.sendResLog("SaveCheckListHistory", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveCheckListHistory(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.SystemMain.dzMainMenu.CurrentDoc.Revision, Check_History).ToString(), 1);
827 830

  
828
                                    //Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveCheckListHistory(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.SystemMain.dzMainMenu.CurrentDoc.Revision, Check_History);
831
                                    Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveCheckListHistory(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.SystemMain.dzMainMenu.CurrentDoc.Revision, Check_History);
829 832
                                }
830 833
                            }
831 834
                            validation = new List<string>();
832 835
                        }
833 836
                    }
834 837

  
835
                    //Logger.sendReqLog("SaveCheckList: ", App.ViewInfo.ProjectNO + "," + Check_ID + "," + Check_value, 1);
838
                    Logger.sendReqLog("SaveCheckList: ", App.ViewInfo.ProjectNO + "," + Check_ID + "," + Check_value, 1);
836 839
                    //Logger.sendResLog("SaveCheckList", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveCheckList(App.ViewInfo.ProjectNO, Check_ID, Check_value).ToString(), 1);
837
                    //Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveCheckList(App.ViewInfo.ProjectNO, Check_ID, Check_value);
840
                    Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveCheckList(App.ViewInfo.ProjectNO, Check_ID, Check_value);
838 841
                }
839 842

  
840 843
                DataBind();
KCOM/Events/ConsolidateCommand.cs
52 52
                //Logger.sendReqLog("Consolidate", App.ViewInfo.ProjectNO + "," + App.ViewInfo.UserID + "," + sDocID + "," + InfoList, 1);
53 53
                //Logger.sendResLog("Consolidate", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList).ToString(), 1);
54 54

  
55
                var result = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.Consolidate(App.ViewInfo.ProjectNO, App.ViewInfo.UserID, sDocID, InfoList);
56

  
55 57
                //Logger.sendReqLog("GetMarkupInfoItemsAsync", App.ViewInfo.ProjectNO + "," + sDocID, 1);
56 58
                Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMarkupInfoItemsAsync(App.ViewInfo.ProjectNO, sDocID);
57 59
            }
58 60
            catch (Exception ex)
59 61
            {
62
                App.FileLogger.Error(ex);
63

  
60 64
                Common.ViewerDataModel.Instance.SystemMain.DialogMessage_Alert(string.Format("{0}", ex.StackTrace), "Alert");
61 65
                throw ex;
62 66
            }
KCOM/KCOM.csproj
1367 1367
    </PropertyGroup>
1368 1368
    <Error Condition="!Exists('..\packages\Obfuscar.2.2.23\build\obfuscar.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Obfuscar.2.2.23\build\obfuscar.props'))" />
1369 1369
  </Target>
1370
  <Target Name="PostBuildMacros">
1371
    <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
1372
      <Output TaskParameter="Assemblies" ItemName="Targets" />
1373
    </GetAssemblyIdentity>
1374
    <ItemGroup>
1375
      <VersionNumber Include="@(Targets->'%(Version)')" />
1376
    </ItemGroup>
1377
  </Target>
1370 1378
  <PropertyGroup>
1371
    <PostBuildEvent>rem mkdir $(TargetDir)Bin
1372
rem MOVE $(TargetDir)*.dll $(TargetDir)dll\
1373
rem MOVE $(TargetDir)*.tx $(TargetDir)dll\
1374
rem MOVE $(TargetDir)DLL\Teigha\*.* $(TargetDir)
1375
</PostBuildEvent>
1379
    <PostBuildEventDependsOn>
1380
		  $(PostBuildEventDependsOn);
1381
		  PostBuildMacros;
1382
	  </PostBuildEventDependsOn>
1383
    <PostBuildEvent>if $(ConfigurationName) == Release_Default (
1384
 cd $(SolutionDir)
1385
 call "$(SolutionDir)PublishSign.bat"
1386

  
1387
 call "$(SolutionDir)appCast_Daelim.bat" "@(VersionNumber)"
1388
 call "$(SolutionDir)appCast_HS.bat" "@(VersionNumber)"
1389
 call "$(SolutionDir)appCast_SNI.bat" "@(VersionNumber)"
1390
)</PostBuildEvent>
1376 1391
  </PropertyGroup>
1377 1392
  <UsingTask TaskName="TransformXml" AssemblyFile="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Web\Microsoft.Web.Publishing.Tasks.dll" />
1378 1393
  <Target Name="app_config_AfterCompile" AfterTargets="AfterCompile" Condition="Exists('app.$(Configuration).config')">
KCOM/Properties/AssemblyInfo.cs
51 51
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
52 52
// 지정되도록 할 수 있습니다.
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("3.1.0.0")]
55
[assembly: AssemblyFileVersion("3.1.0.0")]
54
[assembly: AssemblyVersion("3.1.2.0")]
55
[assembly: AssemblyFileVersion("3.1.2.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
KCOM/Services/BaseServices.cs
339 339
            ViewerDataModel.Instance.MarkupControls_USER.Clear();
340 340
            ViewerDataModel.Instance.MarkupControls.Clear();
341 341

  
342
            if (e.Result != null)
342
            try
343 343
            {
344
                ViewerDataModel.Instance._markupInfoList.Clear();
345
                if (e.Result.Count > 0) ViewerDataModel.Instance.MyMarkupList.Clear();
346 344

  
347
                foreach (var info in e.Result)
345
                if (e.Result != null)
348 346
                {
349
                    if (info.Depatment == null) info.Depatment = "Unknown";
347
                    ViewerDataModel.Instance._markupInfoList.Clear();
348
                    if (e.Result.Count > 0) ViewerDataModel.Instance.MyMarkupList.Clear();
350 349

  
351
                    if (info.UserID == App.ViewInfo.UserID)
350
                    foreach (var info in e.Result)
352 351
                    {
353
                        info.userDelete = true;
354
                        info.DisplayColor = "#FFFF0000";
355
                    }
356
                    else
357
                    {
358
                        info.userDelete = false;
359
                    }
352
                        if (info.Depatment == null) info.Depatment = "Unknown";
360 353

  
361
                    ViewerDataModel.Instance._markupInfoList.Add(info);
362
                }
354
                        if (info.UserID == App.ViewInfo.UserID)
355
                        {
356
                            info.userDelete = true;
357
                            info.DisplayColor = "#FFFF0000";
358
                        }
359
                        else
360
                        {
361
                            info.userDelete = false;
362
                        }
363 363

  
364
                var userInfoList = ViewerDataModel.Instance._markupInfoList.GroupBy(f => f.UserID).Select(f => new MarkupUserInfo { UserId = f.Key, UserName = f.First().UserName });
364
                        ViewerDataModel.Instance._markupInfoList.Add(info);
365
                    }
365 366

  
366
                userInfoList.ToList().ForEach(x => ViewerDataModel.Instance._markupUserList.Add(x));
367
                    var userInfoList = ViewerDataModel.Instance._markupInfoList.GroupBy(f => f.UserID).Select(f => new MarkupUserInfo { UserId = f.Key, UserName = f.First().UserName });
367 368

  
368
                e.Result.ToList().ForEach(d =>
369
                {
370
                    if (d.MarkupList != null)
369
                    userInfoList.ToList().ForEach(x => ViewerDataModel.Instance._markupUserList.Add(x));
370

  
371
                    e.Result.ToList().ForEach(d =>
371 372
                    {
372
                        d.MarkupList.ForEach(p =>
373
                        if (d.MarkupList != null)
373 374
                        {
374
                            if (d.UserID == App.ViewInfo.UserID)
375
                            d.MarkupList.ForEach(p =>
375 376
                            {
376
                                d.userDelete = true;
377
                                d.DisplayColor = "#FFFF0000";
378

  
379
                                MarkupItemEx markup = new MarkupItemEx
377
                                if (d.UserID == App.ViewInfo.UserID)
380 378
                                {
381
                                    Data = p.Data,
382
                                    Data_Type = p.Data_Type,
383
                                    ID = p.ID,
384
                                    IsUpdate = false,
385
                                    MarkupInfoID = d.MarkupInfoID,
386
                                    PageNumber = p.PageNumber,
387
                                    Symbol_ID = p.Symbol_ID,
388
                                    //Group_ID = p.Group_ID
389
                                };
390
                                ViewerDataModel.Instance.MyMarkupList.Add(markup);
391
                            }
392
                            else
393
                            {
394
                                MarkupItemEx markup = new MarkupItemEx
379
                                    d.userDelete = true;
380
                                    d.DisplayColor = "#FFFF0000";
381

  
382
                                    MarkupItemEx markup = new MarkupItemEx
383
                                    {
384
                                        Data = p.Data,
385
                                        Data_Type = p.Data_Type,
386
                                        ID = p.ID,
387
                                        IsUpdate = false,
388
                                        MarkupInfoID = d.MarkupInfoID,
389
                                        PageNumber = p.PageNumber,
390
                                        Symbol_ID = p.Symbol_ID,
391
                                        //Group_ID = p.Group_ID
392
                                    };
393
                                    ViewerDataModel.Instance.MyMarkupList.Add(markup);
394
                                }
395
                                else
395 396
                                {
396
                                    Data = p.Data,
397
                                    Data_Type = p.Data_Type,
398
                                    ID = p.ID,
399
                                    IsUpdate = false,
400
                                    MarkupInfoID = d.MarkupInfoID,
401
                                    PageNumber = p.PageNumber,
402
                                    Symbol_ID = p.Symbol_ID,
403
                                    //Group_ID = p.Group_ID
404
                                };
405
                                ViewerDataModel.Instance.MarkupList_Pre.Add(markup);
406
                            }
407
                        });
408
                    }
409
                });
397
                                    MarkupItemEx markup = new MarkupItemEx
398
                                    {
399
                                        Data = p.Data,
400
                                        Data_Type = p.Data_Type,
401
                                        ID = p.ID,
402
                                        IsUpdate = false,
403
                                        MarkupInfoID = d.MarkupInfoID,
404
                                        PageNumber = p.PageNumber,
405
                                        Symbol_ID = p.Symbol_ID,
406
                                        //Group_ID = p.Group_ID
407
                                    };
408
                                    ViewerDataModel.Instance.MarkupList_Pre.Add(markup);
409
                                }
410
                            });
411
                        }
412
                    });
410 413

  
411
                var currentUser = e.Result.Where(data => data.UserID == App.ViewInfo.UserID && data.AvoidConsolidate == 0).FirstOrDefault();
414
                    var currentUser = e.Result.Where(data => data.UserID == App.ViewInfo.UserID && data.AvoidConsolidate == 0).FirstOrDefault();
412 415

  
413
                if (currentUser == null)
414
                {
415
                    /// create a new markupinfo to do comments
416
                    /// 
417
                    if (App.ViewInfo.NewCommentPermission)
416
                    if (currentUser == null)
418 417
                    {
419
                        var infoId = Commons.shortGuid();
420
                        PreviewUserMarkupInfoItem = new MarkupInfoItem
418
                        /// create a new markupinfo to do comments
419
                        /// 
420
                        if (App.ViewInfo.NewCommentPermission)
421 421
                        {
422
                            CreateTime = DateTime.Now,
423
                            UpdateTime = DateTime.Now,
424
                            Depatment = userData.DEPARTMENT,
425
                            DisplayColor = "#FFFF0000",
426
                            UserID = userData.ID,
427
                            UserName = userData.NAME,
428
                            PageCount = 1,
429
                            Description = "",
430
                            MarkupInfoID = infoId,
431
                            MarkupList = null,
432
                            MarkupVersionID = Commons.shortGuid(),
433
                            Consolidate = 0,
434
                            PartConsolidate = 0,
435
                            userDelete = true,
436
                            AvoidConsolidate = 0,
437
                            IsPreviewUser = false
438
                        };
439

  
440
                        App.Custom_ViewInfoId = infoId;
441

  
442
                        ViewerDataModel.Instance._markupInfoList.Insert(0, PreviewUserMarkupInfoItem);
422
                            var infoId = Commons.shortGuid();
423
                            PreviewUserMarkupInfoItem = new MarkupInfoItem
424
                            {
425
                                CreateTime = DateTime.Now,
426
                                UpdateTime = DateTime.Now,
427
                                Depatment = userData.DEPARTMENT,
428
                                DisplayColor = "#FFFF0000",
429
                                UserID = userData.ID,
430
                                UserName = userData.NAME,
431
                                PageCount = 1,
432
                                Description = "",
433
                                MarkupInfoID = infoId,
434
                                MarkupList = null,
435
                                MarkupVersionID = Commons.shortGuid(),
436
                                Consolidate = 0,
437
                                PartConsolidate = 0,
438
                                userDelete = true,
439
                                AvoidConsolidate = 0,
440
                                IsPreviewUser = false
441
                            };
442

  
443
                            App.Custom_ViewInfoId = infoId;
444

  
445
                            ViewerDataModel.Instance._markupInfoList.Insert(0, PreviewUserMarkupInfoItem);
446
                        }
447
                    }
448
                    else
449
                    {
450
                        App.Custom_ViewInfoId = currentUser.MarkupInfoID;
443 451
                    }
444
                }
445
                else
446
                {
447
                    App.Custom_ViewInfoId = currentUser.MarkupInfoID;
448
                }
449 452

  
450
                ViewerDataModel.Instance.PageNumber = 1;
453
                    ViewerDataModel.Instance.PageNumber = 1;
451 454

  
452
                /// Consolidation 된 데이터가 최상단에 올 수 있도록 변경
453
                //var markupItem = ViewerDataModel.Instance._markupInfoList.OrderByDescending(p => p.Consolidate == Convert.ToInt32(true)).ToList();
455
                    /// Consolidation 된 데이터가 최상단에 올 수 있도록 변경
456
                    //var markupItem = ViewerDataModel.Instance._markupInfoList.OrderByDescending(p => p.Consolidate == Convert.ToInt32(true)).ToList();
454 457

  
455
                gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList;
458
                    gridViewMarkup.ItemsSource = ViewerDataModel.Instance._markupInfoList;
456 459

  
457
                SetCommentPages(null);
460
                    SetCommentPages(null);
458 461

  
459
                // GRIDVIEW에서 팀별 GROUPING
460
                // 효성은 안함
462
                    // GRIDVIEW에서 팀별 GROUPING
463
                    // 효성은 안함
461 464
#if (Hyosung)
462 465
#else
463
                /// create a group descriptor
464
                gridViewMarkup.GroupDescriptors.Clear();
465
                GroupDescriptor descriptor = new GroupDescriptor();
466
                descriptor.Member = "Depatment";
467
                descriptor.DisplayContent = "DEPT";
468
                //descriptor.SortDirection = ListSortDirection.Ascending;
469
                gridViewMarkup.GroupDescriptors.Add(descriptor);
466
                    /// create a group descriptor
467
                    gridViewMarkup.GroupDescriptors.Clear();
468
                    GroupDescriptor descriptor = new GroupDescriptor();
469
                    descriptor.Member = "Depatment";
470
                    descriptor.DisplayContent = "DEPT";
471
                    //descriptor.SortDirection = ListSortDirection.Ascending;
472
                    gridViewMarkup.GroupDescriptors.Add(descriptor);
470 473
#endif
471 474

  
472
                GridViewMarkup_Sorting(gridViewMarkup, new GridViewSortingEventArgs(gridViewMarkup.Columns[0], SortingState.None, SortingState.None));
475
                    GridViewMarkup_Sorting(gridViewMarkup, new GridViewSortingEventArgs(gridViewMarkup.Columns[0], SortingState.None, SortingState.None));
473 476

  
474
                var SelectedItem = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.UpdateTime).FirstOrDefault();
477
                    var SelectedItem = ViewerDataModel.Instance._markupInfoList.Where(info => info.UserID == App.ViewInfo.UserID).OrderByDescending(order => order.UpdateTime).FirstOrDefault();
475 478

  
476
                if (PreviewUserMarkupInfoItem != null)
477
                {
478
                    this.gridViewMarkup.SelectedItem = PreviewUserMarkupInfoItem;
479
                }
480
                else if (SelectedItem != null)
481
                {
482
                    this.gridViewMarkup.SelectedItem = SelectedItem;
483
                }
484
                else if(ViewerDataModel.Instance._markupInfoList.Count() > 0)
485
                {
486
                    this.gridViewMarkup.SelectedItem = ViewerDataModel.Instance._markupInfoList.First();
479
                    if (PreviewUserMarkupInfoItem != null)
480
                    {
481
                        this.gridViewMarkup.SelectedItem = PreviewUserMarkupInfoItem;
482
                    }
483
                    else if (SelectedItem != null)
484
                    {
485
                        this.gridViewMarkup.SelectedItem = SelectedItem;
486
                    }
487
                    else if (ViewerDataModel.Instance._markupInfoList.Count() > 0)
488
                    {
489
                        this.gridViewMarkup.SelectedItem = ViewerDataModel.Instance._markupInfoList.First();
490
                    }
487 491
                }
488 492
            }
493
            catch (Exception ex) 
494
            {
495
                App.FileLogger.Fatal(ex);
496
            }
489 497
        }
490 498

  
491 499
        private void GridViewMarkup_Sorting(object sender, GridViewSortingEventArgs e)
KCOM/Views/MainMenu.xaml.cs
5651 5651
                    DOCUMENT_NO = _DocItem.DOCUMENT_NO,
5652 5652
                    STATUS_DESC_OPEN = "Vendor 반영 필요",
5653 5653
                };
5654
                //Logger.sendReqLog("AddCheckList", projectno + "," + check_, 1);
5654
                Logger.sendReqLog("AddCheckList", projectno + "," + check_, 1);
5655 5655
                //Logger.sendResLog("AddCheckList", this.BaseClient.AddCheckList(projectno, check_).ToString(), 1);
5656
                //this.BaseClient.AddCheckList(projectno, check_);
5656
                this.BaseClient.AddCheckList(projectno, check_);
5657 5657
            }
5658 5658
            else
5659 5659
            {
5660 5660
                Item.IMAGE_URL = Result;
5661 5661
                Item.IMAGE_ANCHOR = x + "," + y + "," + width + "," + height;
5662 5662
                Item.PAGENUMBER = this.pageNavigator.CurrentPage.PageNumber;
5663
                //Logger.sendReqLog("SaveCheckList", projectno + "," + checklist_id + "," + Item, 1);
5663
                Logger.sendReqLog("SaveCheckList", projectno + "," + checklist_id + "," + Item, 1);
5664 5664
                //Logger.sendResLog("SaveCheckList", this.BaseClient.SaveCheckList(projectno, checklist_id, Item).ToString(), 1);
5665
                //this.BaseClient.SaveCheckList(projectno, checklist_id, Item);
5665
                this.BaseClient.SaveCheckList(projectno, checklist_id, Item);
5666 5666
            }
5667 5667
        }
5668 5668

  
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/MARKUS.ini
1 1
[Internal]
2
IP=http://sdms.co.kr:8080/API
2
IP=10.11.252.3:8975
3 3
[External]
4
IP=http://sdms.co.kr:8080/API
4
IP=10.11.252.3:8975
5 5
[BaseClientAddress]
6
URL=http://sdms.co.kr:8080/API
6
URL=http://10.11.252.3:8975
7 7
[HubAddress]
8
URL=http://192.168.0.67:5100/
8
URL=http://10.11.252.3:8975/
9 9
[UpdateVer64]
10
URL=http://localhost:8080/TileSource/Version/version_x64.xml
10
URL=http://10.11.252.3:8975/TileSource/Version/version_x64.xml
11 11
[UpdateVer86]
12
URL=http://localhost:8080/TileSource/Version/version_x86.xml
12
URL=http://10.11.252.3:8975/TileSource/Version/version_x86.xml
13 13
[excelFilePath]
14
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx
14
URL=http://10.11.252.3:8975/TileSource/Check_Test/CheckList_T.xlsx
15 15
[KCOM_Get_FinalImage_Get_PdfImage]
16
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
16
URL=http://10.11.252.3:8975/Get_FInalImage/Get_PdfImage.asmx
17 17
[KCOM_kr_co_devdoftech_cloud_FileUpload]
18
URL=http://sdms.co.kr:8080/ImageUpload/FileUpload.asmx
18
URL=http://10.11.252.3:8975/ImageUpload/FileUpload.asmx
19 19
[mainServerImageWebPath]
20
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
20
URL=http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png
21 21
[subServerImageWebPath]
22
URL=http://sdms.co.kr:8080/TileSource/{0}_Tile/{1}/{2}/{3}.png
22
URL=http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png
23 23
[Debug_BaseClientAddress]
24
URL=http://192.168.0.67:5979
24
URL=http://10.11.252.3:8975
25 25
[HOST_DOMAIN]
26 26
DOMAIN=
27 27
[GetConversionStateFailed]
......
31 31
[SetFinalPDFSuccess]
32 32
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU
33 33
[SetThumbnail]
34
WIDTH=265
34
WIDTH=100
35 35
[Site]
36 36
NAME=DAELIM
37 37
[PortForwarding]
38 38
HUB=5100:5100
39 39
RESOURCE=5977:5977
40
BASE=8080:8080
40
BASE=5979:5979
41 41
[GetImageResourceFailed]
42 42
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/Markus.AppUpdate.ini
1 1
#SNI APP_CAST address
2 2

  
3 3
[APP_CAST]
4
URI = http://sdms.co.kr:8080/MarkusUpdate/appcast.xml
4
URI = http://10.11.252.3:8975/MarkusUpdate/appcast.xml
MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/Properties/AssemblyInfo.cs
51 51
// You can specify all the values or you can default the Build and Revision Numbers 
52 52
// by using the '*' as shown below:
53 53
// [assembly: AssemblyVersion("1.0.*")]
54
[assembly: AssemblyVersion("1.0.0.0")]
55
[assembly: AssemblyFileVersion("1.0.0.0")]
54
[assembly: AssemblyVersion("1.5.0.0")]
55
[assembly: AssemblyFileVersion("1.5.0.0")]
56 56
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)]
appCast_All_Build.bat
1
appcast_sni.bat %1
1
@echo off
2

  
3
set hostbaseUrl=http://172.20.120.141:5977/MarkusUpdate/
4
set updateVersion=%1
5

  
6
IF [%hostbaseUrl%]==[] goto :ERROR
7
if [%updateVersion%]==[] goto :ERROR
8

  
9
echo "Update Version %updateVersion%"
10

  
11
set APPCAST_PUBLISH_PATH=%cd%\publish\AppCast_Daelim\
12
SET MARKUS_PUBLISH_PATH=%cd%\Setup\Release_Default
13

  
14
echo "current  : %current_dir%"
15
echo "APPCAST PATH : %APPCAST_PUBLISH_PATH%"
16
echo "AppCast Path : %current_dir:"=%\%APPCAST_PUBLISH_PATH:"=%"
17
echo "Publish Markus : %current_dir:"=%\%MARKUS_PUBLISH_PATH:"=%"
18

  
19
IF NOT EXIST %LocalAppData%\netsparkle\NetSparkle_Ed25519.pub (
20
echo "generate-keys pass"
21
del %LocalAppData%\netsparkle\*.* /q
22
	.\AppCast\generate_appcast.exe --key-path %APPCAST_PUBLISH_PATH%Keys
23
	.\AppCast\generate_appcast.exe --generate-keys
24
)
25

  
26
IF NOT EXIST %APPCAST_PUBLISH_PATH%\. MKDIR %APPCAST_PUBLISH_PATH%
27

  
28
SET SIGNTOOLPATH="C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe"
29
set SolutionPath=%cd%
30
SET SIGNPATH=%SolutionPath%\Sign\www.doftech.co.kr.pfx
31

  
32
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\*.exe
33
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\Plugin\*.exe
34

  
35
 copy %cd%\INI\Web.config %APPCAST_PUBLISH_PATH%\web.config /Y
36
   
37

  
38
.\AppCast\generate_appcast.exe -u %hostbaseUrl% -p %cd%\ChangeLog -a %APPCAST_PUBLISH_PATH% -e * -b %MARKUS_PUBLISH_PATH% -o windows -n Markus -x -v %updateVersion%
39

  
40
start %APPCAST_PUBLISH_PATH%
41

  
42
:ERROR
43
echo arg1 arg2 exits
44
echo ex : appCast.bat http://hostname:port x.x.x
appCast_Daelim.bat
28 28
SET MARKUS_PUBLISH_PATH=%cd%\Setup\Release_Default
29 29

  
30 30
echo "current  : %current_dir%"
31
echo "APPCAST PATH : %APPCAST_PUBLISH_PATH%"
32
echo "AppCast Path : %current_dir:"=%\%APPCAST_PUBLISH_PATH:"=%"
33
echo "Publish Markus : %current_dir:"=%\%MARKUS_PUBLISH_PATH:"=%"
31
echo "APPCAST PUBLISH PATH : %APPCAST_PUBLISH_PATH%"
34 32

  
35 33
IF NOT EXIST %LocalAppData%\netsparkle\NetSparkle_Ed25519.pub (
36 34
echo "generate-keys pass"
......
41 39

  
42 40
IF NOT EXIST %APPCAST_PUBLISH_PATH%\. MKDIR %APPCAST_PUBLISH_PATH%
43 41

  
42
IF "%2"=="" GOTO Continue
43

  
44 44
SET SIGNTOOLPATH="C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe"
45 45
set SolutionPath=%cd%
46 46
SET SIGNPATH=%SolutionPath%\Sign\www.doftech.co.kr.pfx
......
48 48
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\*.exe
49 49
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\Plugin\*.exe
50 50

  
51
start %APPCAST_PUBLISH_PATH%
52

  
53
:Continue 
54

  
51 55
 copy %cd%\INI\Web.config %APPCAST_PUBLISH_PATH%\web.config /Y
52 56
   
53 57

  
54 58
.\AppCast\generate_appcast.exe -u %hostbaseUrl% -p %cd%\ChangeLog -a %APPCAST_PUBLISH_PATH% -e * -b %MARKUS_PUBLISH_PATH% -o windows -n Markus -x -v %updateVersion%
55 59

  
56
start %APPCAST_PUBLISH_PATH%
57 60

  
58 61
:ERROR
59 62
echo arg1 arg2 exits
appCast_HS.bat
28 28
SET MARKUS_PUBLISH_PATH=%cd%\Setup\Release_Default
29 29

  
30 30
echo "current  : %current_dir%"
31
echo "APPCAST PATH : %APPCAST_PUBLISH_PATH%"
32
echo "AppCast Path : %current_dir:"=%\%APPCAST_PUBLISH_PATH:"=%"
33
echo "Publish Markus : %current_dir:"=%\%MARKUS_PUBLISH_PATH:"=%"
31
echo "APPCAST PUBLISH PATH : %APPCAST_PUBLISH_PATH%"
34 32

  
35 33
IF NOT EXIST %LocalAppData%\netsparkle\NetSparkle_Ed25519.pub (
36 34
echo "generate-keys pass"
......
41 39

  
42 40
IF NOT EXIST %APPCAST_PUBLISH_PATH%\. MKDIR %APPCAST_PUBLISH_PATH%
43 41

  
42
IF "%2"=="" GOTO Continue
44 43

  
45 44
SET SIGNTOOLPATH="C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe"
46 45
set SolutionPath=%cd%
......
49 48
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\*.exe
50 49
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\Plugin\*.exe
51 50

  
51
start %APPCAST_PUBLISH_PATH%
52

  
53
:Continue 
54

  
52 55
 copy %cd%\INI\Web.config %APPCAST_PUBLISH_PATH%\web.config /Y
53 56
   
54 57

  
appCast_SNI.bat
28 28
SET MARKUS_PUBLISH_PATH=%cd%\Setup\Release_Default
29 29

  
30 30
echo "current  : %current_dir%"
31
echo "APPCAST PATH : %APPCAST_PUBLISH_PATH%"
32
echo "AppCast Path : %current_dir:"=%\%APPCAST_PUBLISH_PATH:"=%"
33
echo "Publish Markus : %current_dir:"=%\%MARKUS_PUBLISH_PATH:"=%"
31
echo "APPCAST PUBLISH PATH : %APPCAST_PUBLISH_PATH%"
34 32

  
35 33
IF NOT EXIST %LocalAppData%\netsparkle\NetSparkle_Ed25519.pub (
36 34
echo "generate-keys pass"
......
41 39

  
42 40
IF NOT EXIST %APPCAST_PUBLISH_PATH%\. MKDIR %APPCAST_PUBLISH_PATH%
43 41

  
42
IF "%2"=="" GOTO Continue
44 43

  
45 44
SET SIGNTOOLPATH="C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64\signtool.exe"
46 45
set SolutionPath=%cd%
......
49 48
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\*.exe
50 49
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 %MARKUS_PUBLISH_PATH%\Plugin\*.exe
51 50

  
51
start %APPCAST_PUBLISH_PATH%
52

  
53
:Continue 
54

  
52 55
 copy %cd%\INI\Web.config %APPCAST_PUBLISH_PATH%\web.config /Y
53 56
   
54 57
.\AppCast\generate_appcast.exe -u %hostbaseUrl% -p %cd%\ChangeLog -a %APPCAST_PUBLISH_PATH% -e * -b %MARKUS_PUBLISH_PATH% -o windows -n Markus -x -v %updateVersion%
55 58

  
56
start %APPCAST_PUBLISH_PATH%
57

  
58 59
:ERROR
59 60
echo arg1 exits
60 61
echo ex : appCast.bat http://hostname:port x.x.x

내보내기 Unified diff

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