프로젝트

일반

사용자정보

개정판 3c71b3a5

ID3c71b3a50a242bae59271faa25fb4515049540b6
상위 12caf251
하위 b7813553, 997071b8

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

issue #000: merged master

Change-Id: Id7e766c44e158848f168c86ae220da1700fa36ad

차이점 보기:

ConvertService/ServiceBase/ConvertionWebService/Conversion.asmx.cs
10 10
using DeepViewDataModel.DataModel;
11 11
using DeepViewDataModel.Common;
12 12
using DeepView.Toolkit.GuidGenerator;
13
using Excel = Microsoft.Office.Interop.Excel;
14 13
using MarkupToPDF;
15 14
using System.IO;
16 15
using Newtonsoft.Json;
......
151 150
                
152 151
                using (DeepView_Entity _entity = new DeepView_Entity(ConnectStringBuilder.DeepViewConnectionString().ToString()))
153 152
                {
153
                    if (string.IsNullOrEmpty(group_No))
154
                    {
155
                        group_No = "0";
156
                    }
157
                    if (!prj_No.Equals("150128"))
158
                    {
159
                        //Omsk 는 웹서비스 호출 시 인코딩
160
                        //Omsk 제외는 Markus 에서 인코딩
161
                        document_Url = Base64Decode(document_Url);
162
                    }
154 163
                    var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault();
155 164
                    if (doc != null)
156 165
                    {
......
181 190
                                result = "deleteobject error:"+ex.ToString();
182 191
                            }
183 192
                                                    
184
                        }
185
                        var converterdoc = _entity.CONVERTER_DOC.Where(c => c.DOCUMENT_ID == doc.DOCUMENT_ID).FirstOrDefault();
186
                        _entity.DeleteObject(converterdoc);
187
                        _entity.DeleteObject(doc);
188
                        _entity.SaveChanges();
189
                        document_Url = HttpUtility.UrlDecode(document_Url);
190
                    }
191
                    int cnt = _entity.DOCUMENT_ITEM.ToList().Count;
192
                    if (string.IsNullOrEmpty(group_No))
193
                    {
194
                        group_No = "0";
195
                    }
196
                    if (!prj_No.Equals("150128"))
197
                    {
198
                        //Omsk 는 웹서비스 호출 시 인코딩
199
                        //Omsk 제외는 Markus 에서 인코딩
200
                        document_Url = HttpUtility.UrlEncodeUnicode(document_Url);
201
                    }
202
                    _entity.AddToDOCUMENT_ITEM(new DOCUMENT_ITEM
203
                    {
204
                        ID = document_Id,
205
                        REVISION = rev_No,
206
                        DOCUMENT_NO = document_No,
207
                        DOCUMENT_NAME = document_Name,
208
                        GROUP_NO = group_No,
209
                        ORIGINAL_FILE = document_Url,
210
                        DOCUMENT_ID = _doc_id,
211
                        PROJECT_NO = prj_No,
212
                    });
193
                        }else
194
                        {
195
                            doc.REVISION = rev_No;
196
                            doc.ORIGINAL_FILE = document_Url;
197
                            doc.GROUP_NO = group_No;
198
                            doc.DOCUMENT_NO = document_No;
199
                            doc.DOCUMENT_NAME = document_Name;
200
                        }                        
201
                    }else
202
                    {
203
                        _entity.AddToDOCUMENT_ITEM(new DOCUMENT_ITEM
204
                        {
205
                            ID = document_Id,
206
                            REVISION = rev_No,
207
                            DOCUMENT_NO = document_No,
208
                            DOCUMENT_NAME = document_Name,
209
                            GROUP_NO = group_No,
210
                            ORIGINAL_FILE = document_Url,
211
                            DOCUMENT_ID = _doc_id,
212
                            PROJECT_NO = prj_No,
213
                        });                        
214
                    }                    
215
                    
213 216
                    _entity.AddToCONVERTER_DOC(new CONVERTER_DOC
214 217
                    {
215 218
                        ID = _id,
......
478 481
                string _id = shortGuid();
479 482
                string _doc_id = ((UInt32)document_Id.GetHashCode()).ToString();
480 483
                using (DeepView_Entity _entity = new DeepView_Entity(ConnectStringBuilder.DeepViewConnectionString().ToString()))
481
                {                    
482
                    var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault();
483
                    if(doc != null)
484
                    {
485
                        var converterdoc = _entity.CONVERTER_DOC.Where(c => c.DOCUMENT_ID == doc.DOCUMENT_ID).FirstOrDefault();
486
                        _entity.DeleteObject(converterdoc);
487
                        _entity.DeleteObject(doc);
488
                        _entity.SaveChanges();
489
                        document_Url = HttpUtility.UrlDecode(document_Url);
490
                    }
491
                    int cnt = _entity.DOCUMENT_ITEM.ToList().Count;
492
                    if(string.IsNullOrEmpty(group_No))
484
                {
485
                    if (string.IsNullOrEmpty(group_No))
493 486
                    {
494 487
                        group_No = "0";
495 488
                    }
......
497 490
                    {
498 491
                        //Omsk 는 웹서비스 호출 시 인코딩
499 492
                        //Omsk 제외는 Markus 에서 인코딩
500
                        document_Url = HttpUtility.UrlEncodeUnicode(document_Url);
493
                        document_Url = Base64Decode(document_Url);
501 494
                    }
502
                    _entity.AddToDOCUMENT_ITEM(new DOCUMENT_ITEM
495
                    var doc = _entity.DOCUMENT_ITEM.Where(d => d.ID == document_Id).FirstOrDefault();
496
                    if(doc != null)
503 497
                    {
504
                        ID = document_Id,
505
                        REVISION = rev_No,
506
                        DOCUMENT_NO = document_No,
507
                        DOCUMENT_NAME = document_Name,
508
                        GROUP_NO = group_No,
509
                        ORIGINAL_FILE = document_Url,
510
                        DOCUMENT_ID = _doc_id,
511
                        PROJECT_NO = prj_No,
512
                    });
498
                        doc.REVISION = rev_No;
499
                        doc.ORIGINAL_FILE = document_Url;
500
                        doc.GROUP_NO = group_No;
501
                        doc.DOCUMENT_NO = document_No;
502
                        doc.DOCUMENT_NAME = document_Name;                        
503
                    }else
504
                    {
505
                        _entity.AddToDOCUMENT_ITEM(new DOCUMENT_ITEM
506
                        {
507
                            ID = document_Id,
508
                            REVISION = rev_No,
509
                            DOCUMENT_NO = document_No,
510
                            DOCUMENT_NAME = document_Name,
511
                            GROUP_NO = group_No,
512
                            ORIGINAL_FILE = document_Url,
513
                            DOCUMENT_ID = _doc_id,
514
                            PROJECT_NO = prj_No,
515
                        });
516
                    }
517
                    
513 518
                    _entity.AddToCONVERTER_DOC(new CONVERTER_DOC
514 519
                    {
515 520
                        ID = _id,
......
662 667
        }
663 668

  
664 669
        [WebMethod]
665
        public string ExcelExport(string project_no,string slip_no)
670
        public string ExcelExport(string project_no, string slip_no)
666 671
        {
667 672
            string _result = "false";
668
            Excel.Application application = null;
669
            Excel.Workbook workbook = null;
670
            Excel.Worksheet worksheet = null;
671
            string xlsxfilepath = @"D:\sample.xlsx";
672
            
673
            string fileout = @"D:\CommentExport_" + DateTime.Now.ToString() + ".xlsx";
674
            
673
            //FileInfo fileInfo2 = new FileInfo(Path.GetTempFileName());
674
            //fileInfo2.FullName
675 675
            try
676 676
            {
677 677
                // Excel 첫번째 워크시트 가져오기                
678
                application = new Excel.Application();
679
                workbook = application.Workbooks.Open(xlsxfilepath);
680
                worksheet = (Excel.Worksheet)workbook.Worksheets.get_Item("Sheet1");
678
                //application = new Excel.Application();
679
                //workbook = application.Workbooks.Open(xlsxfilepath);
680
                //worksheet = (Excel.Worksheet)workbook.Worksheets.get_Item("Sheet1");
681
                string xlsxfilepath = @"C:\WebSite\LogView\Doc_Manager\sample.xlsx";
682
                GemBox.Spreadsheet.SpreadsheetInfo.SetLicense("EXK0-W4HZ-N518-IMEW");
683
                GemBox.Spreadsheet.ExcelFile excelFile = new GemBox.Spreadsheet.ExcelFile();
684
                excelFile.LoadXlsx(xlsxfilepath, GemBox.Spreadsheet.XlsxOptions.PreserveMakeCopy);
685
                GemBox.Spreadsheet.ExcelWorksheet ws = excelFile.Worksheets[0];
686
                FileInfo fileInfo2 = new FileInfo(Path.GetTempFileName().Replace(".tmp", ".xlsx"));
687

  
688
                string fileout = @"C:\WebSite\LogView\Doc_Manager\commentexcel_" + DateTime.Now.ToString() + ".xlsx";
689
                string naspath = Properties.Settings.Default.Excelfilepath;
690
                    //@"\\172.20.121.220\comment3\TileSource\Excelexport";
681 691

  
682 692
                // 데이타 넣기
683 693
                int h = 6;
684
                int w = 2;
694
                int w = 1;
685 695

  
686 696

  
687 697
                //필터 기능 추가
688 698
                //Excel.Range Filter_Range = worksheet.Range["B9:" + Ran + "9"];
689 699
                //Filter_Range.AutoFilter(1, Type.Missing, Excel.XlAutoFilterOperator.xlAnd, Type.Missing, true);
690 700

  
691
                
701

  
692 702
                using (DeepView_Entity deepViewEntity = new DeepView_Entity(ConnectStringBuilder.DeepViewConnectionString().ToString()))
693 703
                {
694 704
                    var docs = deepViewEntity.DOCUMENT_ITEM.Where(doc => doc.GROUP_NO == slip_no && doc.PROJECT_NO == project_no).ToList();
695
                    foreach(var doc in docs)
705
                    if (docs.Count > 0)
696 706
                    {
697
                        var commentlist = deepViewEntity.MARKUP_DATA.Where(d => d.MARKUP_INFO_VERSION.MARKUP_INFO.DOCINFO.DOCUMENT_ID == doc.DOCUMENT_ID
698
                        && d.MARKUP_INFO_VERSION.MARKUP_INFO.CONSOLIDATE == 1).ToList();
699

  
700
                        string docNo = doc.DOCUMENT_NO;
701
                        string docDesc = doc.DOCUMENT_NAME;
702
                        string docRev = doc.REVISION;
703
                        foreach(var comment in commentlist)
707
                        foreach (var doc in docs)
704 708
                        {
705
                            var member = deepViewEntity.MEMBER.Where(m => m.ID == comment.MARKUP_INFO_VERSION.MARKUP_INFO.USER_ID).FirstOrDefault();
706
                            string docdept = member.DEPARTMENT;
707
                            string doccomment = string.Empty;
708
                            var data = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString(comment.DATA.ToString());
709
                            switch (Enum.Parse(typeof(MarkupToPDF.Controls.Common.ControlType), comment.DATA_TYPE.ToString()))
709
                            var commentlist = deepViewEntity.MARKUP_DATA.Where(d => d.MARKUP_INFO_VERSION.MARKUP_INFO.DOCINFO.DOCUMENT_ID == doc.DOCUMENT_ID
710
                            && d.MARKUP_INFO_VERSION.MARKUP_INFO.CONSOLIDATE == 1).ToList();
711

  
712
                            string docNo = doc.DOCUMENT_NO;
713
                            string docDesc = doc.DOCUMENT_NAME;
714
                            string docRev = doc.REVISION;
715
                            foreach (var comment in commentlist)
710 716
                            {
711
                                case MarkupToPDF.Controls.Common.ControlType.TextControl:
712
                                case MarkupToPDF.Controls.Common.ControlType.TextBorder:
713
                                case MarkupToPDF.Controls.Common.ControlType.TextCloud:
714
                                    {
715
                                        MarkupToPDF.Serialize.S_Control.S_TextControl instance = MarkupToPDF.Serialize.Core.JsonSerializerHelper.JsonDeserialize<MarkupToPDF.Serialize.S_Control.S_TextControl>(data);
716
                                        doccomment = instance.Text;
717
                                    }
718
                                    break;
719
                                case MarkupToPDF.Controls.Common.ControlType.ArrowTextBorderControl:
720
                                case MarkupToPDF.Controls.Common.ControlType.ArrowTextCloudControl:
721
                                case MarkupToPDF.Controls.Common.ControlType.ArrowTextControl:
722
                                case MarkupToPDF.Controls.Common.ControlType.ArrowTransTextBorderControl:
723
                                case MarkupToPDF.Controls.Common.ControlType.ArrowTransTextCloudControl:
724
                                case MarkupToPDF.Controls.Common.ControlType.ArrowTransTextControl:
725
                                    {
726
                                        MarkupToPDF.Serialize.S_Control.S_ArrowTextControl instance = MarkupToPDF.Serialize.Core.JsonSerializerHelper.JsonDeserialize<MarkupToPDF.Serialize.S_Control.S_ArrowTextControl>(data);
727
                                        doccomment = instance.ArrowText;
728
                                    }
729
                                    break;
717
                                var member = deepViewEntity.MEMBER.Where(m => m.ID == comment.MARKUP_INFO_VERSION.MARKUP_INFO.USER_ID).FirstOrDefault();
718
                                string docdept = member.DEPARTMENT;
719
                                string doccomment = string.Empty;
720
                                var data = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString(comment.DATA.ToString());
721
                                switch (Enum.Parse(typeof(MarkupToPDF.Controls.Common.ControlType), comment.DATA_TYPE.ToString()))
722
                                {
723
                                    case MarkupToPDF.Controls.Common.ControlType.TextControl:
724
                                    case MarkupToPDF.Controls.Common.ControlType.TextBorder:
725
                                    case MarkupToPDF.Controls.Common.ControlType.TextCloud:
726
                                        {
727
                                            MarkupToPDF.Serialize.S_Control.S_TextControl instance = MarkupToPDF.Serialize.Core.JsonSerializerHelper.JsonDeserialize<MarkupToPDF.Serialize.S_Control.S_TextControl>(data);
728
                                            doccomment = instance.Text;
729
                                        }
730
                                        break;
731
                                    case MarkupToPDF.Controls.Common.ControlType.ArrowTextBorderControl:
732
                                    case MarkupToPDF.Controls.Common.ControlType.ArrowTextCloudControl:
733
                                    case MarkupToPDF.Controls.Common.ControlType.ArrowTextControl:
734
                                    case MarkupToPDF.Controls.Common.ControlType.ArrowTransTextBorderControl:
735
                                    case MarkupToPDF.Controls.Common.ControlType.ArrowTransTextCloudControl:
736
                                    case MarkupToPDF.Controls.Common.ControlType.ArrowTransTextControl:
737
                                        {
738
                                            MarkupToPDF.Serialize.S_Control.S_ArrowTextControl instance = MarkupToPDF.Serialize.Core.JsonSerializerHelper.JsonDeserialize<MarkupToPDF.Serialize.S_Control.S_ArrowTextControl>(data);
739
                                            doccomment = instance.ArrowText;
740
                                        }
741
                                        break;
742
                                }
743
                                ws.Cells[h, w].Value = string.Format("{0}\n({1})", docNo, docDesc);
744
                                ws.Cells[h, w + 1].Value = docRev;
745
                                ws.Cells[h, w + 2].Value = docdept;
746
                                ws.Cells[h, w + 3].Value = doccomment;
747
                                h++;
730 748
                            }
731
                            worksheet.Cells[h, w] = string.Format("{0}\n({1})",docNo,docDesc);
732
                            worksheet.Cells[h, w + 1] = docRev;
733
                            worksheet.Cells[h, w + 2] = docdept;
734
                            worksheet.Cells[h, w + 3] = doccomment;
735
                            h++;
736 749
                        }
737 750
                    }
738
                    
739
                }
751
                    else
752
                    {
753
                        _result = "ERROR : 해당 Slip 의 데이터가 없습니다.";
754
                    }
740 755

  
741 756

  
742
                worksheet.Columns.AutoFit();
757
                }
758

  
759
                int columnCount = ws.CalculateMaxUsedColumns();
760
                for (int i = 0; i < columnCount; i++)
761
                    ws.Columns[i].AutoFit();
762
                //worksheet.Columns.AutoFit();
743 763
                // 엑셀파일 저장
744
                
745
                
746
                workbook.SaveAs(fileout);
747
                //workbook.Save();
748
                workbook.Close(true);
749
                application.Quit();
750
                _result = fileout;
751
            }
752
            catch(Exception e)
753
            {
754
                _result = e.Message;
764

  
765
                excelFile.Save(fileInfo2.FullName);
766
                fileInfo2.MoveTo(naspath + "\\" + fileInfo2.Name);
767
                //workbook.SaveAs(fileout);
768
                ////workbook.Save();
769
                //workbook.Close(true);
770
                //application.Quit();
771
                _result = Properties.Settings.Default.Excelresulturl + fileInfo2.Name;
755 772
            }
756
            finally
773
            catch (Exception e)
757 774
            {
758
                System.Diagnostics.Process[] ExCel = System.Diagnostics.Process.GetProcessesByName("EXCEL");
759
                if (ExCel.Count() != 0)
760
                {
761
                    ExCel[0].Kill();
762
                }
763

  
764
                // Clean up
765
                ReleaseExcelObject(worksheet);
766
                ReleaseExcelObject(workbook);
767
                ReleaseExcelObject(application);
768
                
775
                _result = "ERROR : " + e.ToString();
769 776
            }
770 777
            return _result;
771 778
        }
ConvertService/ServiceBase/ConvertionWebService/ConvertionWebService.csproj
61 61
      <SpecificVersion>False</SpecificVersion>
62 62
      <HintPath>..\Old_lib\DeepViewDataModel.dll</HintPath>
63 63
    </Reference>
64
    <Reference Include="GemBox.Spreadsheet, Version=39.3.30.1215, Culture=neutral, PublicKeyToken=b1b72c69714d4847, processorArchitecture=MSIL">
65
      <HintPath>..\packages\GemBox.Spreadsheet.39.3.30.1215\lib\net30\GemBox.Spreadsheet.dll</HintPath>
66
    </Reference>
64 67
    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
65 68
      <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
66 69
    </Reference>
67 70
    <Reference Include="MarkupToPDF">
68
      <HintPath>..\..\..\..\MarkUS_deploy\MarkupToPDF\bin\x64\Debug\MarkupToPDF.dll</HintPath>
71
      <HintPath>..\Old_lib\MarkupToPDF.dll</HintPath>
69 72
    </Reference>
70 73
    <Reference Include="Microsoft.CSharp" />
71
    <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
72
      <EmbedInteropTypes>True</EmbedInteropTypes>
73
      <HintPath>..\Main\PDFConverter\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
74
      <Private>True</Private>
75
    </Reference>
76 74
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
77 75
      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
78 76
    </Reference>
ConvertService/ServiceBase/ConvertionWebService/Properties/Settings.Designer.cs
58 58
                return ((string)(this["MARKUS_V3_ADDRESS"]));
59 59
            }
60 60
        }
61
        
62
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
63
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
64
        [global::System.Configuration.DefaultSettingValueAttribute("http://172.20.120.141:5977/TileSource/Excelexport/")]
65
        public string Excelresulturl {
66
            get {
67
                return ((string)(this["Excelresulturl"]));
68
            }
69
        }
70
        
71
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
72
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
73
        [global::System.Configuration.DefaultSettingValueAttribute("\\\\172.20.121.220\\comment3\\TileSource\\Excelexport")]
74
        public string Excelfilepath {
75
            get {
76
                return ((string)(this["Excelfilepath"]));
77
            }
78
        }
61 79
    }
62 80
}
ConvertService/ServiceBase/ConvertionWebService/Properties/Settings.settings
14 14
    <Setting Name="MARKUS_V3_ADDRESS" Type="System.String" Scope="Application">
15 15
      <Value Profile="(Default)">http://localhost:9101/StationService</Value>
16 16
    </Setting>
17
    <Setting Name="Excelresulturl" Type="System.String" Scope="Application">
18
      <Value Profile="(Default)">http://172.20.120.141:5977/TileSource/Excelexport/</Value>
19
    </Setting>
20
    <Setting Name="Excelfilepath" Type="System.String" Scope="Application">
21
      <Value Profile="(Default)">\\172.20.121.220\comment3\TileSource\Excelexport</Value>
22
    </Setting>
17 23
  </Settings>
18 24
</SettingsFile>
ConvertService/ServiceBase/ConvertionWebService/Web.config
35 35
      <setting name="MARKUS_V3_ADDRESS" serializeAs="String">
36 36
        <value>http://localhost:9101/StationService</value>
37 37
      </setting>
38
      <setting name="Excelresulturl" serializeAs="String">
39
        <value>http://172.20.120.141:5977/TileSource/Excelexport/</value>
40
      </setting>
41
      <setting name="Excelfilepath" serializeAs="String">
42
        <value>\\172.20.121.220\comment3\TileSource\Excelexport</value>
43
      </setting>
38 44
    </ConvertionWebService.Properties.Settings>
39 45
  </applicationSettings>
40 46
  <system.serviceModel>
ConvertService/ServiceBase/ConvertionWebService/packages.config
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<packages>
3
  <package id="GemBox.Spreadsheet" version="39.3.30.1215" targetFramework="net452" />
3 4
  <package id="log4net" version="2.0.8" targetFramework="net452" />
4 5
  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net40" requireReinstallation="true" />
5 6
</packages>
FinalService/KCOM_FinalService/IFinalPDF/IFinalPDF.csproj
29 29
    <ErrorReport>prompt</ErrorReport>
30 30
    <WarningLevel>4</WarningLevel>
31 31
  </PropertyGroup>
32
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
33
    <DebugSymbols>true</DebugSymbols>
34
    <OutputPath>bin\x86\Debug\</OutputPath>
35
    <DefineConstants>DEBUG;TRACE</DefineConstants>
36
    <DebugType>full</DebugType>
37
    <PlatformTarget>x86</PlatformTarget>
38
    <ErrorReport>prompt</ErrorReport>
39
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
40
  </PropertyGroup>
41
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
42
    <OutputPath>bin\x86\Release\</OutputPath>
43
    <DefineConstants>TRACE</DefineConstants>
44
    <Optimize>true</Optimize>
45
    <DebugType>pdbonly</DebugType>
46
    <PlatformTarget>x86</PlatformTarget>
47
    <ErrorReport>prompt</ErrorReport>
48
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
49
  </PropertyGroup>
32 50
  <ItemGroup>
33 51
    <Reference Include="System" />
34 52
    <Reference Include="System.Core" />
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_Arrow.cs
43 43
            contentByte.RestoreState();
44 44
        }
45 45

  
46
        public static void DimAllow(System.Windows.Point p1, System.Windows.Point p2, int lineSize, PdfContentByte contentByte,
46
        public static void DimAllow(System.Windows.Point p1, System.Windows.Point p2, double lineSize, PdfContentByte contentByte,
47 47
                                        SolidColorBrush color, double opac, bool isFixPoint = false)
48 48
        {
49 49
            contentByte.SaveState();
FinalService/KCOM_FinalService/MarkupToPDF/Controls_PDF/HoneyPDFLib_DrawSet_DrawString.cs
304 304

  
305 305
            contentByte.RestoreState();
306 306

  
307
            DrawLeaderLine(ptHead, ptMid, transformed, (int)lineSize, contentByte, color, opac);
307
            DrawLeaderLine(ptHead, ptMid, transformed, lineSize, contentByte, color, opac);
308 308
        }
309 309

  
310 310
        /// <summary>
......
319 319
        /// <param name="contentByte"></param>
320 320
        /// <param name="color"></param>
321 321
        /// <param name="opac"></param>
322
        private static void DrawLeaderLine(Point start, Point mid, List<Point> border, int LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, SolidColorBrush color, double opac)
322
        private static void DrawLeaderLine(Point start, Point mid, List<Point> border, double LineSize, iTextSharp.text.pdf.PdfContentByte contentByte, SolidColorBrush color, double opac)
323 323
        {
324 324
            /// prepare connection points
325 325
            List<Point> ptConns = new List<Point>();
......
343 343
                }
344 344
            }
345 345

  
346
            Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(start, mid, (int)LineSize, contentByte, color, opac);
347
            Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(start, mid, (int)LineSize, contentByte, new DoubleCollection(9999), color, opac);
348
            Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(mid, anchor.Value, (int)LineSize, contentByte, new DoubleCollection(9999), color, opac);
346
            Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(start, mid, LineSize, contentByte, color, opac);
347
            Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(start, mid, LineSize, contentByte, new DoubleCollection(9999), color, opac);
348
            Controls_PDF.HoneyPDFLib_DrawSet_Line.DrawLine(mid, anchor.Value, LineSize, contentByte, new DoubleCollection(9999), color, opac);
349 349
        }
350 350

  
351 351
        private static void PaintFill(PdfContentByte contentByte, PaintSet PaintStyle, BaseColor bs)
FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
520 520
                                                        switch (control.LineStyleSet)
521 521
                                                        {
522 522
                                                            case LineStyleSet.ArrowLine:
523
                                                                Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity);
523
                                                                Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity);
524 524
                                                                break;
525 525
                                                            case LineStyleSet.CancelLine:
526 526
                                                                {
......
537 537
                                                                break;
538 538
                                                            case LineStyleSet.TwinLine:
539 539
                                                                {
540
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity);
541
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
540
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity);
541
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity);
542 542
                                                                }
543 543
                                                                break;
544 544
                                                            case LineStyleSet.DimLine:
545 545
                                                                {
546
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.DimAllow(StartPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
547
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, (int)LineSize, contentByte, _SetColor, Opacity);
548
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, (int)LineSize, contentByte, _SetColor, Opacity);
546
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.DimAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity);
547
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(EndPoint, StartPoint, LineSize, contentByte, _SetColor, Opacity);
548
                                                                    Controls_PDF.HoneyPDFLib_DrawSet_Arrow.SingleAllow(StartPoint, EndPoint, LineSize, contentByte, _SetColor, Opacity);
549 549
                                                                }
550 550
                                                                break;
551 551
                                                            default:
KCOM.sln
143 143
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Debug|x86.Build.0 = Debug|x86
144 144
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|Any CPU.ActiveCfg = Release|Any CPU
145 145
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|Any CPU.Build.0 = Release|Any CPU
146
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x64.ActiveCfg = Release|Any CPU
147
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x64.Build.0 = Release|Any CPU
146
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x64.ActiveCfg = Release|x64
147
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x64.Build.0 = Release|x64
148 148
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x86.ActiveCfg = Release|x86
149 149
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x86.Build.0 = Release|x86
150 150
		{784438BE-2074-41AE-A692-24E1A4A67FE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
KCOM/KCOM.csproj.user
21 21
    <StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram>
22 22
  </PropertyGroup>
23 23
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
24
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQwIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJIMjAxMTM1NyIsIk1vZGUiOjB9</StartArguments>
24
    <StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQxIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
25 25
  </PropertyGroup>
26 26
</Project>
KCOM/Properties/Settings.Designer.cs
252 252
                this["grouping"] = value;
253 253
            }
254 254
        }
255
        
256
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
257
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
258
        [global::System.Configuration.DefaultSettingValueAttribute("..\\packages\\Obfuscar.2.2.23\\tools\\Obfuscar.Console.exe")]
259
        public string obfuscar {
260
            get {
261
                return ((string)(this["obfuscar"]));
262
            }
263
        }
255 264
    }
256 265
}
KCOM/Properties/Settings.settings
65 65
    <Setting Name="grouping" Type="System.Int32" Scope="User">
66 66
      <Value Profile="(Default)">0</Value>
67 67
    </Setting>
68
    <Setting Name="obfuscar" Type="System.String" Scope="Application">
69
      <Value Profile="(Default)">..\packages\Obfuscar.2.2.23\tools\Obfuscar.Console.exe</Value>
70
    </Setting>
68 71
  </Settings>
69 72
</SettingsFile>
KCOM/Views/MainMenu.xaml.cs
2115 2115
        }
2116 2116

  
2117 2117
        private void zoomAndPanControl_MouseDown(object sender, MouseButtonEventArgs e)
2118
        {
2119
            zoomAndPanControl.Focus();
2118
        {            
2120 2119
            var set_option = this.ParentOfType<MainWindow>().dzTopMenu.Parent.ChildrenOfType<RadNumericUpDown>().Where(item => item.IsKeyboardFocusWithin).FirstOrDefault();
2121 2120
            if (set_option != null && !string.IsNullOrEmpty(set_option.ContentText))
2122 2121
            {
2123 2122
                set_option.Value = double.Parse(set_option.ContentText);
2124 2123
                //set_option.Focusable = false;
2125
                
2124
                zoomAndPanControl.Focus();
2126 2125
            }
2127 2126

  
2128 2127
            ConvertInkControlToPolygon();
KCOM/app.config
207 207
      <setting name="UpdateVer86" serializeAs="String">
208 208
        <value>http://www.devdoftech.co.kr:5977/TileSource/Version/version_x86.xml</value>
209 209
      </setting>
210
      <setting name="obfuscar" serializeAs="String">
211
        <value>..\packages\Obfuscar.2.2.23\tools\Obfuscar.Console.exe</value>
212
      </setting>
210 213
    </KCOM.Properties.Settings>
211 214
  </applicationSettings>
212 215
  <entityFramework>
KCOMDataModel/DataModel/CIModel.edmx
109 109
          <Property Name="MARKUPINFO_VERSION_ID" Type="nvarchar" MaxLength="50" Nullable="false" />
110 110
          <Property Name="DATA_TYPE" Type="int" Nullable="false" />
111 111
          <Property Name="SYMBOL_ID" Type="nvarchar" MaxLength="50" />
112
          <Property Name="GROUP_ID" Type="bigint" />
113 112
        </EntityType>
114 113
        <EntityType Name="MARKUP_INFO">
115 114
          <Key>
KCOM_API/ServiceDeepView.svc.cs
2801 2801
            return result;
2802 2802
        }
2803 2803

  
2804
        /// <summary>
2805
        /// 현재 진행중인 Final PDF 가 없거나 Success 일 경우에만 true return
2806
        /// </summary>
2807
        /// <param name="DocInfoID"></param>
2808
        /// <param name="MarkupInfoID"></param>
2809
        /// <param name="CreateUserID"></param>
2810
        /// <returns></returns>
2804 2811
        [OperationContract]
2805 2812
        public bool FinalPDF_GetFinalPDFStatus(string DocInfoID, string MarkupInfoID, string CreateUserID)
2806 2813
        {
......
2813 2820
                    var finalpdf = _entity.FINAL_PDF.Where(x => x.DOCINFO_ID == DocInfoID && x.MARKUPINFO_ID == MarkupInfoID && x.CREATE_USER_ID == CreateUserID).FirstOrDefault();
2814 2821
                    if (finalpdf != null)
2815 2822
                    {
2816
                        if(finalpdf.STATUS == (int)FinalStatus.Success)
2823
                        if (finalpdf.STATUS == (int)FinalStatus.Success)
2817 2824
                        {
2818 2825
                            result = true;
2819 2826
                        }
2820 2827
                    }
2828
                    else
2829
                        result = true;
2821 2830
                }
2822 2831
            }
2823 2832
            catch (Exception)
MARKUS.wxs
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
3 3
  <Product Id="*" Name="MARKUS" Language="1033" Version="1.0.0.0" Manufacturer="DOFTECH(C)" UpgradeCode="83FC35CA-6B7D-40C3-9D5F-E8F76097B25C">
4 4
    <Package Platform="x64" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
5 5

  
......
11 11
    
12 12
    <Feature Id="ProductFeature" Title="MARKUS" Level="1">
13 13
      <ComponentGroupRef Id="MARKUS" />
14
    </Feature>
14
    </Feature>    
15 15

  
16
    <Property Id="NOTEPAD" Value="notepad.exe" />    
17
    <CustomAction Id="LaunchFile" Property="NOTEPAD" ExeCommand="[INSTALLFOLDER]readme.txt" Return="asyncNoWait" />
16
    <CustomAction Id="NETFRAMEWORK_461"
17
      Directory="INSTALLFOLDER"
18
      ExeCommand="&quot;[INSTALLFOLDER]NDP461-KB3102438-Web.exe&quot; /norestart&quot; /passive&quot; /showrumi&quot; /ChainingPackage&quot; Contoso"
19
      Execute="commit"
20
      Return="asyncNoWait"  
21
      Impersonate="no"
22
    />
23

  
24
    <InstallExecuteSequence>
25
      <Custom Action='NETFRAMEWORK_461' After='InstallFiles' />
26
    </InstallExecuteSequence>
27

  
28
    <Property Id="WixShellExecTarget" Value="[INSTALLFOLDER]readme.html" />
29
    <CustomAction Id="LaunchBrowser" 
30
        BinaryKey="WixCA" 
31
        DllEntry="WixShellExec"
32
        Impersonate="yes" />        
18 33
    <InstallExecuteSequence>
19
      <Custom Action='LaunchFile' After='InstallFinalize'>NOT Installed</Custom>
34
      <Custom Action='LaunchBrowser' After='InstallFinalize'>NOT Installed</Custom>
20 35
    </InstallExecuteSequence>
21 36
  </Product>
22 37

  
......
24 39
    <Directory Id="TARGETDIR" Name="SourceDir">
25 40
      <Directory Id="DesktopFolder" Name="Desktop">
26 41
        <Component Id="DesktopShortcut" Guid="DF06024A-95FE-43E2-BDF2-7C686EAF391F" Feature="ProductFeature" Win64='yes'>
27
          <RegistryValue Root="HKCU" Key="Software\DOFTECH\MARKUS" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
28
          <Shortcut Id="DesktopShortcut"
29
                    Directory="DesktopFolder"
30
                    Name="MARKUS"
31
                    Description="PDF Markup Tool"
32
                    Target="[INSTALLFOLDER]KCOM.exe"
33
                    WorkingDirectory="INSTALLFOLDER" />
42
          <RegistryValue Root="HKCU" Key="Software\DOFTECH\MARKUS" Name="installed" Type="integer" Value="1" KeyPath="yes"/>          
34 43
          <RemoveFolder Id="DesktopFolder" On="uninstall"/>
35 44
        </Component>
36 45
      </Directory>
......
42 51
      </Directory>  
43 52
    </Directory>
44 53
    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
45
    <UIRef Id="WixUI_InstallDir"/>
54
    <UIRef Id="WixUI_InstallDir"/>   
46 55
    
47
    <UI>
48
      <Publish Dialog="ExitDialog" 
49
        Control="Finish" 
50
        Event="DoAction" 
51
        Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed
52
      </Publish>
53
    </UI>
54
    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch MARKUS" />
55
    <Property Id="WixShellExecTarget" Value="[INSTALLFOLDER]KCOM.exe" />
56
    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
57 56
  </Fragment>
58 57

  
59 58
  <Fragment>
......
125 124
    <Fragment>
126 125
        <ComponentGroup Id="MARKUS">
127 126
            <ComponentRef Id="CreateMyAppDataFolder" />
127
			<ComponentRef Id="cmp67889FD2219FCD1ECDA0BD9FE906CD7A" />
128
			<ComponentRef Id="cmpB2A195FD7387054E641ABB044E70AD31" />
129
			<ComponentRef Id="cmpCA3EA94464F79A1D590AD23EE3921964" />
130
			<ComponentRef Id="cmpEB1634EB055BA192F2B44B8310392EAD" />
128 131
            <Component Id="cmpCC866C67D0ACDB0EBE26789908374F45" Directory="INSTALLFOLDER" Guid="F6CF8A7C-00AA-4B45-ADD4-F3DA249D8E64" Win64='yes'>
129 132
                <File Id="fil4A00EA3A4A830EE9C257BEC8A7AA9E1A" KeyPath="yes" Source=".\Setup\Bytescout.PDFExtractor.dll" />
130 133
            </Component>
......
136 139
            </Component>
137 140
            <Component Id="cmp6CF5CB56E3583D0EBD44D2BB10A62A27" Directory="INSTALLFOLDER" Guid="E0007A37-1DBD-49F4-B24B-D758C1209839" Win64='yes'>
138 141
                <File Id="filD3369B082D009ADB833B8DD9F589E45E" KeyPath="yes" Source=".\Setup\EntityFramework.xml" />
139
            </Component>
140
            <Component Id="cmpEFC8E4FEAD65C6F8432B4EB578EBEA5F" Directory="INSTALLFOLDER" Guid="DC38EC4A-2587-418E-BDB8-5031B21CFD8D" Win64='yes'>
141
                <File Id="filD04D74C9E941CA5FA1661C44EBD7C811" KeyPath="yes" Source=".\Setup\IFinalPDF.dll" />
142
            </Component>
142
            </Component>            
143 143
            <Component Id="cmpA415203DE9EF9D193E74C69FE81234D3" Directory="INSTALLFOLDER" Guid="D988FC9F-EEBB-4DA9-BDA2-46B926576509" Win64='yes'>
144 144
                <File Id="fil83609071B2AD8A06678837154646C3FB" KeyPath="yes" Source=".\Setup\IKCOM.dll" />
145 145
            </Component>
......
153 153
                <File Id="filDBD3D396B7182945BD91EEFC05F44BB9" KeyPath="yes" Source=".\Setup\KCOM.exe" />
154 154
            </Component>
155 155
            <Component Id="cmp8234C30B57CA4022B9BA108719FDF848" Directory="INSTALLFOLDER" Guid="3E2E60BB-3122-40F5-9A76-BDCF3F88D522" Win64='yes'>
156
                <File Id="fil275D1AADC07745DA9912353B6B5FC53F" KeyPath="yes" Source=".\readme.txt" />
156
                <File Id="fil275D1AADC07745DA9912353B6B5FC53F" KeyPath="yes" Source=".\readme.html" />
157
            </Component>
158
            <Component Id="cmp92F6718F031E4AD2810155492929EE55" Directory="INSTALLFOLDER" Guid="CC6B1FD1-0587-4C56-B2F0-437BFA51B673" Win64='yes'>
159
                <File Id="fil32BE8515827243CE87971B56055C66F1" KeyPath="yes" Source=".\packages\NDP461-KB3102438-Web.exe" />
157 160
            </Component>
158 161
            <Component Id="cmp008EC7C4B15BA79DEC806A9852526EF9" Directory="INSTALLFOLDER" Guid="B4829BEF-7376-4039-8E1D-8A46D257F4AF" Win64='yes'>
159 162
                <File Id="filD7A7D725F3C20E26B1A149EAABD9323C" KeyPath="yes" Source=".\Setup\KCOM.exe.config" />
......
168 171
                <File Id="fil9C8C2AB2B1E142458FBD1EB991F289E1" KeyPath="yes" Source=".\packages\potrace.exe" />
169 172
            </Component>
170 173
            <Component Id="cmp40B0E7C91C025AEEEF1F0DEC51A66549" Directory="INSTALLFOLDER" Guid="69d5a0ff-23db-4044-b874-1f8078446e24" Win64='yes'>
171
                <File Id="filF60CE67197837623CD57BE23CB07368E" KeyPath="yes" Source=".\Setup\CommonLib.dll" />
174
                <File Id="filF60CE67197837623CD57BE23CB07368E" KeyPath="yes" Source=".\Setup\Obfuscator_Output\CommonLib.dll" />
172 175
            </Component>
173 176
			<Component Id="cmp40B0E7C91C025AAEEF1F0DEC51A66549" Directory="INSTALLFOLDER" Guid="471A4642-5A10-49EB-A77A-CF5C821BA1F1" Win64='yes'>
174 177
                <File Id="filF60CE67197837613CD57BE23CB07368E" KeyPath="yes" Source=".\Setup\KCOMDataModel.dll" />
......
177 180
                <File Id="filF33A63AB801D7E78849A4330E53EBD7B" KeyPath="yes" Source=".\Setup\KCOMDataModel.dll.config" />
178 181
            </Component>
179 182
            <Component Id="cmpFE0047A5420B60BC9070B49ED04A3DF7" Directory="INSTALLFOLDER" Guid="92A19E1A-AD00-40EE-9194-1140097E3D0D" Win64='yes'>
180
                <File Id="filDB2B5EE0EF352042DCB528551CFF336A" KeyPath="yes" Source=".\Setup\MarkupToPDF.dll" />
183
                <File Id="filDB2B5EE0EF352042DCB528551CFF336A" KeyPath="yes" Source=".\Setup\Obfuscator_Output\MarkupToPDF.dll" />
181 184
            </Component>
182 185
            <Component Id="cmpBF387E9588F2B8473B629AAB925D2239" Directory="INSTALLFOLDER" Guid="D65A7FBC-F1DE-4031-97A3-B99E215B3C70" Win64='yes'>
183 186
                <File Id="fil3BBE868726AE8A4E2066B45DD738F0E3" KeyPath="yes" Source=".\Setup\MarkupToPDF.dll.config" />
......
267 270
                <File Id="fil9F98448866AC2226C494BD9810AF69EF" KeyPath="yes" Source=".\Setup\ToggleSwitch.dll" />
268 271
            </Component>
269 272
            <Component Id="cmp2B79D8B21752ECF6DF82930454768404" Directory="INSTALLFOLDER" Guid="4DB19C60-1622-41C3-B973-AB1D58693C41" Win64='yes'>
270
                <File Id="filC5BEFD2EAA8948BAA5384BF4A966EDA5" KeyPath="yes" Source=".\Setup\ZoomAndPan.dll" />
273
                <File Id="filC5BEFD2EAA8948BAA5384BF4A966EDA5" KeyPath="yes" Source=".\Setup\Obfuscator_Output\ZoomAndPan.dll" />
271 274
            </Component>
272 275
            <Component Id="cmp8FBF2BDB3D3B55D95D738AE16D776E91" Directory="dir242DC17B8DFC53C13CAF172FC08B730A" Guid="067FD2A4-9164-4898-949A-7EF1F27BD840" Win64='yes'>
273 276
                <File Id="filCE89910B4AD60B36118F14BA5A049859" KeyPath="yes" Source=".\Setup\de\Telerik.Windows.Controls.resources.dll" />
MARKUS_daelim.wxs
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
3 3
  <Product Id="*" Name="MARKUS" Language="1033" Version="1.0.0.0" Manufacturer="DOFTECH(C)" UpgradeCode="83FC35CA-6B7D-40C3-9D5F-E8F76097B25C">
4 4
    <Package Platform="x64" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
5 5

  
......
11 11
    
12 12
    <Feature Id="ProductFeature" Title="MARKUS" Level="1">
13 13
      <ComponentGroupRef Id="MARKUS" />
14
    </Feature>
14
    </Feature>    
15

  
16
    <CustomAction Id="NETFRAMEWORK_461"
17
      Directory="INSTALLFOLDER"
18
      ExeCommand="&quot;[INSTALLFOLDER]NDP461-KB3102438-Web.exe&quot; /norestart&quot; /passive&quot; /showrumi&quot; /ChainingPackage&quot; Contoso"
19
      Execute="commit"
20
      Return="asyncNoWait"  
21
      Impersonate="no"
22
    />
23

  
24
    <InstallExecuteSequence>
25
      <Custom Action='NETFRAMEWORK_461' After='InstallFiles' />
26
    </InstallExecuteSequence>
27

  
28
    <Property Id="WixShellExecTarget" Value="[INSTALLFOLDER]readme.html" />
29
    <CustomAction Id="LaunchBrowser" 
30
        BinaryKey="WixCA" 
31
        DllEntry="WixShellExec"
32
        Impersonate="yes" />
33
    <InstallExecuteSequence>
34
      <Custom Action='LaunchBrowser' After='InstallFinalize'>NOT Installed</Custom>
35
    </InstallExecuteSequence>
15 36
  </Product>
16 37

  
17 38
  <Fragment>
18 39
    <Directory Id="TARGETDIR" Name="SourceDir">
19 40
      <Directory Id="DesktopFolder" Name="Desktop">
20
        <Component Id="RegistryEntries" Guid="2bba9217-fcb9-4ff2-9c99-203db2ff98b4" Feature="ProductFeature">
21
          <RegistryValue Root="HKCR" Key="KCOM" Type="expandable" Name="URL Protocol" Value="" KeyPath="yes"/>	  
22
        </Component>
23
		<Component Id="RegistryEntriesCommand" Guid="e679ce5c-8a6f-48b2-836f-9ee96bdfd71f" Feature="ProductFeature">          
24
		  <RegistryValue Root="HKCR" Key="KCOM\shell\open\command" Type="string" Value="&quot;[INSTALLFOLDER]KCOM.exe&quot; &quot;%1&quot;" KeyPath="yes"/>
25
        </Component>
26
        <Component Id="DesktopShortcut" Guid="DF06024A-95FE-43E2-BDF2-7C686EAF391F" Feature="ProductFeature">
27
          <RegistryValue Root="HKCU" Key="Software\DOFTECH\MARKUS" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
28
          <Shortcut Id="DesktopShortcut"
29
                    Directory="DesktopFolder"
30
                    Name="MARKUS"
31
                    Description="PDF Markup Tool"
32
                    Target="[INSTALLFOLDER]KCOM.exe"
33
                    WorkingDirectory="INSTALLFOLDER" />
41
        <Component Id="DesktopShortcut" Guid="DF06024A-95FE-43E2-BDF2-7C686EAF391F" Feature="ProductFeature" Win64='yes'>
42
          <RegistryValue Root="HKCU" Key="Software\DOFTECH\MARKUS" Name="installed" Type="integer" Value="1" KeyPath="yes"/>          
34 43
          <RemoveFolder Id="DesktopFolder" On="uninstall"/>
35 44
        </Component>
36 45
      </Directory>
......
42 51
      </Directory>  
43 52
    </Directory>
44 53
    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
45
    <UIRef Id="WixUI_InstallDir"/>
54
    <UIRef Id="WixUI_InstallDir"/>   
46 55
    
47
    <UI>
48
      <Publish Dialog="ExitDialog" 
49
        Control="Finish" 
50
        Event="DoAction" 
51
        Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed
52
      </Publish>
53
    </UI>
54
    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch MARKUS" />
55
    <Property Id="WixShellExecTarget" Value="[INSTALLFOLDER]KCOM.exe" />
56
    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
57 56
  </Fragment>
58 57

  
59 58
  <Fragment>
59
    <DirectoryRef Id="TARGETDIR">
60
      <Component Id="cmp67889FD2219FCD1ECDA0BD9FE906CD7A" Guid="57D045D4-AFC0-4874-8BA9-A1E8B9C348F9" KeyPath="yes">
61
        <RegistryKey ForceCreateOnInstall="yes" Key="KCOM\shell\open" Root="HKCR" />
62
      </Component>
63
    </DirectoryRef>
64
  </Fragment>
65
  
66
  <Fragment>
67
    <DirectoryRef Id="TARGETDIR">
68
      <Component Id="cmpB2A195FD7387054E641ABB044E70AD31" Guid="CA81C92A-E2BA-4E01-B4A0-6B5E5E5A6C63" KeyPath="yes">
69
        <RegistryKey Key="KCOM\shell\open\command" Root="HKCR">
70
          <RegistryValue Value="&quot;C:\Program Files\DOFTECH\MARKUS\KCOM.exe&quot; &quot;%1&quot;" Type="string" />
71
        </RegistryKey>
72
      </Component>
73
    </DirectoryRef>
74
  </Fragment>
75
  
76
  <Fragment>
77
    <DirectoryRef Id="TARGETDIR">
78
      <Component Id="cmpCA3EA94464F79A1D590AD23EE3921964" Guid="171260E2-66FC-4088-9F1F-3FAEB29250CA" KeyPath="yes">
79
        <RegistryKey ForceCreateOnInstall="yes" Key="KCOM\shell" Root="HKCR" />
80
      </Component>
81
    </DirectoryRef>
82
  </Fragment>
83
  
84
  <Fragment>
85
    <DirectoryRef Id="TARGETDIR">
86
      <Component Id="cmpEB1634EB055BA192F2B44B8310392EAD" Guid="D8795ADA-D3EC-4F34-86C3-7D6BE54420EA" KeyPath="yes">
87
        <RegistryKey Key="KCOM" Root="HKCR">
88
          <RegistryValue Name="URL Protocol" Value="" Type="expandable" />
89
        </RegistryKey>
90
      </Component>
91
    </DirectoryRef>
92
  </Fragment>
93
    
94
  <Fragment>
60 95
    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
61 96
      <!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
62 97
      <!-- <Component Id="ProductComponent"> -->
......
75 110
            <Directory Id="dir2F3D431E0ED26930C4D37E679C7700A1" Name="nl" />
76 111
            <Directory Id="dir06249C254B8FEA6A37A7C6E4984EF433" Name="tessdata" />
77 112
            <Directory Id="dirE562A4656FE03253EA39D17E8127BA05" Name="tr" />
113
            <Directory Id="dirD38EDF1F361B4F099EBE0B9D8968D256" Name="x86" />
114
            <Directory Id="dirCFEC9E4F88644EEEA2E2C3669DAF0201" Name="x64" />
78 115
            <Directory Id="CommonAppDataFolder">
79 116
              <Directory Id="MyAppDataFolder" Name="MARKUS" >
80 117
                <Component Id="CreateMyAppDataFolder" Guid="697A5A1C-88DB-4D1B-8C7A-614B8A20CD44" Win64='yes'>
......
87 124
    <Fragment>
88 125
        <ComponentGroup Id="MARKUS">
89 126
            <ComponentRef Id="CreateMyAppDataFolder" />
127
			<ComponentRef Id="cmp67889FD2219FCD1ECDA0BD9FE906CD7A" />
128
			<ComponentRef Id="cmpB2A195FD7387054E641ABB044E70AD31" />
129
			<ComponentRef Id="cmpCA3EA94464F79A1D590AD23EE3921964" />
130
			<ComponentRef Id="cmpEB1634EB055BA192F2B44B8310392EAD" />
90 131
            <Component Id="cmpCC866C67D0ACDB0EBE26789908374F45" Directory="INSTALLFOLDER" Guid="F6CF8A7C-00AA-4B45-ADD4-F3DA249D8E64" Win64='yes'>
91 132
                <File Id="fil4A00EA3A4A830EE9C257BEC8A7AA9E1A" KeyPath="yes" Source=".\Setup\Bytescout.PDFExtractor.dll" />
92 133
            </Component>
......
98 139
            </Component>
99 140
            <Component Id="cmp6CF5CB56E3583D0EBD44D2BB10A62A27" Directory="INSTALLFOLDER" Guid="E0007A37-1DBD-49F4-B24B-D758C1209839" Win64='yes'>
100 141
                <File Id="filD3369B082D009ADB833B8DD9F589E45E" KeyPath="yes" Source=".\Setup\EntityFramework.xml" />
101
            </Component>
102
            <Component Id="cmpEFC8E4FEAD65C6F8432B4EB578EBEA5F" Directory="INSTALLFOLDER" Guid="DC38EC4A-2587-418E-BDB8-5031B21CFD8D" Win64='yes'>
103
                <File Id="filD04D74C9E941CA5FA1661C44EBD7C811" KeyPath="yes" Source=".\Setup\IFinalPDF.dll" />
104
            </Component>
142
            </Component>            
105 143
            <Component Id="cmpA415203DE9EF9D193E74C69FE81234D3" Directory="INSTALLFOLDER" Guid="D988FC9F-EEBB-4DA9-BDA2-46B926576509" Win64='yes'>
106 144
                <File Id="fil83609071B2AD8A06678837154646C3FB" KeyPath="yes" Source=".\Setup\IKCOM.dll" />
107 145
            </Component>
......
114 152
            <Component Id="cmp9DBCA795D932AB083234E0DAEF7CCCC5" Directory="INSTALLFOLDER" Guid="204BC3E0-DAC5-4467-B490-47964D9A7A25" Win64='yes'>
115 153
                <File Id="filDBD3D396B7182945BD91EEFC05F44BB9" KeyPath="yes" Source=".\Setup\KCOM.exe" />
116 154
            </Component>
155
            <Component Id="cmp8234C30B57CA4022B9BA108719FDF848" Directory="INSTALLFOLDER" Guid="3E2E60BB-3122-40F5-9A76-BDCF3F88D522" Win64='yes'>
156
                <File Id="fil275D1AADC07745DA9912353B6B5FC53F" KeyPath="yes" Source=".\readme.html" />
157
            </Component>
158
            <Component Id="cmp92F6718F031E4AD2810155492929EE55" Directory="INSTALLFOLDER" Guid="CC6B1FD1-0587-4C56-B2F0-437BFA51B673" Win64='yes'>
159
                <File Id="fil32BE8515827243CE87971B56055C66F1" KeyPath="yes" Source=".\packages\NDP461-KB3102438-Web.exe" />
160
            </Component>
117 161
            <Component Id="cmp008EC7C4B15BA79DEC806A9852526EF9" Directory="INSTALLFOLDER" Guid="B4829BEF-7376-4039-8E1D-8A46D257F4AF" Win64='yes'>
118 162
                <File Id="filD7A7D725F3C20E26B1A149EAABD9323C" KeyPath="yes" Source=".\Setup\KCOM.exe.config" />
119 163
            </Component>
......
127 171
                <File Id="fil9C8C2AB2B1E142458FBD1EB991F289E1" KeyPath="yes" Source=".\packages\potrace.exe" />
128 172
            </Component>
129 173
            <Component Id="cmp40B0E7C91C025AEEEF1F0DEC51A66549" Directory="INSTALLFOLDER" Guid="69d5a0ff-23db-4044-b874-1f8078446e24" Win64='yes'>
130
                <File Id="filF60CE67197837623CD57BE23CB07368E" KeyPath="yes" Source=".\Setup\CommonLib.dll" />
174
                <File Id="filF60CE67197837623CD57BE23CB07368E" KeyPath="yes" Source=".\Setup\Obfuscator_Output\CommonLib.dll" />
131 175
            </Component>
132 176
			<Component Id="cmp40B0E7C91C025AAEEF1F0DEC51A66549" Directory="INSTALLFOLDER" Guid="471A4642-5A10-49EB-A77A-CF5C821BA1F1" Win64='yes'>
133 177
                <File Id="filF60CE67197837613CD57BE23CB07368E" KeyPath="yes" Source=".\Setup\KCOMDataModel.dll" />
......
136 180
                <File Id="filF33A63AB801D7E78849A4330E53EBD7B" KeyPath="yes" Source=".\Setup\KCOMDataModel.dll.config" />
137 181
            </Component>
138 182
            <Component Id="cmpFE0047A5420B60BC9070B49ED04A3DF7" Directory="INSTALLFOLDER" Guid="92A19E1A-AD00-40EE-9194-1140097E3D0D" Win64='yes'>
139
                <File Id="filDB2B5EE0EF352042DCB528551CFF336A" KeyPath="yes" Source=".\Setup\MarkupToPDF.dll" />
183
                <File Id="filDB2B5EE0EF352042DCB528551CFF336A" KeyPath="yes" Source=".\Setup\Obfuscator_Output\MarkupToPDF.dll" />
140 184
            </Component>
141 185
            <Component Id="cmpBF387E9588F2B8473B629AAB925D2239" Directory="INSTALLFOLDER" Guid="D65A7FBC-F1DE-4031-97A3-B99E215B3C70" Win64='yes'>
142 186
                <File Id="fil3BBE868726AE8A4E2066B45DD738F0E3" KeyPath="yes" Source=".\Setup\MarkupToPDF.dll.config" />
......
226 270
                <File Id="fil9F98448866AC2226C494BD9810AF69EF" KeyPath="yes" Source=".\Setup\ToggleSwitch.dll" />
227 271
            </Component>
228 272
            <Component Id="cmp2B79D8B21752ECF6DF82930454768404" Directory="INSTALLFOLDER" Guid="4DB19C60-1622-41C3-B973-AB1D58693C41" Win64='yes'>
229
                <File Id="filC5BEFD2EAA8948BAA5384BF4A966EDA5" KeyPath="yes" Source=".\Setup\ZoomAndPan.dll" />
273
                <File Id="filC5BEFD2EAA8948BAA5384BF4A966EDA5" KeyPath="yes" Source=".\Setup\Obfuscator_Output\ZoomAndPan.dll" />
230 274
            </Component>
231 275
            <Component Id="cmp8FBF2BDB3D3B55D95D738AE16D776E91" Directory="dir242DC17B8DFC53C13CAF172FC08B730A" Guid="067FD2A4-9164-4898-949A-7EF1F27BD840" Win64='yes'>
232 276
                <File Id="filCE89910B4AD60B36118F14BA5A049859" KeyPath="yes" Source=".\Setup\de\Telerik.Windows.Controls.resources.dll" />
......
260 304
            </Component>
261 305
            <Component Id="cmpE2CD3D3C1E99C37D8F73459EBEFD3BA4" Directory="dir06249C254B8FEA6A37A7C6E4984EF433" Guid="25B83C3D-915F-40D3-98E9-50F395072392" Win64='yes'>
262 306
                <File Id="filFA0821084DD0DB0573FAFB7DB367CDF2" KeyPath="yes" Source=".\Setup\tessdata\spa.traineddata" />
263
            </Component>
264
            <Component Id="cmpF29925B8A38BDFA82A14B03E8E014607" Directory="INSTALLFOLDER" Guid="ACE2792D-E70E-4C4C-8637-8229B28CCFC6" Win64='yes'>
265
                <File Id="filB5FCD36D58E7D8AEF760144912EFA5B4" KeyPath="yes" Source=".\Setup\MarkUsODAConvert.dll" />
266
            </Component>
267
            <Component Id="cmp9E1CB36568BDD902925888C461FDF78C" Directory="INSTALLFOLDER" Guid="93FB011F-E405-413B-8991-FCC3E84D8BBD" Win64='yes'>
268
                <File Id="fil09A53EFF8D63FC0DEB9DA52CD340A5C1" KeyPath="yes" Source=".\Setup\SCENEOE_19.12_11.tx" />
269
            </Component>
307
            </Component>            
270 308
            <Component Id="cmp4AAAF23576449894C66F0CD0A34DD81E" Directory="INSTALLFOLDER" Guid="0D279D98-F271-4E6A-BA5E-86619CAEFE4D" Win64='yes'>
271 309
                <File Id="filBF3009E800CE3B36AC8E63585FE2117F" KeyPath="yes" Source=".\Setup\Svg2Xaml.dll" />
272 310
            </Component>
273 311
            <Component Id="cmp096B4B06A37EF2531C9A1122D763E919" Directory="INSTALLFOLDER" Guid="02814047-5201-4CD3-A63B-43E4051BD1F6" Win64='yes'>
274 312
                <File Id="fil56681951F589A14F0B808D7D4F936C29" KeyPath="yes" Source=".\Setup\Svg2Xaml.xml" />
275
            </Component>
276
            <Component Id="cmp1B652B5A2998B2BEDA530CC2119DB466" Directory="INSTALLFOLDER" Guid="3FD21C03-6A49-4D5E-9008-9DF9190AA056" Win64='yes'>
277
                <File Id="fil6BAAC7266DE1037839FFF283BA41D2A3" KeyPath="yes" Source=".\Setup\ACCAMERA_19.12_11.tx" />
278
            </Component>
279
            <Component Id="cmpFA758D6AA741C5339D94561940340555" Directory="INSTALLFOLDER" Guid="81578F70-9CBD-473E-8E9B-DFBF54220B13" Win64='yes'>
280
                <File Id="fil2AD3AAD49398F56302216A8855FA101F" KeyPath="yes" Source=".\Setup\AcMPolygonObj15_19.12_11.tx" />
281
            </Component>
282
            <Component Id="cmp6753F9081CA3F6269616AE5CB4981129" Directory="INSTALLFOLDER" Guid="13231BB2-091C-44D1-8B0A-E9F73292B1D4" Win64='yes'>
283
                <File Id="fil4EDBBC93B9C199615BEA52341BE2F1E8" KeyPath="yes" Source=".\Setup\ATEXT_19.12_11.tx" />
284
            </Component>
285
            <Component Id="cmpA0794F399D9F1CF2BCCF979FF5D774C5" Directory="INSTALLFOLDER" Guid="F54E43DB-F847-4073-A096-2BB7CE0F0B56" Win64='yes'>
286
                <File Id="fil26383127FA1BB7D518F0E85231E514F7" KeyPath="yes" Source=".\Setup\TD_Alloc_19.12_11.dll" />
287
            </Component>
288
            <Component Id="cmpFC28E9C319166A0B377E88B35C021EAA" Directory="INSTALLFOLDER" Guid="F71A79DE-4817-4A0A-8BC2-F3EFF7C32129" Win64='yes'>
289
                <File Id="filB31B6B4C9EF44AAA887E22483BFD3BEF" KeyPath="yes" Source=".\Setup\TD_Ave_19.12_11.tx" />
290
            </Component>
291
            <Component Id="cmpE34DA5709AE30781429D5A0F1B631EF0" Directory="INSTALLFOLDER" Guid="E606D47E-FB0D-46FC-AFF4-1F71BB16CC7A" Win64='yes'>
292
                <File Id="fil40954765A9B8F7967C407F0C42CD3F4B" KeyPath="yes" Source=".\Setup\TD_DbCore_19.12_11.dll" />
293
            </Component>
294
            <Component Id="cmp70678B711AD4DAF65D44C94DC7F91CA2" Directory="INSTALLFOLDER" Guid="A0A19CFE-651A-4739-81F8-036A45795A60" Win64='yes'>
295
                <File Id="filE9B99A256540AC80D6D0BB5480A9A027" KeyPath="yes" Source=".\Setup\TD_DbEntities_19.12_11.tx" />
296
            </Component>
297
            <Component Id="cmp314DF1A57D4C1BADBB2CD240212294E6" Directory="INSTALLFOLDER" Guid="BC4B9410-25D7-4A49-B2AA-488D23A37DF9" Win64='yes'>
298
                <File Id="fil0D48599EEE81507AA5DD44D7C52B9425" KeyPath="yes" Source=".\Setup\TD_DbIO_19.12_11.tx" />
299
            </Component>
300
            <Component Id="cmp092E942D50A757525F35A78E0099A11C" Directory="INSTALLFOLDER" Guid="984384A5-1311-4104-88CF-F3E7C54BCAEA" Win64='yes'>
301
                <File Id="fil79113B41F3A96E18029D24D489E6FB5C" KeyPath="yes" Source=".\Setup\TD_DbRoot_19.12_11.dll" />
302
            </Component>
303
            <Component Id="cmp64A5BAA53242932137C2C6B315893573" Directory="INSTALLFOLDER" Guid="6894D616-B8B3-49FC-B288-54E532D8A139" Win64='yes'>
304
                <File Id="fil1D755996AC0F21764256BC1AAB9AC14D" KeyPath="yes" Source=".\Setup\TD_Db_19.12_11.dll" />
305
            </Component>
306
            <Component Id="cmp47EF1E5AB03F622F43642239CA22A52C" Directory="INSTALLFOLDER" Guid="1C48F15E-2C52-4FA3-9D7A-76D5278D9DD8" Win64='yes'>
307
                <File Id="fil3375818E6B8CBFBC756465A0EFEE2858" KeyPath="yes" Source=".\Setup\TD_DynBlocks_19.12_11.tx" />
308
            </Component>
309
            <Component Id="cmpCD306593941BDDFBED4B6AE86B2AB313" Directory="INSTALLFOLDER" Guid="37B4550C-7429-4D69-9944-7AD810AE82F7" Win64='yes'>
310
                <File Id="filAB35915C590692BC310ABC9E1A71F04C" KeyPath="yes" Source=".\Setup\TD_Ge_19.12_11.dll" />
311
            </Component>
312
            <Component Id="cmp5E454296BB351F19E84F7652B8BA6D45" Directory="INSTALLFOLDER" Guid="F158CF7B-B8BA-4EFA-B78C-0ABB472147AD" Win64='yes'>
313
                <File Id="filF05A4B658EFC8F2A83883EACFE965A06" KeyPath="yes" Source=".\Setup\TD_Gi_19.12_11.dll" />
314
            </Component>
315
            <Component Id="cmp84FE100AB4974D6D1977EB546E25F082" Directory="INSTALLFOLDER" Guid="430FAD7C-9AED-44DF-AB67-23F30896DEC8" Win64='yes'>
316
                <File Id="fil14DC20C05871DCCB4912C393EAEBA34E" KeyPath="yes" Source=".\Setup\TD_Gs_19.12_11.dll" />
317
            </Component>
318
            <Component Id="cmp69A2BB79A59DC7F6AA6C9A80CBD0F6D2" Directory="INSTALLFOLDER" Guid="623B0B63-C3D2-41B7-928D-E4A934107BD7" Win64='yes'>
319
                <File Id="filEA3DFBC1A6E2AD0F4D8C125A353B28D2" KeyPath="yes" Source=".\Setup\TD_Mgd_19.12_11.dll" />
320
            </Component>
321
            <Component Id="cmpFCF3DA257725851D241AAE865DB8805D" Directory="INSTALLFOLDER" Guid="10F23FDA-95E3-4406-9661-09667D00A998" Win64='yes'>
322
                <File Id="filB7CF26770467BF8A5B4C83C617E89F1D" KeyPath="yes" Source=".\Setup\TD_Root_19.12_11.dll" />
323
            </Component>
324
            <Component Id="cmpD7100D53F3B67289ABA73D6EBAA3EBD0" Directory="INSTALLFOLDER" Guid="9028AF26-F374-48F6-A87F-643609AA51FF" Win64='yes'>
325
                <File Id="filB21D180D9F7E35E2B7DE62E3F570D0A8" KeyPath="yes" Source=".\Setup\TD_Sm_19.12_11.tx" />
326
            </Component>
327
            <Component Id="cmp67AEC051FCCB5693B6609D24AF63CE1A" Directory="INSTALLFOLDER" Guid="DA88618E-B1AD-411D-B833-DDBB401C76BD" Win64='yes'>
328
                <File Id="fil0A8F14C33F3B74BB962FF19EBC0EBC55" KeyPath="yes" Source=".\Setup\TD_SpatialIndex_19.12_11.dll" />
329
            </Component>
330
            <Component Id="cmpAD42C6B2A8CAC2ED0D5FDBAA0E4107E6" Directory="INSTALLFOLDER" Guid="955950D0-69E7-4267-95A7-63EAA376FA3F" Win64='yes'>
331
                <File Id="fil19C9C0ACA5097C6E577768E9EE299417" KeyPath="yes" Source=".\Setup\TD_SwigCoreMgd.dll" />
332
            </Component>
333
            <Component Id="cmpC73CFFAAD30A68C03E756C0798B2F465" Directory="INSTALLFOLDER" Guid="530475E2-A739-438D-8979-ECCAD0DF69E2" Win64='yes'>
334
                <File Id="fil5121BAE9A4CAB5F88A699C535A2E6978" KeyPath="yes" Source=".\Setup\TD_SwigDbMgd.dll" />
335
            </Component>
336
            <Component Id="cmp1740A3550A865AACFD9E0F1551A7B3FF" Directory="INSTALLFOLDER" Guid="928E5BBF-790A-41CE-8373-6CA1BCABAD1B" Win64='yes'>
337
                <File Id="filC0040D2E5073284B85874B040079DC1C" KeyPath="yes" Source=".\Setup\TG_SwigDbMgd.dll" />
338
            </Component>
313
            </Component>            
339 314
            <Component Id="cmpF5FBD3938B844D06B2BB93F3C8E9735D" Directory="INSTALLFOLDER" Guid="972720D3-9F4E-4115-A867-D428DFFE9C00" Win64='yes'>
340 315
                <File Id="fil05D02B4AA1454B0BAAB715EC9DC4EA20" KeyPath="yes" Source=".\Setup\log4net.dll" />
341 316
            </Component>
......
345 320
            <Component Id="cmpF187B9086CF14C36BDBD3C0DE1C638C3" Directory="INSTALLFOLDER" Guid="89E15C73-8F9B-4308-83EE-B35766DB54D2" Win64='yes'>
346 321
                <File Id="filE16E5C37CA1646DB833466207DAA438F" KeyPath="yes" Source=".\Setup\System.Data.SQLite.dll" />
347 322
            </Component>
348
			<Component Id="cmpF187B9086CF14C36BDBA3C0DE1C638C3" Directory="INSTALLFOLDER" Guid="917bcf9e-afe7-40cc-b648-998a805d43eb" Win64='yes'>
323
            <Component Id="cmpF187B9086CF14C36BDBA3C0DE1C638C3" Directory="INSTALLFOLDER" Guid="917bcf9e-afe7-40cc-b648-998a805d43eb" Win64='yes'>
349 324
                <File Id="filE16E5C37CA1646DB833466207DAA138F" KeyPath="yes" Source=".\Setup\System.Data.SQLite.dll.config" />
350 325
            </Component>
351 326
            <Component Id="cmp23D2D49DF6C44A029D1A2AB241AC5A70" Directory="INSTALLFOLDER" Guid="9879429A-61B9-4EF5-9BB0-2C71A34543AF" Win64='yes'>
......
354 329
            <Component Id="cmp068D509157D54D23A542123CE71B5374" Directory="INSTALLFOLDER" Guid="1F5C3864-2808-4315-A408-1E9FDA733621" Win64='yes'>
355 330
                <File Id="fil89495469897C42868399E2A1D1CE119F" KeyPath="yes" Source=".\Setup\System.Data.SQLite.Linq.dll" />
356 331
            </Component>
357
			<Component Id="cmp19F6DF8A2ABC78D782D76F1EEC9A5800" Directory="INSTALLFOLDER" Guid="C1521B0F-E4EC-4399-89C6-3346D4CA2926" Win64='yes'>
358
				<File Id="filC7EA62E1AC64247AFBE682E8631402B8" KeyPath="yes" Source=".\Setup\x64\SQLite.Interop.dll" />
359
			</Component>
360
			<Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Directory="INSTALLFOLDER" Guid="12C908D5-3BC8-4B61-BEEE-60522A7D6BD9" Win64='yes'>
361
				<File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source=".\Setup\x86\SQLite.Interop.dll" />
362
			</Component>
332
            <Component Id="cmp19F6DF8A2ABC78D782D76F1EEC9A5800" Directory="dirCFEC9E4F88644EEEA2E2C3669DAF0201" Guid="C1521B0F-E4EC-4399-89C6-3346D4CA2926" Win64='yes'>
333
              <File Id="filC7EA62E1AC64247AFBE682E8631402B8" KeyPath="yes" Source=".\Setup\x64\SQLite.Interop.dll" />
334
            </Component>
335
            <Component Id="cmp77484AF39EF2F8BD64E876C33A1C3E49" Directory="dirD38EDF1F361B4F099EBE0B9D8968D256" Guid="12C908D5-3BC8-4B61-BEEE-60522A7D6BD9" Win64='yes'>
336
              <File Id="filD2ACACD0EBAF09B1953E9C3793C13C69" KeyPath="yes" Source=".\Setup\x86\SQLite.Interop.dll" />
337
            </Component>
363 338
            <Component Id="cmpA999CE51CD7441D1ABF8967B4D2C7A9A" Directory="INSTALLFOLDER" Guid="1B9A77C2-1A1C-41A6-8875-A5393AE5AC7A" Win64='yes'>
364 339
                <File Id="filCB063063508C47CFBA76F059EFC71E72" KeyPath="yes" Source=".\Setup\System.Reactive.dll" />
365 340
            </Component>
366 341
            <Component Id="cmpA7D3E561E3C645CAA87BCDA2052CE853" Directory="INSTALLFOLDER" Guid="2DB66F4F-9E7C-4050-BD2A-D9B825C660C0" Win64='yes'>
367 342
                <File Id="filCB33C867CDE342B6B09DB17464950739" KeyPath="yes" Source=".\Setup\System.Windows.Interactivity.dll" />
368
            </Component>
369
            <Component Id="cmpAE9471B5C781B66CC26AA56090C503DB" Directory="INSTALLFOLDER" Guid="429E6E58-BC2A-4FA1-B602-31F58634612F" Win64='yes'>
370
                <File Id="filD94E7910168DF4A3CA03B9B5576C69A6" KeyPath="yes" Source=".\packages\ODA\FileDlgExt_19.12_11.dll" />
371
            </Component>
372
            <Component Id="cmp142D251F15375220683DD92886C25F05" Directory="INSTALLFOLDER" Guid="5C2D17F7-EFE9-4101-ACAB-FE340F690142" Win64='yes'>
373
                <File Id="fil79B9E2153A53858582EA30E173F35CF0" KeyPath="yes" Source=".\packages\ODA\GeneratedSaxParser.dll" />
374
            </Component>
375
            <Component Id="cmpBEF5B49E4DB08848DACE43E17CCB0D7C" Directory="INSTALLFOLDER" Guid="F3AB5132-BA3D-4E7F-A412-937585B869AF" Win64='yes'>
376
                <File Id="fil026B16F6614CF99C2EBC310160004E20" KeyPath="yes" Source=".\packages\ODA\libBuffer.dll" />
377
            </Component>
378
            <Component Id="cmp3922099AEB6CB0085029FAF59192F6F1" Directory="INSTALLFOLDER" Guid="AAFC8A8C-944C-4BA4-871C-E64FC15B13BA" Win64='yes'>
379
                <File Id="filAEF324DFC4D3E347A76D9DE807948A35" KeyPath="yes" Source=".\packages\ODA\pcre.dll" />
380
            </Component>
381
            <Component Id="cmp239FA0BDEE78F6742B72244E8D0666BE" Directory="INSTALLFOLDER" Guid="7484CFEE-EC77-49D1-AD70-143CA7AB674F" Win64='yes'>
382
                <File Id="fil1B4CC447D6A7226333D5525EABA9A78A" KeyPath="yes" Source=".\packages\ODA\PSToolkit_19.12_11.dll" />
383
            </Component>
384
            <Component Id="cmp13B42A8D2727B60AFB5658DF4A93F26A" Directory="INSTALLFOLDER" Guid="664B2873-3B03-4DCC-BA20-11C637795BF7" Win64='yes'>
385
                <File Id="filC3338A24B0A1C5A74082BD4CC2659B21" KeyPath="yes" Source=".\packages\ODA\TD.tsbf" />
386
            </Component>
387
            <Component Id="cmp7FA7D42DDDD429E40E896AB4AC9BF462" Directory="INSTALLFOLDER" Guid="1BE22284-C017-4795-A62C-F0A55AB60195" Win64='yes'>
388
                <File Id="fil813DFBC7FB128DD181AF5E151E8385DA" KeyPath="yes" Source=".\packages\ODA\TD_AcisBuilder_19.12_11.dll" />
389
            </Component>
390
            <Component Id="cmp3EA93E133EA362B647F0AC3A7A4C7151" Directory="INSTALLFOLDER" Guid="4E62AB18-DE74-432D-93A5-6D53FBF753CE" Win64='yes'>
391
                <File Id="fil7772FB8061121EDD928C4D194917D430" KeyPath="yes" Source=".\packages\ODA\TD_BrepBuilder_19.12_11.dll" />
392
            </Component>
393
            <Component Id="cmp13B4F8013FDCCA76AF430CE05B9E793C" Directory="INSTALLFOLDER" Guid="A4A18ABF-6C04-4CB1-862D-BBD63B8BF726" Win64='yes'>
394
                <File Id="filFD9D040AC76AB15AE6180E0CA35AE3C7" KeyPath="yes" Source=".\packages\ODA\TD_BrepRenderer_19.12_11.dll" />
395
            </Component>
396
            <Component Id="cmp4437755E16B6472FF2C151468103DE7B" Directory="INSTALLFOLDER" Guid="392179E7-E3FC-4449-96EF-DE4C4DB404E5" Win64='yes'>
397
                <File Id="fil54F9160135496F64A1AD1C67FD1C5AC2" KeyPath="yes" Source=".\packages\ODA\TD_Br_19.12_11.dll" />
398
            </Component>
399
            <Component Id="cmpD767456B1C15F19050A57C8376A7F4D1" Directory="INSTALLFOLDER" Guid="DED5FAD9-F638-4E11-9E2C-75907CB4C7D5" Win64='yes'>
400
                <File Id="filAF68F1590A9D50B91C7883BEABE13A82" KeyPath="yes" Source=".\packages\ODA\WinBitmap_19.12_11.txv" />
401
            </Component>
402
            <Component Id="cmp0B6C3A4C1158028616488916948A684F" Directory="INSTALLFOLDER" Guid="F68AB556-5A16-4973-A2D1-FF56B36DC41A" Win64='yes'>
403
                <File Id="filD089D3E335DB90D5A1F95EC53314E3C0" KeyPath="yes" Source=".\packages\ODA\WinComposite_19.12_11.txv" />
404
            </Component>
405
            <Component Id="cmpAB8E002911D4FCDD5E5683BE6EBE750B" Directory="INSTALLFOLDER" Guid="3A5C91FD-8C20-44DC-90D8-6EF066F6114F" Win64='yes'>
406
                <File Id="fil06ECBA90FAD21D384552E195E1C13F9C" KeyPath="yes" Source=".\packages\ODA\WinDirectX_19.12_11.txv" />
407
            </Component>
408
            <Component Id="cmpE16DB77ECA036DBAFE4BCD65510F8699" Directory="INSTALLFOLDER" Guid="84AB140A-DC24-440C-AF1D-4695EF65A4C4" Win64='yes'>
409
                <File Id="fil5870380D8A7FC158DCC9F53210AEDA83" KeyPath="yes" Source=".\packages\ODA\WinGDI_19.12_11.txv" />
410
            </Component>
411
            <Component Id="cmp361D3A0E4928A751E238C87EAA747B67" Directory="INSTALLFOLDER" Guid="7EB6AE2A-67CD-4B93-9D86-48E54E3155BB" Win64='yes'>
412
                <File Id="fil439C78662F7E5FFE035DDC5CFAB64236" KeyPath="yes" Source=".\packages\ODA\WinGLES2_19.12_11.txv" />
413
            </Component>
414
            <Component Id="cmpE0C1C69DFA1F3A131268580661EE3C12" Directory="INSTALLFOLDER" Guid="4C711F15-416F-40B9-984C-40362F9908FD" Win64='yes'>
415
                <File Id="fil61F5DE6E846ADFA088BF33DC93443925" KeyPath="yes" Source=".\packages\ODA\WinOpenGL_19.12_11.txv" />
416
            </Component>
417
            <Component Id="cmp506DD79C40281B78CE74CDBEB1E68643" Directory="INSTALLFOLDER" Guid="714523A6-E518-4939-BFBA-5428CC4451E8" Win64='yes'>
418
                <File Id="filB0B9F8BC36B407107C0590C54ABAC30E" KeyPath="yes" Source=".\packages\ODA\XmlGLES2_19.12_11.txv" />
419
            </Component>
420
            <Component Id="cmpC48D890621940EE9A20E147AC932F977" Directory="INSTALLFOLDER" Guid="A9C7BFA3-1D7E-41D8-9DDE-EE0BA7ED3E23" Win64='yes'>
421
                <File Id="filBE520F5FFC9DAB23F69A3471C1131B0E" KeyPath="yes" Source=".\packages\ODA\AcGeolocationObj_19.12_11.tx" />
422
            </Component>
423
            <Component Id="cmpA9452E6F34B6EB3920CC37EE0F404993" Directory="INSTALLFOLDER" Guid="81383CBD-F493-4D40-B178-414F1B0BF0FA" Win64='yes'>
424
                <File Id="filC2DAE708CA9C14DEA4FEEAABE2305427" KeyPath="yes" Source=".\packages\ODA\AcIdViewObj_19.12_11.tx" />
425
            </Component>
426
            <Component Id="cmp655269E02F061288039151543E10B7DF" Directory="INSTALLFOLDER" Guid="01E28111-8E4B-4AC2-8677-4758175C7E63" Win64='yes'>
427
                <File Id="fil52ACD8C0018630228AE77BDCC8262C85" KeyPath="yes" Source=".\packages\ODA\AcModelDocObj_19.12_11.tx" />
428
            </Component>
429
            <Component Id="cmp46AC21FC4A425A4F7B8CFC0036EDDF85" Directory="INSTALLFOLDER" Guid="48AB762E-5062-44BF-893D-B530E382E09A" Win64='yes'>
430
                <File Id="fil338B5868019A67BE70C80D9350E48E2F" KeyPath="yes" Source=".\packages\ODA\AECIIB_19.12_11.tx" />
431
            </Component>
432
            <Component Id="cmpA3107E66555265D0C3CAD355675A153E" Directory="INSTALLFOLDER" Guid="17906BF2-E83F-40F9-A851-6EE1637C6184" Win64='yes'>
433
                <File Id="fil2E4A65887BBAAA9CD8B3A58EB076F175" KeyPath="yes" Source=".\packages\ODA\AsdkSmileyDb_19.12_11.tx" />
434
            </Component>
435
            <Component Id="cmpED719E107B2CFE4B5D061A9D50F9DF71" Directory="INSTALLFOLDER" Guid="1B78A282-80D2-4DA8-9757-8D54B8012066" Win64='yes'>
436
                <File Id="fil07B84E0AA765CADD5144709002BC6842" KeyPath="yes" Source=".\packages\ODA\AutoSurfServices_19.12_11.tx" />
437
            </Component>
438
            <Component Id="cmpFF11BBB2F89D1A857093BE66EBEB6469" Directory="INSTALLFOLDER" Guid="5E73A0BD-108C-4600-B279-CA4963324B4D" Win64='yes'>
439
                <File Id="filE544397BF6D6FC25D97478E743FF2126" KeyPath="yes" Source=".\packages\ODA\C3dModelerCommands_19.12_11.tx" />
440
            </Component>
441
            <Component Id="cmp54AB4B03E0DD0A1B13FF41039F084488" Directory="INSTALLFOLDER" Guid="C8509CDB-529C-44FC-94AE-623907705D0D" Win64='yes'>
442
                <File Id="filFBEB5F65DB29C17E5CE1A3FEABA7D0C4" KeyPath="yes" Source=".\packages\ODA\C3dModeler_19.12_11.tx" />
443
            </Component>
444
            <Component Id="cmpB192207CB70FF1265EF3B8D009B05080" Directory="INSTALLFOLDER" Guid="DE15C679-B80D-48EE-9D91-1EBD6A2DB665" Win64='yes'>
445
                <File Id="fil95A0E271FF733F894C75090C1415772C" KeyPath="yes" Source=".\packages\ODA\DbCommands_19.12_11.tx" />
446
            </Component>
447
            <Component Id="cmpABB420AAD9EF71B7886044D35126792A" Directory="INSTALLFOLDER" Guid="52B05863-40FB-41C4-BAF9-0B6D1F3CC384" Win64='yes'>
448
                <File Id="fil0DB9F6EF3D1F0B65053756BD910F1E16" KeyPath="yes" Source=".\packages\ODA\DbConstraints_19.12_11.tx" />
449
            </Component>
450
            <Component Id="cmp160393FD976FE1B9CC1F33295E41EC38" Directory="INSTALLFOLDER" Guid="F65F295D-95ED-4DF2-9045-1736C163E807" Win64='yes'>
451
                <File Id="fil574C29631CAC7342D34A011127FF9216" KeyPath="yes" Source=".\packages\ODA\DbCryptModule_19.12_11.tx" />
452
            </Component>
453
            <Component Id="cmp728CF826EB7C34E8E37F3B657F618E60" Directory="INSTALLFOLDER" Guid="8D8D3C20-6008-4AC4-BFD1-8B4BAC4AB974" Win64='yes'>
454
                <File Id="filBFA1384142D87A261C061843F943EB52" KeyPath="yes" Source=".\packages\ODA\DbRuntimeIO_19.12_11.tx" />
455
            </Component>
456
            <Component Id="cmp7493FE857C526F28FC9CA565FF6214A7" Directory="INSTALLFOLDER" Guid="74615CB1-7E4B-4498-862E-7918A9D3FC8B" Win64='yes'>
457
                <File Id="fil0968FB615318FD2B02F0D588CE06F378" KeyPath="yes" Source=".\packages\ODA\DgPlotStyleServices_19.12_11.tx" />
458
            </Component>
459
            <Component Id="cmp881B27EAC9E2CF4B0B19882B09415709" Directory="INSTALLFOLDER" Guid="68DAE34B-4183-4EBB-A797-9F0D4258AE84" Win64='yes'>
460
                <File Id="filCD316AC1CFC7EB0143113FD2919308CF" KeyPath="yes" Source=".\packages\ODA\ExCommands_19.12_11.tx" />
461
            </Component>
462
            <Component Id="cmp506DA476FCCAA929358EED3253AF81E8" Directory="INSTALLFOLDER" Guid="FBBDC5D9-2D37-4323-9816-5E8B8D02B28A" Win64='yes'>
463
                <File Id="filB4F1BB96A2AC26B804AF76F4E04608AF" KeyPath="yes" Source=".\packages\ODA\ExCustObjs_19.12_11.tx" />
464
            </Component>
465
            <Component Id="cmp81D1D201E9F3A39665724DB2F097B44B" Directory="INSTALLFOLDER" Guid="CF6EA2F3-0B81-4485-A10E-FC462273A303" Win64='yes'>
466
                <File Id="filEA42CE6CBF70EC71BDD9DCA8698C75C4" KeyPath="yes" Source=".\packages\ODA\ExDeepCloning_19.12_11.tx" />
467
            </Component>
468
            <Component Id="cmp9A29728AD1A13B097DB1DB6590EA33C0" Directory="INSTALLFOLDER" Guid="DC403A95-DB7D-4834-ACF9-73888DBBFD58" Win64='yes'>
469
                <File Id="fil2768539B012B3F125902983B17EFDE76" KeyPath="yes" Source=".\packages\ODA\ExDimAssoc_19.12_11.tx" />
470
            </Component>
471
            <Component Id="cmpD4D4A5E0E0D85BBA78F21BA84F68EEC5" Directory="INSTALLFOLDER" Guid="B6735805-9AE1-4073-A6CB-A20E908A4CDD" Win64='yes'>
472
                <File Id="fil17BFDF92D2FA71159D7C0D9A9CAE5757" KeyPath="yes" Source=".\packages\ODA\ExDynamicBlocks_19.12_11.tx" />
473
            </Component>
474
            <Component Id="cmp39D1EBA1265C9669F054176CD36ABE8E" Directory="INSTALLFOLDER" Guid="ED273261-E6E7-4955-87B0-8DB4455BB095" Win64='yes'>
475
                <File Id="fil3429943D13C4A2FC52620E7CAD9EEEC5" KeyPath="yes" Source=".\packages\ODA\ExEntityIntersection_19.12_11.tx" />
476
            </Component>
477
            <Component Id="cmp38520AED5770CD25AD22CB116ECD5346" Directory="INSTALLFOLDER" Guid="5625BD16-E7C0-497E-80E4-3E17FE401D21" Win64='yes'>
478
                <File Id="fil7B87E564B22DC8CD46D68E61E50211DE" KeyPath="yes" Source=".\packages\ODA\ExEvalWatchers_19.12_11.tx" />
479
            </Component>
480
            <Component Id="cmp855E2EABC85B70060EE7CB1E6E9520DC" Directory="INSTALLFOLDER" Guid="4917259D-5DC6-4BA3-AF1F-8C1E7E669BD9" Win64='yes'>
481
                <File Id="fil097C294A05AEA9C08BC9AA03AA07F47D" KeyPath="yes" Source=".\packages\ODA\ExFieldEvaluator_19.12_11.tx" />
482
            </Component>
483
            <Component Id="cmpD89A6B2B2E7B99ACC2EC84C145F37C99" Directory="INSTALLFOLDER" Guid="FC2EFBE0-C7DB-431D-B15A-C851D6CBBD63" Win64='yes'>
484
                <File Id="fil84FB8DF849483252F75ED1A435D53866" KeyPath="yes" Source=".\packages\ODA\ExTimeProviderWin_19.12_11.tx" />
485
            </Component>
486
            <Component Id="cmp9DEE92BD69E420B376A49F61A08E6778" Directory="INSTALLFOLDER" Guid="559DBB4C-E028-46AA-89EB-78254AB76DAE" Win64='yes'>
487
                <File Id="fil803D78AECAADE336E9803A064D689BE1" KeyPath="yes" Source=".\packages\ODA\GeoCommands_19.12_11.tx" />
488
            </Component>
489
            <Component Id="cmp3449DFB8F2BEF1209D27B898B23DDE23" Directory="INSTALLFOLDER" Guid="81B15A12-E3AE-4E91-8083-403204BDD451" Win64='yes'>
490
                <File Id="fil4E7187850D4ACE3867AE4774E76A9BEA" KeyPath="yes" Source=".\packages\ODA\GripPoints_19.12_11.tx" />
491
            </Component>
492
            <Component Id="cmpA9C90403BF25C9FF6528F73C41B4539E" Directory="INSTALLFOLDER" Guid="E78ECA2E-A433-4F59-80F9-76A43C05277B" Win64='yes'>
493
                <File Id="filD24FE94F6A02008C565A5AB627C60516" KeyPath="yes" Source=".\packages\ODA\Interop.OdaX.dll" />
494
            </Component>
495
            <Component Id="cmp9529945F5EDCC800418663A7E266FBCD" Directory="INSTALLFOLDER" Guid="D2AAEE94-C5DD-493E-A6F6-D492BA1A7522" Win64='yes'>
496
                <File Id="fil326F91EE442FD5E288532E5019213B0D" KeyPath="yes" Source=".\packages\ODA\ISM_19.12_11.tx" />
497
            </Component>
498
            <Component Id="cmp5F864159153CD780F111CBC0478A46D4" Directory="INSTALLFOLDER" Guid="04BA541F-A904-4743-B3FF-D8565B83D148" Win64='yes'>
499
                <File Id="filB416F1FD12819C68E2C5F2D7D1BD11F1" KeyPath="yes" Source=".\packages\ODA\ModelerCommands_19.12_11.tx" />
500
            </Component>
501
            <Component Id="cmp013470CC19C950E3F6FD88B8C68B8AB6" Directory="INSTALLFOLDER" Guid="6A9F1BB8-2F6B-4728-8424-CDC5A87B61D6" Win64='yes'>
502
                <File Id="fil0403EFB51DD51CDECCEA211F57AEB73B" KeyPath="yes" Source=".\packages\ODA\ModelerGeometry_19.12_11.tx" />
503
            </Component>
504
            <Component Id="cmp71393F977DB77CCD9A741282796C1211" Directory="INSTALLFOLDER" Guid="330158B1-645A-4303-B2BB-7CB211C2652C" Win64='yes'>
505
                <File Id="fil245D78B80FA360140988B925BFCB505A" KeyPath="yes" Source=".\packages\ODA\OBJToolkit_19.12_11.tx" />
506
            </Component>
507
            <Component Id="cmpFE8A628F48D8262FC645FE0B629D11B3" Directory="INSTALLFOLDER" Guid="35950091-5186-424A-AA99-BA6E9A7D1E4B" Win64='yes'>
508
                <File Id="fil8E73E805739A29D0FE712F053BCE1982" KeyPath="yes" Source=".\packages\ODA\OdCurveFunctions_19.12_11.tx" />
509
            </Component>
510
            <Component Id="cmpEC4F232B4539F199A5B0DC693FDEB7DF" Directory="INSTALLFOLDER" Guid="AF923925-9BF9-4239-9C81-E9C38A782AF6" Win64='yes'>
511
                <File Id="fil084382DBF0A5441BE668268EEF4F8C81" KeyPath="yes" Source=".\packages\ODA\OdDbGeoMapPE_19.12_11.tx" />
512
            </Component>
513
            <Component Id="cmp29DB53E533D4EE022F9865F6D0068182" Directory="INSTALLFOLDER" Guid="9A0479FF-A5BD-4192-A414-B416794CE704" Win64='yes'>
514
                <File Id="fil0D3D3AE7EAF5DBFA0ED0B96C6A04D29D" KeyPath="yes" Source=".\packages\ODA\OdDbPartialViewing_19.12_11.tx" />
515
            </Component>
516
            <Component Id="cmp3FCD6EC11D6446FFAB921BCB9749C375" Directory="INSTALLFOLDER" Guid="00D6BF40-9DD8-42E8-9EC0-5EE08CEBE4C0" Win64='yes'>
517
                <File Id="fil564D238701E3BFA1A13D1C7BE6A131EA" KeyPath="yes" Source=".\packages\ODA\OdGeoData_19.12_11.tx" />
518
            </Component>
519
            <Component Id="cmp53FF7D02369866D08804B152E44C4A30" Directory="INSTALLFOLDER" Guid="1C68E8E6-D006-4046-86C9-D9BBE10534F5" Win64='yes'>
520
                <File Id="fil96F7DEC6499CF3878C95099F7B0EF07E" KeyPath="yes" Source=".\packages\ODA\OdOleItemHandler_19.12_11.tx" />
521
            </Component>
522
            <Component Id="cmpC90359BE75B8E22BD082BBB2798444B8" Directory="INSTALLFOLDER" Guid="CAB88BDD-BD87-466D-90F4-1DF9B778D44F" Win64='yes'>
523
                <File Id="fil57D4AF57142C5DF3F89BF9626981990C" KeyPath="yes" Source=".\packages\ODA\OdOleSsItemHandler_19.12_11.tx" />
524
            </Component>
525
            <Component Id="cmp3E5C03F7F6A7FADD4A9711B363D6378A" Directory="INSTALLFOLDER" Guid="BCE1ADAD-8C8D-4721-8B55-7FE6EBCB3D5B" Win64='yes'>
526
                <File Id="fil3D2FE14A92B4BD917F651F77B6ADD702" KeyPath="yes" Source=".\packages\ODA\OpenCadTx_19.12_11.tx" />
527
            </Component>
528
            <Component Id="cmpC3DE899C9DBF22F6C812596CBA597401" Directory="INSTALLFOLDER" Guid="7B83963A-B44C-4EDB-BBCE-FB181081E936" Win64='yes'>
529
                <File Id="fil42BBB20A35B6FFE7C53D57C4B42943B4" KeyPath="yes" Source=".\packages\ODA\OpenCadTx_19.8_lic11.tx" />
530
            </Component>
531
            <Component Id="cmpA70C8137160E8986B6D0946D50FE8072" Directory="INSTALLFOLDER" Guid="B3E767A9-461F-4CD2-A98B-8C52875B5173" Win64='yes'>
532
                <File Id="filE420B3DF4A6296BAC7A284B77B43A712" KeyPath="yes" Source=".\packages\ODA\OverrulingSample_19.12_11.tx" />
533
            </Component>
534
            <Component Id="cmp2E4A5C1247776B2ABA6C9FF1D56D05D8" Directory="INSTALLFOLDER" Guid="5900CC35-979F-4B97-8F81-ABCEAA852DEA" Win64='yes'>
535
                <File Id="fil83B53674BB5E73BBFB953E282428CB01" KeyPath="yes" Source=".\packages\ODA\PlotSettingsValidator_19.12_11.tx" />
536
            </Component>
537
            <Component Id="cmp848D2B96BA1AF1BD1401ECC3FB14F3E4" Directory="INSTALLFOLDER" Guid="5D83CB55-308F-4A57-A0E5-2DEDADC5DB0A" Win64='yes'>
538
                <File Id="filD22070D9C25B43262B5B4AF76C36664B" KeyPath="yes" Source=".\packages\ODA\PlotStyleServices_19.12_11.tx" />
539
            </Component>
540
            <Component Id="cmp85BA5CE4729389EBC790281BE5AEF143" Directory="INSTALLFOLDER" Guid="645D2715-89EA-4067-BEEB-3379ECF69E21" Win64='yes'>
541
                <File Id="filF199F00146C4C3059ECE84C1EFA776F1" KeyPath="yes" Source=".\packages\ODA\RasterProcessor_19.12_11.tx" />
542
            </Component>
543
            <Component Id="cmp4EAEA328C99EBF4BA7593391D0D618A8" Directory="INSTALLFOLDER" Guid="1020C513-2BD6-4A5A-9043-4E7CD66EA303" Win64='yes'>
544
                <File Id="fil1103C1C9AA626EE6BB9B285949A479A9" KeyPath="yes" Source=".\packages\ODA\RcsFileServices_19.12_11.tx" />
545
            </Component>
546
            <Component Id="cmp265D038443313DA22E4FAC81152E0864" Directory="INSTALLFOLDER" Guid="AB120FA9-AFD2-4F3B-9956-10874657FC65" Win64='yes'>
547
                <File Id="fil0EE9725840220DA5A161112DC20B67C5" KeyPath="yes" Source=".\packages\ODA\RecomputeDimBlock_19.12_11.tx" />
548
            </Component>
549
            <Component Id="cmpBA4D83836E8E69712B8011CB4BACAC3B" Directory="INSTALLFOLDER" Guid="D2CB13FE-905D-42CE-8740-6FBFD0B11F69" Win64='yes'>
550
                <File Id="fil562FAE278F3EB7C13A79304A733B0A22" KeyPath="yes" Source=".\packages\ODA\RText_19.12_11.tx" />
551
            </Component>
552
            <Component Id="cmp3BFAB34E2A47F450228BEE378F876C01" Directory="INSTALLFOLDER" Guid="DC0DDC2C-8792-47D2-ADA9-C6558C7514AF" Win64='yes'>
553
                <File Id="filDD0D5B41A82A1FA4235282D636C28D99" KeyPath="yes" Source=".\packages\ODA\RxRasterServices_19.12_11.tx" />
554
            </Component>
555
            <Component Id="cmp89AAC717294BDD6C2BC45AA8AB3CA062" Directory="INSTALLFOLDER" Guid="9DD67764-0F6D-4A41-B331-95309D33D927" Win64='yes'>
556
                <File Id="fil9FD2642D527E7298CBDF82593756578C" KeyPath="yes" Source=".\packages\ODA\TAcisDb_19.12_11.tx" />
557
            </Component>
558
            <Component Id="cmp8D4D8DBFBAAA670A5305822E285A8EF7" Directory="INSTALLFOLDER" Guid="4C0EB80D-937D-47A5-905B-1D4ECBD3CBB9" Win64='yes'>
559
                <File Id="filF276BBFF05DA5B4D3496E7FB9E970C4B" KeyPath="yes" Source=".\packages\ODA\TD_3DSolidHistory_19.12_11.tx" />
560
            </Component>
561
            <Component Id="cmp9CFB64600F27F8E4072A12CA17E00637" Directory="INSTALLFOLDER" Guid="718AC056-80DF-4AD2-B02A-8487781FF0C3" Win64='yes'>
562
                <File Id="fil46D0DBD1002D945646F413A1ED5C92F5" KeyPath="yes" Source=".\packages\ODA\TD_BrepBuilderFiller_19.12_11.tx" />
563
            </Component>
564
            <Component Id="cmpB9F3876DD6FE864B3EE5E7D75F70D312" Directory="INSTALLFOLDER" Guid="B1029C91-B1A5-4877-B35E-F0F06E13EB46" Win64='yes'>
565
                <File Id="fil146A53F10CA6E6B31D326C209F30F120" KeyPath="yes" Source=".\packages\ODA\TD_DbJoinEntityPE_19.12_11.tx" />
566
            </Component>
567
            <Component Id="cmp840E51E255C65EB5ED126B46262B0BF5" Directory="INSTALLFOLDER" Guid="8364318A-C1C6-4797-8AC3-74AC0C120F03" Win64='yes'>
568
                <File Id="fil78B114AB46BEFF038CAE7167A87AF3D0" KeyPath="yes" Source=".\packages\ODA\TD_FtFontEngine_19.12_11.tx" />
569
            </Component>
570
            <Component Id="cmp1CC09E95C7CD6F3FA69A050F3E4532B7" Directory="INSTALLFOLDER" Guid="41F26CD5-BEC2-4A65-9F75-1A4CD5ADF0D3" Win64='yes'>
571
                <File Id="filA91AC4CDCBF6309C90646F46070E6806" KeyPath="yes" Source=".\packages\ODA\TD_SwigCore_19.12_11.dll" />
572
            </Component>
573
            <Component Id="cmpF66D264BC0CAEC7A397824181ABCBE86" Directory="INSTALLFOLDER" Guid="6321E3BD-7894-4013-8DDF-18485AB67EFC" Win64='yes'>
574
                <File Id="fil7C4A82EA6A9F939CA42309102F6E2FA2" KeyPath="yes" Source=".\packages\ODA\TD_SwigDb_19.12_11.dll" />
575
            </Component>
576
            <Component Id="cmp3C8E76EE0637D4530346B4A7D5248B62" Directory="INSTALLFOLDER" Guid="CB2EA757-8756-4636-92C2-FB643F75C92D" Win64='yes'>
577
                <File Id="filBC00B9F2FFFF68F1F7F76CC52F21A3D2" KeyPath="yes" Source=".\packages\ODA\TD_TfCore_19.12_11.tx" />
578
            </Component>
579
            <Component Id="cmp2B4E83D79DD24A512032FBA14FC2FC1B" Directory="INSTALLFOLDER" Guid="B3D880BB-F8F9-46D7-94B2-8429B9770B98" Win64='yes'>
580
                <File Id="fil98D102DF050FA2C1AD4EAF8630D66AC0" KeyPath="yes" Source=".\packages\ODA\TD_Tf_19.12_11.tx" />
581
            </Component>
582
            <Component Id="cmp9EDF17E5178ED52862A95CA5FCF6DDA4" Directory="INSTALLFOLDER" Guid="D2BD8A0B-16E7-4C45-A614-A33D21C90771" Win64='yes'>
583
                <File Id="fil468A80FD4FA7FADD25F838878AB359DD" KeyPath="yes" Source=".\packages\ODA\TD_ThreejsJSONExport_19.12_11.tx" />
584
            </Component>
585
            <Component Id="cmp9B13F2466A43A59AFA0E978AEA63341B" Directory="INSTALLFOLDER" Guid="8699FCEB-204C-4EF6-A0AB-E7FCF8AF478C" Win64='yes'>
586
                <File Id="fil1BFEA79910AC2FBFAB11DBD4BBE674D0" KeyPath="yes" Source=".\packages\ODA\TD_Zlib.dll" />
587
            </Component>
588
            <Component Id="cmp0E6E018207B2F881B03ADB62D5F41DE0" Directory="INSTALLFOLDER" Guid="74488AE6-49DA-43C3-A0F0-C611B7AF76B9" Win64='yes'>
589
                <File Id="fil246EAC56A66DA1A8731ABC63C332FD0F" KeyPath="yes" Source=".\packages\ODA\TG_Db_19.12_11.tx" />
590
            </Component>
591
            <Component Id="cmpD03ACFEC301326D7685333192CFAA038" Directory="INSTALLFOLDER" Guid="ED241D90-0F62-4C26-9514-C9EE269FE0BF" Win64='yes'>
592
                <File Id="fil938FA384D856D32C161868ABEB530B37" KeyPath="yes" Source=".\packages\ODA\TG_Dgn7IO_19.12_11.tx" />
593
            </Component>
594
            <Component Id="cmp7E87BFF8390813589BFBF30D82A4B9FA" Directory="INSTALLFOLDER" Guid="BDE51B2A-0422-4F58-8F9F-22F39FCD3AD4" Win64='yes'>
595
                <File Id="fil889938374CE4D9BBC9A03788DE0DBC37" KeyPath="yes" Source=".\packages\ODA\TG_DwgDb_19.12_11.tx" />
596
            </Component>
597
            <Component Id="cmpCC6FFA75D9961DB43494CC9716B280A7" Directory="INSTALLFOLDER" Guid="C054A255-DC6F-4B87-A48D-0EA25CA942AB" Win64='yes'>
598
                <File Id="filA6DEBB63D8AACE69FF70D592BE37DE18" KeyPath="yes" Source=".\packages\ODA\TG_ModelerGeometry_19.12_11.tx" />
599
            </Component>
600
            <Component Id="cmp90F1C0B1A66E22E53DB8FF7B5DDD4FE5" Directory="INSTALLFOLDER" Guid="825408AF-676D-407E-A0C5-47DC2C455A31" Win64='yes'>
601
                <File Id="filAF19400FE34F44C97343484DCC91BBA0" KeyPath="yes" Source=".\packages\ODA\TG_SwigDb_19.12_11.dll" />
602
            </Component>
603
            <Component Id="cmpE9DCB133C0EE5BF306BE2F6A3C036BA8" Directory="INSTALLFOLDER" Guid="2A51FBC4-3055-43A8-9A0F-B2FC6E1CA124" Win64='yes'>
604
                <File Id="fil28E487CC26BA494CFBC43963ADFF66FD" KeyPath="yes" Source=".\packages\ODA\ThreadPool_19.12_11.tx" />
605
            </Component>
606
            <Component Id="cmpED2F614737A44713C56C57907620EB63" Directory="INSTALLFOLDER" Guid="AB437F40-3B51-4BE6-858A-B023FFDA2737" Win64='yes'>
607
                <File Id="fil1FC331B8F08B5F84EA8ED4FDEA75A5ED" KeyPath="yes" Source=".\packages\ODA\TRseDb_19.12_11.tx" />
608
            </Component>
609
            <Component Id="cmpA78FF16FDBEBCC61819C235752FED4EB" Directory="INSTALLFOLDER" Guid="E98F261A-596A-45C5-A59B-4236A68EAB01" Win64='yes'>
610
                <File Id="fil9E0224C3D1DB2C78BB6F56F79B1BBB5D" KeyPath="yes" Source=".\packages\ODA\WipeOut_19.12_11.tx" />
611
            </Component>
343
            </Component>            
612 344
            <Component Id="cmpA8E411F92BD54821B9A3CEF8E01BBE63" Directory="MyAppDataFolder" Guid="6BF0D3C5-0684-4E7D-BC53-4CE092A48FFE" Win64='yes'>
613 345
                <File Id="fil49E6FDC6BDFC49A5AB05A71FB2D3A5AE" KeyPath="yes" Source=".\Site\Daelim\ini\MARKUS.ini" />
614 346
            </Component>
MARKUS_daelim_test.wxs
1 1
<?xml version="1.0" encoding="UTF-8"?>
2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
3 3
  <Product Id="*" Name="MARKUS" Language="1033" Version="1.0.0.0" Manufacturer="DOFTECH(C)" UpgradeCode="83FC35CA-6B7D-40C3-9D5F-E8F76097B25C">
4 4
    <Package Platform="x64" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
5 5

  
......
11 11
    
12 12
    <Feature Id="ProductFeature" Title="MARKUS" Level="1">
13 13
      <ComponentGroupRef Id="MARKUS" />
14
    </Feature>
14
    </Feature>    
15

  
16
    <CustomAction Id="NETFRAMEWORK_461"
17
      Directory="INSTALLFOLDER"
18
      ExeCommand="&quot;[INSTALLFOLDER]NDP461-KB3102438-Web.exe&quot; /norestart&quot; /passive&quot; /showrumi&quot; /ChainingPackage&quot; Contoso"
19
      Execute="commit"
20
      Return="asyncNoWait"  
21
      Impersonate="no"
22
    />
23

  
24
    <InstallExecuteSequence>
25
      <Custom Action='NETFRAMEWORK_461' After='InstallFiles' />
26
    </InstallExecuteSequence>
27

  
28
    <Property Id="WixShellExecTarget" Value="[INSTALLFOLDER]readme.html" />
29
    <CustomAction Id="LaunchBrowser" 
30
        BinaryKey="WixCA" 
31
        DllEntry="WixShellExec"
32
        Impersonate="yes" />
33
    <InstallExecuteSequence>
34
      <Custom Action='LaunchBrowser' After='InstallFinalize'>NOT Installed</Custom>
35
    </InstallExecuteSequence>
15 36
  </Product>
16 37

  
17 38
  <Fragment>
18 39
    <Directory Id="TARGETDIR" Name="SourceDir">
19 40
      <Directory Id="DesktopFolder" Name="Desktop">
20
        <Component Id="RegistryEntries" Guid="2bba9217-fcb9-4ff2-9c99-203db2ff98b4" Feature="ProductFeature">
21
          <RegistryValue Root="HKCR" Key="KCOM" Type="expandable" Name="URL Protocol" Value="" KeyPath="yes"/>	  
22
        </Component>
23
		<Component Id="RegistryEntriesCommand" Guid="e679ce5c-8a6f-48b2-836f-9ee96bdfd71f" Feature="ProductFeature">          
24
		  <RegistryValue Root="HKCR" Key="KCOM\shell\open\command" Type="string" Value="&quot;[INSTALLFOLDER]KCOM.exe&quot; &quot;%1&quot;" KeyPath="yes"/>
25
        </Component>
26
        <Component Id="DesktopShortcut" Guid="DF06024A-95FE-43E2-BDF2-7C686EAF391F" Feature="ProductFeature">
27
          <RegistryValue Root="HKCU" Key="Software\DOFTECH\MARKUS" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
28
          <Shortcut Id="DesktopShortcut"
29
                    Directory="DesktopFolder"
30
                    Name="MARKUS"
31
                    Description="PDF Markup Tool"
32
                    Target="[INSTALLFOLDER]KCOM.exe"
33
                    WorkingDirectory="INSTALLFOLDER" />
41
        <Component Id="DesktopShortcut" Guid="DF06024A-95FE-43E2-BDF2-7C686EAF391F" Feature="ProductFeature" Win64='yes'>
42
          <RegistryValue Root="HKCU" Key="Software\DOFTECH\MARKUS" Name="installed" Type="integer" Value="1" KeyPath="yes"/>          
34 43
          <RemoveFolder Id="DesktopFolder" On="uninstall"/>
35 44
        </Component>
36 45
      </Directory>
......
42 51
      </Directory>  
43 52
    </Directory>
44 53
    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
45
    <UIRef Id="WixUI_InstallDir"/>
54
    <UIRef Id="WixUI_InstallDir"/>   
46 55
    
47
    <UI>
48
      <Publish Dialog="ExitDialog" 
49
        Control="Finish" 
50
        Event="DoAction" 
51
        Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed
52
      </Publish>
53
    </UI>
54
    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch MARKUS" />
55
    <Property Id="WixShellExecTarget" Value="[INSTALLFOLDER]KCOM.exe" />
56
    <CustomAction Id="LaunchApplication" BinaryKey="WixCA" DllEntry="WixShellExec" Impersonate="yes" />
57 56
  </Fragment>
58 57

  
59 58
  <Fragment>
59
    <DirectoryRef Id="TARGETDIR">
60
      <Component Id="cmp67889FD2219FCD1ECDA0BD9FE906CD7A" Guid="57D045D4-AFC0-4874-8BA9-A1E8B9C348F9" KeyPath="yes">
61
        <RegistryKey ForceCreateOnInstall="yes" Key="KCOM\shell\open" Root="HKCR" />
62
      </Component>
63
    </DirectoryRef>
64
  </Fragment>
65
  
66
  <Fragment>
67
    <DirectoryRef Id="TARGETDIR">
68
      <Component Id="cmpB2A195FD7387054E641ABB044E70AD31" Guid="CA81C92A-E2BA-4E01-B4A0-6B5E5E5A6C63" KeyPath="yes">
69
        <RegistryKey Key="KCOM\shell\open\command" Root="HKCR">
70
          <RegistryValue Value="&quot;C:\Program Files\DOFTECH\MARKUS\KCOM.exe&quot; &quot;%1&quot;" Type="string" />
71
        </RegistryKey>
72
      </Component>
73
    </DirectoryRef>
74
  </Fragment>
75
  
76
  <Fragment>
77
    <DirectoryRef Id="TARGETDIR">
78
      <Component Id="cmpCA3EA94464F79A1D590AD23EE3921964" Guid="171260E2-66FC-4088-9F1F-3FAEB29250CA" KeyPath="yes">
79
        <RegistryKey ForceCreateOnInstall="yes" Key="KCOM\shell" Root="HKCR" />
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

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