From 11cba422b600e7134b31fb69bebabd07a694bc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvir=20Brki=C4=87?= Date: Thu, 2 Nov 2017 15:02:37 +0100 Subject: [PATCH 1/5] Fixed (&apos) instead of (') in clipboard --- NoteHighlightAddin/MainForm.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NoteHighlightAddin/MainForm.cs b/NoteHighlightAddin/MainForm.cs index 6cd4196..fc69a84 100644 --- a/NoteHighlightAddin/MainForm.cs +++ b/NoteHighlightAddin/MainForm.cs @@ -169,7 +169,7 @@ private void InsertToClipboard(string outputFileName) { string line = sr.ReadLine(); - line = line.Replace("\t", "    ") + "
"; + line = line.Replace("\t", "    ").Replace("'", "'") + "
"; var charList = line.ToCharArray().ToList(); From fd0edd72523429cd0edea493e92d9799f3834dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvir=20Brki=C4=87?= Date: Fri, 3 Nov 2017 09:50:51 +0100 Subject: [PATCH 2/5] Fixed double BOM char causing misplaced language style in ON 2016 and weird boxed in ON 2013 --- NoteHighlightAddin/AddIn.cs | 5 ++++- NoteHighlightAddin/MainForm.cs | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NoteHighlightAddin/AddIn.cs b/NoteHighlightAddin/AddIn.cs index f9c1dcf..725f9db 100644 --- a/NoteHighlightAddin/AddIn.cs +++ b/NoteHighlightAddin/AddIn.cs @@ -248,7 +248,10 @@ private void InsertHighLightCodeToCurrentSide(string fileName, HighLightParamete try { // Trace.TraceInformation(System.Reflection.MethodBase.GetCurrentMethod().Name); - string htmlContent = File.ReadAllText(fileName, Encoding.UTF8); + string htmlContent = File.ReadAllText(fileName, new UTF8Encoding(false)); + + string byteOrderMarkUtf8 = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()); + htmlContent = htmlContent.Replace(byteOrderMarkUtf8, ""); var pageNode = GetPageNode(); diff --git a/NoteHighlightAddin/MainForm.cs b/NoteHighlightAddin/MainForm.cs index fc69a84..63ad41f 100644 --- a/NoteHighlightAddin/MainForm.cs +++ b/NoteHighlightAddin/MainForm.cs @@ -162,13 +162,16 @@ private void InsertToClipboard(string outputFileName) using (FileStream fs = new FileStream(outputFileName, FileMode.Open, FileAccess.Read)) { - using (StreamReader sr = new StreamReader(fs, Encoding.UTF8)) + using (StreamReader sr = new StreamReader(fs, new UTF8Encoding(false))) { //Fix 存到剪貼簿空白不見的問題 while (sr.Peek() >= 0) { string line = sr.ReadLine(); + string byteOrderMarkUtf8 = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()); + line = line.Replace(byteOrderMarkUtf8, ""); + line = line.Replace("\t", "    ").Replace("'", "'") + "
"; var charList = line.ToCharArray().ToList(); From 20bb755fa50f9f04bd6baaf69c14daebf3a728cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvir=20Brki=C4=87?= Date: Fri, 3 Nov 2017 11:18:45 +0100 Subject: [PATCH 3/5] Fixed missing leading spaces for line numbers when using clipboard, leading to unaligned text --- NoteHighlightAddin/MainForm.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/NoteHighlightAddin/MainForm.cs b/NoteHighlightAddin/MainForm.cs index 63ad41f..2536a34 100644 --- a/NoteHighlightAddin/MainForm.cs +++ b/NoteHighlightAddin/MainForm.cs @@ -172,17 +172,26 @@ private void InsertToClipboard(string outputFileName) string byteOrderMarkUtf8 = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()); line = line.Replace(byteOrderMarkUtf8, ""); - line = line.Replace("\t", "    ").Replace("'", "'") + "
"; - + if (!line.StartsWith("")) + { + line = line.Replace("\t", "    ").Replace("'", "'") + "
"; + } var charList = line.ToCharArray().ToList(); StringBuilder sbLine = new StringBuilder(); int index = 0; - if (IsShowLineNumber) + if (IsShowLineNumber && !line.StartsWith("")) { index = line.IndexOf(span) + span.Length; - sbLine.Append(line.Substring(0, index)); + string nrLine = line.Substring(0, index); + + int endTextIndex = nrLine.IndexOf(span); + int startTextIndex = nrLine.LastIndexOf(">", endTextIndex) + 1; + + nrLine = nrLine.Substring(0, startTextIndex) + nrLine.Substring(startTextIndex, endTextIndex-startTextIndex).Replace(" ", " ") + nrLine.Substring(endTextIndex); + + sbLine.Append(nrLine); } for (int i = index; i < charList.Count; i++) From 4d8a5f03483e192ade0bcf13a6885dc4f894f47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvir=20Brki=C4=87?= Date: Fri, 3 Nov 2017 11:50:54 +0100 Subject: [PATCH 4/5] Fix wrong position of language style because lined doesn't start with span tag when line numbers are not used --- NoteHighlightAddin/AddIn.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NoteHighlightAddin/AddIn.cs b/NoteHighlightAddin/AddIn.cs index 725f9db..6698211 100644 --- a/NoteHighlightAddin/AddIn.cs +++ b/NoteHighlightAddin/AddIn.cs @@ -436,10 +436,10 @@ public XDocument InsertHighLightCode(string htmlContent, string[] position, High if(item.StartsWith("") +1); //Sets language to Latin to disable spell check defaultStyle = defaultStyle.Insert(defaultStyle.Length - 1, " lang=la"); - item = item.Substring(item.IndexOf("")+1); } if (item == "") From af016a7fe2f2aa5a9310c3b012a9797cf362427a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvir=20Brki=C4=87?= Date: Fri, 3 Nov 2017 11:57:26 +0100 Subject: [PATCH 5/5] Updated version to v3.2 --- NoteHighlightAddin/Properties/AssemblyInfo.cs | 4 +- Setup/Setup.vdproj | 104 +++++++++--------- SetupX86/SetupX86.vdproj | 104 +++++++++--------- 3 files changed, 106 insertions(+), 106 deletions(-) diff --git a/NoteHighlightAddin/Properties/AssemblyInfo.cs b/NoteHighlightAddin/Properties/AssemblyInfo.cs index 825eb77..70d1713 100644 --- a/NoteHighlightAddin/Properties/AssemblyInfo.cs +++ b/NoteHighlightAddin/Properties/AssemblyInfo.cs @@ -33,5 +33,5 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyFileVersion("3.1.*")] +[assembly: AssemblyVersion("3.2.*")] +[assembly: AssemblyFileVersion("3.2.*")] diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj index f9a2ec8..6216a2c 100644 --- a/Setup/Setup.vdproj +++ b/Setup/Setup.vdproj @@ -27,44 +27,44 @@ } "Entry" { - "MsmKey" = "8:_3F5A6705A6B31EBC4C5DA3FC2A052289" + "MsmKey" = "8:_388259E42C7BBB7AA962BAF39F2213B6" "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_47AFBE13144648689D856D43F6F054E6" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_388259E42C7BBB7AA962BAF39F2213B6" + "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "MsmKey" = "8:_3F5A6705A6B31EBC4C5DA3FC2A052289" "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "MsmKey" = "8:_47AFBE13144648689D856D43F6F054E6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B" - "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" + "MsmKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B" - "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "MsmKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -106,43 +106,43 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247" + "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC" + "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19" + "OwnerKey" = "8:_388259E42C7BBB7AA962BAF39F2213B6" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" + "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_805E0317B9E0B1539EEBB800C533393B" + "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC" "MsmSig" = "8:_UNDEFINED" } } @@ -323,10 +323,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3F5A6705A6B31EBC4C5DA3FC2A052289" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_388259E42C7BBB7AA962BAF39F2213B6" { - "SourcePath" = "8:NoteHighlightAddin.tlb" - "TargetName" = "8:NoteHighlightAddin.tlb" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Helper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=609b64b0cf912098, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_388259E42C7BBB7AA962BAF39F2213B6" + { + "Name" = "8:Helper.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Helper.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" "Condition" = "8:" @@ -338,15 +349,15 @@ "Permanent" = "11:FALSE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" - "Register" = "3:2" - "Exclude" = "11:FALSE" + "Register" = "3:1" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47AFBE13144648689D856D43F6F054E6" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3F5A6705A6B31EBC4C5DA3FC2A052289" { - "SourcePath" = "8:..\\NoteHighlightAddin\\App.config" - "TargetName" = "8:NoteHighlightAddin.dll.config" + "SourcePath" = "8:NoteHighlightAddin.tlb" + "TargetName" = "8:NoteHighlightAddin.tlb" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" "Condition" = "8:" @@ -358,26 +369,15 @@ "Permanent" = "11:FALSE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" - "Register" = "3:1" + "Register" = "3:2" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47AFBE13144648689D856D43F6F054E6" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:HtmlAgilityPack, Version=1.5.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5F7DADAECA95B8A8EECB662A9FCF5BB5" - { - "Name" = "8:HtmlAgilityPack.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:HtmlAgilityPack.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\NoteHighlightAddin\\App.config" + "TargetName" = "8:NoteHighlightAddin.dll.config" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" "Condition" = "8:" @@ -391,23 +391,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_805E0317B9E0B1539EEBB800C533393B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F7DADAECA95B8A8EECB662A9FCF5BB5" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Helper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=609b64b0cf912098, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:HtmlAgilityPack, Version=1.5.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_805E0317B9E0B1539EEBB800C533393B" + "_5F7DADAECA95B8A8EECB662A9FCF5BB5" { - "Name" = "8:Helper.dll" + "Name" = "8:HtmlAgilityPack.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Helper.dll" + "SourcePath" = "8:HtmlAgilityPack.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" @@ -421,7 +421,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -640,15 +640,15 @@ { "Name" = "8:NoteHighlightAddin" "ProductName" = "8:NoteHighlight2016" - "ProductCode" = "8:{FB571ECB-7A79-4417-BC88-04EADC1CAEE0}" - "PackageCode" = "8:{AFFAB118-BED9-4D10-967A-1D8018F1F910}" + "ProductCode" = "8:{588E3316-4AE0-4C59-8FE7-833D5F1FCE17}" + "PackageCode" = "8:{F72A5156-9BC9-4CFE-8EA6-7B21049E04F7}" "UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:3.1" + "ProductVersion" = "8:3.2" "Manufacturer" = "8:CodingRoad" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:" diff --git a/SetupX86/SetupX86.vdproj b/SetupX86/SetupX86.vdproj index 53579c1..6dd4b59 100644 --- a/SetupX86/SetupX86.vdproj +++ b/SetupX86/SetupX86.vdproj @@ -27,44 +27,44 @@ } "Entry" { - "MsmKey" = "8:_3F5A6705A6B31EBC4C5DA3FC2A052289" + "MsmKey" = "8:_388259E42C7BBB7AA962BAF39F2213B6" "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_47AFBE13144648689D856D43F6F054E6" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_388259E42C7BBB7AA962BAF39F2213B6" + "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "MsmKey" = "8:_3F5A6705A6B31EBC4C5DA3FC2A052289" "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "MsmKey" = "8:_47AFBE13144648689D856D43F6F054E6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B" - "OwnerKey" = "8:_UNDEFINED" + "MsmKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B" - "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" + "MsmKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_805E0317B9E0B1539EEBB800C533393B" - "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "MsmKey" = "8:_7CBDA023CD2F435BB8D4D5586B86D83B" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -106,43 +106,43 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247" + "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC" + "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_692D7E391D074D36AD2530720FB8D6C4" + "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E4014126696E456F7FC66801CBFEEE19" + "OwnerKey" = "8:_388259E42C7BBB7AA962BAF39F2213B6" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_0FFDD9474C2B804E2E2B2C7C6360577B" + "OwnerKey" = "8:_CBF51C0C38434D629FC3271C5390E247" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_805E0317B9E0B1539EEBB800C533393B" + "OwnerKey" = "8:_BF0DDD11259532587F856D651F450ECC" "MsmSig" = "8:_UNDEFINED" } } @@ -323,10 +323,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3F5A6705A6B31EBC4C5DA3FC2A052289" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_388259E42C7BBB7AA962BAF39F2213B6" { - "SourcePath" = "8:NoteHighlightAddin.tlb" - "TargetName" = "8:NoteHighlightAddin.tlb" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Helper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=609b64b0cf912098, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_388259E42C7BBB7AA962BAF39F2213B6" + { + "Name" = "8:Helper.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Helper.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" "Condition" = "8:" @@ -338,15 +349,15 @@ "Permanent" = "11:FALSE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" - "Register" = "3:2" - "Exclude" = "11:FALSE" + "Register" = "3:1" + "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47AFBE13144648689D856D43F6F054E6" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3F5A6705A6B31EBC4C5DA3FC2A052289" { - "SourcePath" = "8:..\\NoteHighlightAddin\\App.config" - "TargetName" = "8:NoteHighlightAddin.dll.config" + "SourcePath" = "8:NoteHighlightAddin.tlb" + "TargetName" = "8:NoteHighlightAddin.tlb" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" "Condition" = "8:" @@ -358,26 +369,15 @@ "Permanent" = "11:FALSE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" - "Register" = "3:1" + "Register" = "3:2" "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" + "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F7DADAECA95B8A8EECB662A9FCF5BB5" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47AFBE13144648689D856D43F6F054E6" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:HtmlAgilityPack, Version=1.5.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_5F7DADAECA95B8A8EECB662A9FCF5BB5" - { - "Name" = "8:HtmlAgilityPack.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:HtmlAgilityPack.dll" - "TargetName" = "8:" + "SourcePath" = "8:..\\NoteHighlightAddin\\App.config" + "TargetName" = "8:NoteHighlightAddin.dll.config" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" "Condition" = "8:" @@ -391,23 +391,23 @@ "PackageAs" = "3:1" "Register" = "3:1" "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" + "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_805E0317B9E0B1539EEBB800C533393B" + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5F7DADAECA95B8A8EECB662A9FCF5BB5" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Helper, Version=1.0.0.0, Culture=neutral, PublicKeyToken=609b64b0cf912098, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:HtmlAgilityPack, Version=1.5.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL" "ScatterAssemblies" { - "_805E0317B9E0B1539EEBB800C533393B" + "_5F7DADAECA95B8A8EECB662A9FCF5BB5" { - "Name" = "8:Helper.dll" + "Name" = "8:HtmlAgilityPack.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:Helper.dll" + "SourcePath" = "8:HtmlAgilityPack.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_76DE0C3E4C3C41398EBF2960C9F81C36" @@ -421,7 +421,7 @@ "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" "Register" = "3:1" - "Exclude" = "11:TRUE" + "Exclude" = "11:FALSE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } @@ -640,15 +640,15 @@ { "Name" = "8:NoteHighlightAddin" "ProductName" = "8:NoteHighlight2016" - "ProductCode" = "8:{95B19903-BDE2-4560-A55D-5BDA0EF8D70C}" - "PackageCode" = "8:{8AA95C85-7AA6-44AA-8BFA-50A9071A33A5}" + "ProductCode" = "8:{DAF56CAA-855B-46EA-B471-31DFE4EF5966}" + "PackageCode" = "8:{7FBA16C9-16BC-440C-A9E3-552579CD29D3}" "UpgradeCode" = "8:{0025873C-20C5-48D6-A93A-FBD3891A9233}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:3.1" + "ProductVersion" = "8:3.2" "Manufacturer" = "8:CodingRoad" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:"