Skip to content

Updated VSIX to be compatible with VS2019. (#1) #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated VSIX to be compatible with VS2019. (#1) #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2e7033
Updated VSIX to be compatible with VS2019. (#1)
ToddTaylor Apr 18, 2019
b627d97
Updated package to load asynchronously for better performance in Visu…
Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ ObjectExporter.VsPackage/obj/
ObjectExporter.VsPackage/Resources
ObjectExporter.Core/ApiKeys.cs
ObjectExporter.VsPackage/Documentation/Thumbs.db
/.vs
/packages
8 changes: 3 additions & 5 deletions ObjectExporter.Core/ObjectExporter.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ObjectExporter.Core</RootNamespace>
<AssemblyName>ObjectExporter.Core</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down Expand Up @@ -54,10 +54,7 @@
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Microsoft.VisualStudio.Shell.11.0.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=16.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
Copy link

@hansmbakker hansmbakker Apr 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reference can be better consumed from a NuGet package:
https://www.nuget.org/packages/Microsoft.VisualStudio.Shell.15.0/

<Reference Include="Microsoft.VisualStudio.Shell.Design, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\lib\Microsoft.VisualStudio.Shell.Design.dll</HintPath>
Expand Down Expand Up @@ -127,6 +124,7 @@
</None>
<None Include="Templates\XmlGenerator.tt">
<Generator>TextTemplatingFilePreprocessor</Generator>
<LastGenOutput>XmlGenerator1.cs</LastGenOutput>
Copy link

@hansmbakker hansmbakker Apr 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line may be unneeded

</None>
</ItemGroup>
<ItemGroup>
Expand Down
72 changes: 36 additions & 36 deletions ObjectExporter.Core/Templates/CSharpGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// 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.
Expand All @@ -19,8 +19,8 @@ namespace ObjectExporter.Core.Templates
/// Class to produce the template output
/// </summary>

#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
Expand All @@ -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)
{
Expand All @@ -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);
}
Expand All @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -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"

}
}
Expand All @@ -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
Expand All @@ -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"

}
}
Expand All @@ -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
Expand All @@ -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"

}

Expand All @@ -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"

}
}
Expand All @@ -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;

Expand Down Expand Up @@ -416,7 +416,7 @@ public virtual void Initialize()
/// <summary>
/// Base class for this transformation
/// </summary>
[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
Expand Down
Loading