Upgrade referenced packages. Remove and Sort Usings. Solve using incorrect package reference in setup project issue.

efreykongcn · efreykongcn · commit 92510afe1285 · 2022-06-25T12:07:01.000+08:00
diff --git a/NoteWidgetAddIn/AddIn.Ribbon.cs b/NoteWidgetAddIn/AddIn.Ribbon.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
diff --git a/NoteWidgetAddIn/Export/CustomFileExportor.cs b/NoteWidgetAddIn/Export/CustomFileExportor.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
 using System.IO;
 using NoteWidgetAddIn.Model;
 
diff --git a/NoteWidgetAddIn/Export/ExportFactory.cs b/NoteWidgetAddIn/Export/ExportFactory.cs
@@ -1,13 +1,7 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.IO;
-using System.Text;
-using System.Xml.Linq;
-using Microsoft.Office.Interop.OneNote;
 using NoteWidgetAddIn.Export;
-using NoteWidgetAddIn.Model;
 
 namespace NoteWidgetAddIn
 {
diff --git a/NoteWidgetAddIn/Export/HtmlExportor.cs b/NoteWidgetAddIn/Export/HtmlExportor.cs
@@ -1,13 +1,7 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 using NoteWidgetAddIn.Markdown;
 using NoteWidgetAddIn.Model;
 
diff --git a/NoteWidgetAddIn/Export/MarkdownExportor.cs b/NoteWidgetAddIn/Export/MarkdownExportor.cs
@@ -2,12 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 using NoteWidgetAddIn.Model;
 
 namespace NoteWidgetAddIn.Export
diff --git a/NoteWidgetAddIn/Export/OneNoteHostedExportor.cs b/NoteWidgetAddIn/Export/OneNoteHostedExportor.cs
@@ -1,11 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Office.Interop.OneNote;
 
 namespace NoteWidgetAddIn.Export
diff --git a/NoteWidgetAddIn/Markdown/Extension/ColorSchemeExtension.cs b/NoteWidgetAddIn/Markdown/Extension/ColorSchemeExtension.cs
@@ -2,10 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NoteWidgetAddIn.Markdown.Extension
 {
diff --git a/NoteWidgetAddIn/Markdown/Extension/DiagramExtension.cs b/NoteWidgetAddIn/Markdown/Extension/DiagramExtension.cs
@@ -2,10 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NoteWidgetAddIn.Markdown.Extension
 {
diff --git a/NoteWidgetAddIn/Markdown/Extension/HighlightExtension.cs b/NoteWidgetAddIn/Markdown/Extension/HighlightExtension.cs
@@ -2,10 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NoteWidgetAddIn.Markdown.Extension
 {
diff --git a/NoteWidgetAddIn/Markdown/HtmlTemplate.cs b/NoteWidgetAddIn/Markdown/HtmlTemplate.cs
@@ -1,11 +1,9 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Web;
-using Markdig;
 
 namespace NoteWidgetAddIn.Markdown
 {
diff --git a/NoteWidgetAddIn/Markdown/HtmlTemplateBuilder.cs b/NoteWidgetAddIn/Markdown/HtmlTemplateBuilder.cs
@@ -1,11 +1,8 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NoteWidgetAddIn.Markdown.Extension;
 
 namespace NoteWidgetAddIn.Markdown
diff --git a/NoteWidgetAddIn/Markdown/ITemplateExtension.cs b/NoteWidgetAddIn/Markdown/ITemplateExtension.cs
@@ -1,12 +1,7 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NoteWidgetAddIn.Markdown
 {
diff --git a/NoteWidgetAddIn/Markdown/ITemplateRender.cs b/NoteWidgetAddIn/Markdown/ITemplateRender.cs
@@ -1,12 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace NoteWidgetAddIn.Markdown
 {
     public interface ITemplateRender
diff --git a/NoteWidgetAddIn/Model/NodeType.cs b/NoteWidgetAddIn/Model/NodeType.cs
@@ -1,12 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace NoteWidgetAddIn.Model
 {
     public enum NodeType
diff --git a/NoteWidgetAddIn/Model/NoteNode.cs b/NoteWidgetAddIn/Model/NoteNode.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace NoteWidgetAddIn.Model
diff --git a/NoteWidgetAddIn/Model/NotePage.cs b/NoteWidgetAddIn/Model/NotePage.cs
@@ -2,11 +2,9 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Web;
 using System.Xml.Linq;
 
diff --git a/NoteWidgetAddIn/Model/NotePageInfo.cs b/NoteWidgetAddIn/Model/NotePageInfo.cs
@@ -2,11 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using Microsoft.Office.Interop.OneNote;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace NoteWidgetAddIn.Model
 {
diff --git a/NoteWidgetAddIn/NoteWidgetAddIn.csproj b/NoteWidgetAddIn/NoteWidgetAddIn.csproj
@@ -229,16 +229,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack">
-      <Version>1.11.40</Version>
+      <Version>1.11.43</Version>
     </PackageReference>
     <PackageReference Include="Markdig">
-      <Version>0.26.0</Version>
+      <Version>0.30.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Web.WebView2">
-      <Version>1.0.1054.31</Version>
+      <Version>1.0.1245.22</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.7.13</Version>
+      <Version>5.0.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -252,4 +252,9 @@ taskkill /fi "pid gt 0" /im ONENOTE.exe
 call C:\Users\efrey\source\Github\OneNoteWidget\powershell-copyfile-runas.bat "$(TargetPath)" "C:\Program Files (x86)\EKStudio\NoteWidget\$(TargetFileName)"
 )</PostBuildEvent>
   </PropertyGroup>
+  <Target Name="BuiltProjectOutputGroupDependencies" DependsOnTargets="$(BuiltProjectOutputGroupDependenciesDependsOn)" Returns="@(BuiltProjectOutputGroupDependency)">
+    <ItemGroup>
+      <BuiltProjectOutputGroupDependency Include="@(ReferenceCopyLocalPaths->'%(FullPath)');&#xD;&#xA;                                              @(ReferenceDependencyPaths->'%(FullPath)');&#xD;&#xA;                                              @(NativeReferenceFile->'%(FullPath)');&#xD;&#xA;                                              @(_DeploymentLooseManifestFile->'%(FullPath)');&#xD;&#xA;                                              @(ResolvedIsolatedComModules->'%(FullPath)')" />
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/NoteWidgetAddIn/RibbonCommand/Advanced/WidgetAdvancedSettingsCommand.cs b/NoteWidgetAddIn/RibbonCommand/Advanced/WidgetAdvancedSettingsCommand.cs
@@ -2,7 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Threading.Tasks;
-using System.Windows.Interop;
 using NoteWidgetAddIn.RibbonCommand.Advanced;
 
 namespace NoteWidgetAddIn.RibbonCommand
diff --git a/NoteWidgetAddIn/RibbonCommand/Command.cs b/NoteWidgetAddIn/RibbonCommand/Command.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using NLog;
diff --git a/NoteWidgetAddIn/RibbonCommand/Export/ExportToPathCommand.cs b/NoteWidgetAddIn/RibbonCommand/Export/ExportToPathCommand.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using System.Windows.Interop;
 using NoteWidgetAddIn.Model;
 
 namespace NoteWidgetAddIn.RibbonCommand
diff --git a/NoteWidgetAddIn/RibbonCommand/Markdown/CheatsheetCommand.cs b/NoteWidgetAddIn/RibbonCommand/Markdown/CheatsheetCommand.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.Threading.Tasks;
 using NoteWidgetAddIn.Markdown;
 using NoteWidgetAddIn.RibbonCommand.Markdown;
diff --git a/NoteWidgetAddIn/RibbonCommand/WpfAddInApplication.cs b/NoteWidgetAddIn/RibbonCommand/WpfAddInApplication.cs
@@ -2,9 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Threading;
diff --git a/NoteWidgetAddIn/Utils/EnumDescriptionConverter.cs b/NoteWidgetAddIn/Utils/EnumDescriptionConverter.cs
@@ -2,13 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Data;
-using NLog;
 
 namespace NoteWidgetAddIn
 {
diff --git a/NoteWidgetAddIn/Utils/Extensions.cs b/NoteWidgetAddIn/Utils/Extensions.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using NoteWidgetAddIn.Model;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,9 +10,8 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows.Forms;
 using System.Windows.Media;
-using System.Xml.Linq;
+using NoteWidgetAddIn.Model;
 
 namespace NoteWidgetAddIn
 {
diff --git a/NoteWidgetAddIn/Utils/MarkdownHelper.cs b/NoteWidgetAddIn/Utils/MarkdownHelper.cs
@@ -1,11 +1,6 @@
 ﻿// Copyright (c) Efrey Kong. All Rights Reserved.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Markdig;
 
 namespace NoteWidgetAddIn
diff --git a/NoteWidgetAddIn/Utils/RestrictedNodeTypeAttribute.cs b/NoteWidgetAddIn/Utils/RestrictedNodeTypeAttribute.cs
@@ -2,10 +2,6 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using NoteWidgetAddIn.Model;
 
 namespace NoteWidgetAddIn
diff --git a/NoteWidgetTests/DummyDataExportTest.cs b/NoteWidgetTests/DummyDataExportTest.cs
@@ -1,11 +1,8 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NoteWidgetAddIn.RibbonCommand;
 using NoteWidgetAddIn.Model;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 
 namespace NoteWidgetAddIn
 {
diff --git a/NoteWidgetTests/DummyImpl/DummyApplication.cs b/NoteWidgetTests/DummyImpl/DummyApplication.cs
@@ -1,10 +1,7 @@
 ﻿using Microsoft.Office.Interop.OneNote;
 using NoteWidgetAddIn.Model;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace NoteWidgetAddIn
diff --git a/NoteWidgetTests/DummyImpl/DummyWindow.cs b/NoteWidgetTests/DummyImpl/DummyWindow.cs
@@ -1,11 +1,8 @@
 ﻿using Microsoft.Office.Interop.OneNote;
 using NoteWidgetAddIn.Model;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace NoteWidgetAddIn
diff --git a/NoteWidgetTests/InteropExportTest.cs b/NoteWidgetTests/InteropExportTest.cs
@@ -1,14 +1,9 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-using NoteWidgetAddIn.RibbonCommand;
-using NoteWidgetAddIn.RibbonCommand.Advanced;
 using NoteWidgetAddIn.Model;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace NoteWidgetAddIn
 {
diff --git a/NoteWidgetTests/MarkdownTest.cs b/NoteWidgetTests/MarkdownTest.cs
@@ -1,18 +1,10 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NoteWidgetAddIn.Markdown;
 using NoteWidgetAddIn.RibbonCommand.Markdown;
-using NoteWidgetAddIn.Model;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Controls;
-using System.Xml.Linq;
-using NoteWidgetAddIn.RibbonCommand.Advanced;
-using NoteWidgetAddIn.Markdown;
 
 namespace NoteWidgetAddIn
 {
diff --git a/NoteWidgetTests/NoteApplicationTest.cs b/NoteWidgetTests/NoteApplicationTest.cs
diff --git a/NoteWidgetTests/NoteWidgetTests.csproj b/NoteWidgetTests/NoteWidgetTests.csproj
diff --git a/NoteWidgetTests/UtilTests.cs b/NoteWidgetTests/UtilTests.cs
diff --git a/NoteWidgetTests/Utils/DummyData.cs b/NoteWidgetTests/Utils/DummyData.cs

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,6 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using System.Collections.Generic;`
`6`		`-using System.Linq;`
`7`		`-using System.Text;`
`8`		`-using System.Threading.Tasks;`
`9`	`5`
`10`	`6`	`namespace NoteWidgetAddIn.Markdown.Extension`
`11`	`7`	`{`