From e2e7033fd1a9083972a528bb8d02cf44b652582b Mon Sep 17 00:00:00 2001 From: PoorInRichfield Date: Thu, 18 Apr 2019 11:05:59 -0500 Subject: [PATCH 1/2] Updated VSIX to be compatible with VS2019. (#1) --- ObjectExporter.VsPackage/Documentation/Release Notes.txt | 3 +++ ObjectExporter.VsPackage/source.extension.vsixmanifest | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ObjectExporter.VsPackage/Documentation/Release Notes.txt b/ObjectExporter.VsPackage/Documentation/Release Notes.txt index e1d071a..477bf85 100644 --- a/ObjectExporter.VsPackage/Documentation/Release Notes.txt +++ b/ObjectExporter.VsPackage/Documentation/Release Notes.txt @@ -1,3 +1,6 @@ +Release Notes (v1.7.1) - 04/18/2019: +1. Added Support for VS2019 + Release Notes (v1.7.0) - 01/03/2017: 1. Added Support for VS2017 2. Fixed bug which would prevent loading of Object Exporter (Issue #59) diff --git a/ObjectExporter.VsPackage/source.extension.vsixmanifest b/ObjectExporter.VsPackage/source.extension.vsixmanifest index 3767ef7..9e99dd9 100644 --- a/ObjectExporter.VsPackage/source.extension.vsixmanifest +++ b/ObjectExporter.VsPackage/source.extension.vsixmanifest @@ -13,7 +13,7 @@ Object Exporter, Serialize, Serializer, Save, Object, Export, Debugger, XML, Debugging, C#, JSON, CSharp, Watch, Locals, Generate, Autos, Immediate - + @@ -22,7 +22,6 @@ - - + From b627d97e3c2702d028f8709b64814347d3290d41 Mon Sep 17 00:00:00 2001 From: "Todd M. Taylor" Date: Thu, 18 Apr 2019 11:51:40 -0500 Subject: [PATCH 2/2] Updated package to load asynchronously for better performance in Visual Studio. This feature will be required in Visual Studio 2019 Preview 2. --- .gitignore | 2 + .../ObjectExporter.Core.csproj | 8 +- .../Templates/CSharpGenerator.cs | 72 +++++++++--------- .../Templates/JsonGenerator.cs | 76 +++++++++---------- .../ImageResources.Designer.cs | 2 +- .../ObjectExporter.Package.cs | 15 ++-- .../ObjectExporter.VsPackage.csproj | 8 +- .../VSPackage.Designer.cs | 2 +- ObjectExporter.VsPackage/app.config | 14 ++-- .../source.extension.vsixmanifest | 4 +- ObjectExporter.sln | 22 ++---- 11 files changed, 106 insertions(+), 119 deletions(-) diff --git a/.gitignore b/.gitignore index 7ff635e..c9912dd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ ObjectExporter.VsPackage/obj/ ObjectExporter.VsPackage/Resources ObjectExporter.Core/ApiKeys.cs ObjectExporter.VsPackage/Documentation/Thumbs.db +/.vs +/packages diff --git a/ObjectExporter.Core/ObjectExporter.Core.csproj b/ObjectExporter.Core/ObjectExporter.Core.csproj index 0bb2d7d..24fee51 100644 --- a/ObjectExporter.Core/ObjectExporter.Core.csproj +++ b/ObjectExporter.Core/ObjectExporter.Core.csproj @@ -9,7 +9,7 @@ Properties ObjectExporter.Core ObjectExporter.Core - v4.5 + v4.7.2 512 SAK SAK @@ -54,10 +54,7 @@ False - - False - ..\lib\Microsoft.VisualStudio.Shell.11.0.dll - + False ..\lib\Microsoft.VisualStudio.Shell.Design.dll @@ -127,6 +124,7 @@ TextTemplatingFilePreprocessor + XmlGenerator1.cs diff --git a/ObjectExporter.Core/Templates/CSharpGenerator.cs b/ObjectExporter.Core/Templates/CSharpGenerator.cs index 38059ba..0d48d8c 100644 --- a/ObjectExporter.Core/Templates/CSharpGenerator.cs +++ b/ObjectExporter.Core/Templates/CSharpGenerator.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version: 14.0.0.0 +// Runtime Version: 16.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,8 +19,8 @@ namespace ObjectExporter.Core.Templates /// Class to produce the template output /// - #line 1 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "14.0.0.0")] + #line 1 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")] public partial class CSharpGenerator : CSharpGeneratorBase { #line hidden @@ -30,7 +30,7 @@ public partial class CSharpGenerator : CSharpGeneratorBase public virtual string TransformText() { - #line 9 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 9 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" if(CanBeExpressedAsSingleType(objectExpression.Type) || objectExpression.DataMembers.Count == 0) { @@ -44,14 +44,14 @@ public virtual string TransformText() #line hidden this.Write("var "); - #line 16 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 16 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(GeneratorHelper.ResolveReservedNames(objectExpression.Name))); #line default #line hidden this.Write(" = "); - #line 16 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 16 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" ExportMembers(objectExpression, 0, true); } @@ -63,7 +63,7 @@ public virtual string TransformText() return this.GenerationEnvironment.ToString(); } - #line 20 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 20 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" bool isFirstElement = true; @@ -99,14 +99,14 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 50 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 50 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(GetSingleTypeValue(expression) + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 50 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 50 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" } else @@ -116,28 +116,28 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 54 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 54 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expressionName)); #line default #line hidden - #line 54 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 54 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(" = "); #line default #line hidden - #line 54 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 54 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(GetSingleTypeValue(expression) + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 54 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 54 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" } } @@ -151,14 +151,14 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 62 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 62 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expression.Value + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 62 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 62 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" } else @@ -168,28 +168,28 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 66 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 66 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expressionName)); #line default #line hidden - #line 66 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 66 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(" = "); #line default #line hidden - #line 66 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 66 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expression.Value + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 66 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 66 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" } } @@ -212,42 +212,42 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 83 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 83 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expressionName)); #line default #line hidden - #line 83 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 83 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(" = new "); #line default #line hidden - #line 83 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 83 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expressionType)); #line default #line hidden - #line 83 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 83 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" WriteLine(""); #line default #line hidden - #line 84 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 84 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write("{"); #line default #line hidden - #line 84 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 84 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" } else @@ -257,35 +257,35 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 88 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 88 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write("new "); #line default #line hidden - #line 88 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 88 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expressionType)); #line default #line hidden - #line 88 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 88 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" WriteLine(""); #line default #line hidden - #line 89 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 89 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write("{"); #line default #line hidden - #line 89 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 89 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" } @@ -305,28 +305,28 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 103 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 103 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write("}"); #line default #line hidden - #line 103 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 103 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" #line default #line hidden - #line 104 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 104 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 104 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 104 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" } } @@ -335,7 +335,7 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 1 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" + #line 1 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\CSharpGenerator.tt" private global::EnvDTE.Expression _objectExpressionField; @@ -416,7 +416,7 @@ public virtual void Initialize() /// /// Base class for this transformation /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")] public class CSharpGeneratorBase { #region Fields diff --git a/ObjectExporter.Core/Templates/JsonGenerator.cs b/ObjectExporter.Core/Templates/JsonGenerator.cs index e20a1b6..2efa6cb 100644 --- a/ObjectExporter.Core/Templates/JsonGenerator.cs +++ b/ObjectExporter.Core/Templates/JsonGenerator.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version: 14.0.0.0 +// Runtime Version: 16.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,8 +19,8 @@ namespace ObjectExporter.Core.Templates /// Class to produce the template output /// - #line 1 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "14.0.0.0")] + #line 1 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")] public partial class JsonGenerator : JsonGeneratorBase { #line hidden @@ -30,7 +30,7 @@ public partial class JsonGenerator : JsonGeneratorBase public virtual string TransformText() { - #line 9 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 9 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" ExportMembers(objectExpression, 0, true); #line default @@ -38,7 +38,7 @@ public virtual string TransformText() return this.GenerationEnvironment.ToString(); } - #line 10 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 10 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" bool isFirstElement = true; @@ -71,14 +71,14 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 37 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 37 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(GetSingleTypeValue(expression) + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 37 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 37 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } else @@ -88,35 +88,35 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 41 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 41 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("\""); #line default #line hidden - #line 41 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 41 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expression.Name)); #line default #line hidden - #line 41 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 41 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("\": "); #line default #line hidden - #line 41 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 41 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(GetSingleTypeValue(expression) + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 41 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 41 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } } @@ -130,14 +130,14 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 49 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 49 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expression.Value + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 49 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 49 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } else @@ -147,35 +147,35 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 53 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 53 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("\""); #line default #line hidden - #line 53 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 53 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expression.Name)); #line default #line hidden - #line 53 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 53 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("\": "); #line default #line hidden - #line 53 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 53 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expression.Value + GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 53 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 53 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } } @@ -198,14 +198,14 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 70 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 70 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("["); #line default #line hidden - #line 70 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 70 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } else if(GeneratorHelper.IsTypeOfCollection(expressionType)) @@ -215,42 +215,42 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 74 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 74 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("\""); #line default #line hidden - #line 74 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 74 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(expression.Name)); #line default #line hidden - #line 74 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 74 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("\": "); #line default #line hidden - #line 74 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 74 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" WriteLine(""); #line default #line hidden - #line 75 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 75 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("["); #line default #line hidden - #line 75 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 75 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } else @@ -260,14 +260,14 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 79 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 79 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("{"); #line default #line hidden - #line 79 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 79 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } @@ -287,21 +287,21 @@ public void ExportMembers(Expression expression, int currentDepth, bool isLast) #line default #line hidden - #line 93 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 93 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(GeneratorHelper.WriteCommaIfNotLast(isLast))); #line default #line hidden - #line 93 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 93 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write(" "); #line default #line hidden - #line 93 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 93 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } } @@ -316,14 +316,14 @@ private void TerminateObjectOrCollection(string expressionType) #line default #line hidden - #line 102 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 102 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("]"); #line default #line hidden - #line 102 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 102 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } else @@ -333,14 +333,14 @@ private void TerminateObjectOrCollection(string expressionType) #line default #line hidden - #line 106 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 106 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" this.Write("}"); #line default #line hidden - #line 106 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 106 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" } } @@ -349,7 +349,7 @@ private void TerminateObjectOrCollection(string expressionType) #line default #line hidden - #line 1 "H:\Dropbox\GitHub\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" + #line 1 "C:\Users\Ttaylor\Source\Repos\ObjectExporter\ObjectExporter.Core\Templates\JsonGenerator.tt" private global::EnvDTE.Expression _objectExpressionField; @@ -430,7 +430,7 @@ public virtual void Initialize() /// /// Base class for this transformation /// - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "16.0.0.0")] public class JsonGeneratorBase { #region Fields diff --git a/ObjectExporter.VsPackage/ImageResources.Designer.cs b/ObjectExporter.VsPackage/ImageResources.Designer.cs index 1d99c55..cd58c39 100644 --- a/ObjectExporter.VsPackage/ImageResources.Designer.cs +++ b/ObjectExporter.VsPackage/ImageResources.Designer.cs @@ -19,7 +19,7 @@ namespace ObjectExporter.VsPackage { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class ImageResources { diff --git a/ObjectExporter.VsPackage/ObjectExporter.Package.cs b/ObjectExporter.VsPackage/ObjectExporter.Package.cs index 44a3c18..65cbc01 100644 --- a/ObjectExporter.VsPackage/ObjectExporter.Package.cs +++ b/ObjectExporter.VsPackage/ObjectExporter.Package.cs @@ -3,6 +3,8 @@ using System.Diagnostics; using System.Globalization; using System.Runtime.InteropServices; +using System.Threading; +using System.Threading.Tasks; using EnvDTE; using EnvDTE80; using Microsoft.VisualStudio.Shell; @@ -25,7 +27,7 @@ namespace ObjectExporter.VsPackage /// // This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is // a package. - [PackageRegistration(UseManagedResourcesOnly = true)] + [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)] // This attribute is used to register the information needed to show this package // in the Help/About dialog of Visual Studio. [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] @@ -33,10 +35,10 @@ namespace ObjectExporter.VsPackage [ProvideMenuResource("Menus.ctmenu", 1)] [Guid(GuidList.guidObjectExporter_PkgString)] //Used for the hidden menu item - [ProvideAutoLoad(UIContextGuids80.SolutionExists)] + [ProvideAutoLoad(UIContextGuids80.SolutionExists, PackageAutoLoadFlags.BackgroundLoad)] [ProvideOptionPage(typeof(PackageSettings), "Object Exporter", "General", 0, 0, true)] - public sealed class ObjectExporter : Package + public sealed class ObjectExporter : AsyncPackage { private readonly DTE2 _dte2 = GetGlobalService(typeof(DTE)) as DTE2; private PackageSettings _packageSettings; @@ -60,11 +62,8 @@ public ObjectExporter() /// Initialization of the package; this method is called right after the package is sited, so this is the place /// where you can put all the initialization code that rely on services provided by VisualStudio. /// - protected override void Initialize() + protected override System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress progress) { - Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", ToString())); - base.Initialize(); - // Add our command handlers for menu (commands must exist in the .vsct file) OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService; if (null != mcs) @@ -88,6 +87,8 @@ protected override void Initialize() }; Raygun.Initialize(info); + + return base.InitializeAsync(cancellationToken, progress); } void menuItem_BeforeQueryStatus(object sender, EventArgs e) diff --git a/ObjectExporter.VsPackage/ObjectExporter.VsPackage.csproj b/ObjectExporter.VsPackage/ObjectExporter.VsPackage.csproj index c00647f..f7033f4 100644 --- a/ObjectExporter.VsPackage/ObjectExporter.VsPackage.csproj +++ b/ObjectExporter.VsPackage/ObjectExporter.VsPackage.csproj @@ -46,7 +46,7 @@ ObjectExporter True Key.snk - v4.5 + v4.7.2 true @@ -87,13 +87,11 @@ False - - False - ..\lib\Microsoft.VisualStudio.Shell.11.0.dll - + False + diff --git a/ObjectExporter.VsPackage/VSPackage.Designer.cs b/ObjectExporter.VsPackage/VSPackage.Designer.cs index 8ee2d03..fbc62bf 100644 --- a/ObjectExporter.VsPackage/VSPackage.Designer.cs +++ b/ObjectExporter.VsPackage/VSPackage.Designer.cs @@ -19,7 +19,7 @@ namespace ObjectExporter.VsPackage { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class VSPackage { diff --git a/ObjectExporter.VsPackage/app.config b/ObjectExporter.VsPackage/app.config index 74fa1a5..7645762 100644 --- a/ObjectExporter.VsPackage/app.config +++ b/ObjectExporter.VsPackage/app.config @@ -1,8 +1,8 @@ - + -
+
@@ -15,13 +15,13 @@ - - + + - - + + - \ No newline at end of file + diff --git a/ObjectExporter.VsPackage/source.extension.vsixmanifest b/ObjectExporter.VsPackage/source.extension.vsixmanifest index 9e99dd9..6aad2fb 100644 --- a/ObjectExporter.VsPackage/source.extension.vsixmanifest +++ b/ObjectExporter.VsPackage/source.extension.vsixmanifest @@ -13,7 +13,7 @@ Object Exporter, Serialize, Serializer, Save, Object, Export, Debugger, XML, Debugging, C#, JSON, CSharp, Watch, Locals, Generate, Autos, Immediate - + @@ -22,6 +22,6 @@ - + diff --git a/ObjectExporter.sln b/ObjectExporter.sln index 938950c..f43e4e2 100644 --- a/ObjectExporter.sln +++ b/ObjectExporter.sln @@ -1,10 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26206.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.156 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EBA56731-B3A8-47FC-A5BA-07A26A7926E8}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{B283BD4B-FB2D-4FE2-B8F4-0DB6F79F645F}" ProjectSection(SolutionItems) = preProject lib\Telerik\Telerik.WinControls.dll = lib\Telerik\Telerik.WinControls.dll @@ -25,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectExporter.VsPackage", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectExporter.Core", "ObjectExporter.Core\ObjectExporter.Core.csproj", "{29D6D910-2865-4243-AABE-31E8180DE906}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectExporter.Test", "ObjectExporter.Test\ObjectExporter.Test.csproj", "{526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -59,16 +55,6 @@ Global {29D6D910-2865-4243-AABE-31E8180DE906}.Release|ARM.ActiveCfg = Release|Any CPU {29D6D910-2865-4243-AABE-31E8180DE906}.Release|x64.ActiveCfg = Release|Any CPU {29D6D910-2865-4243-AABE-31E8180DE906}.Release|x86.ActiveCfg = Release|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Debug|x64.ActiveCfg = Debug|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Debug|x86.ActiveCfg = Debug|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Release|Any CPU.Build.0 = Release|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Release|ARM.ActiveCfg = Release|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Release|x64.ActiveCfg = Release|Any CPU - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -76,6 +62,8 @@ Global GlobalSection(NestedProjects) = preSolution {4327676D-2B8D-42C9-AF0D-833D7812C15E} = {14FBF15E-5665-45A1-99E9-E36029AA11C1} {29D6D910-2865-4243-AABE-31E8180DE906} = {14FBF15E-5665-45A1-99E9-E36029AA11C1} - {526521E3-EE0C-4E2F-80C1-CC3BFC8991F1} = {EBA56731-B3A8-47FC-A5BA-07A26A7926E8} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E0AEE3DB-D6F5-4846-B5D4-318D1E18A46E} EndGlobalSection EndGlobal