diff --git a/AutoT4MVC.sln b/AutoT4MVC.sln
index 5f5681a..19c4127 100644
--- a/AutoT4MVC.sln
+++ b/AutoT4MVC.sln
@@ -8,13 +8,19 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug-VS2015|Any CPU = Debug-VS2015|Any CPU
Release|Any CPU = Release|Any CPU
+ Release-VS2015|Any CPU = Release-VS2015|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Debug-VS2015|Any CPU.ActiveCfg = Debug-VS2015|Any CPU
+ {E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Debug-VS2015|Any CPU.Build.0 = Debug-VS2015|Any CPU
{E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Release-VS2015|Any CPU.ActiveCfg = Release-VS2015|Any CPU
+ {E25F1D10-8F69-4FD8-8032-CAFDA99934CC}.Release-VS2015|Any CPU.Build.0 = Release-VS2015|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/AutoT4MVC/AutoT4MVC.csproj b/AutoT4MVC/AutoT4MVC.csproj
index 5af0577..663c20c 100644
--- a/AutoT4MVC/AutoT4MVC.csproj
+++ b/AutoT4MVC/AutoT4MVC.csproj
@@ -51,6 +51,16 @@
4
True
+
+ true
+ full
+ false
+ bin\Debug-VS2015\
+ TRACE;DEBUG;VS2015
+ prompt
+ 4
+ True
+
pdbonly
true
@@ -61,6 +71,16 @@
true
True
+
+ pdbonly
+ true
+ bin\Release-VS2015\
+ TRACE;VS2015
+ prompt
+ 4
+ true
+ True
+
False
@@ -82,7 +102,9 @@
True
-
+
+
+
diff --git a/AutoT4MVC/AutoT4MVCPackage.cs b/AutoT4MVC/AutoT4MVCPackage.cs
index c95a50b..7d50b7c 100644
--- a/AutoT4MVC/AutoT4MVCPackage.cs
+++ b/AutoT4MVC/AutoT4MVCPackage.cs
@@ -3,6 +3,8 @@
using System.ComponentModel.Design;
using System.Linq;
using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
using EnvDTE;
using EnvDTE80;
using Microsoft.VisualStudio;
@@ -17,7 +19,11 @@ namespace AutoT4MVC
[ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExists_string)]
[ProvideOptionPage(typeof (Options), Options.CategoryName, Options.PageName, 1000, 1001, false)]
[ProvideMenuResource("Menus.ctmenu", 1)]
+#if VS2015
+ public sealed class AutoT4MVCPackage : AsyncPackage
+#else
public sealed class AutoT4MVCPackage : Package
+#endif
{
private BuildEvents _buildEvents;
private Controller _controller;
@@ -31,8 +37,14 @@ private Options Options
get { return (Options)GetDialogPage(typeof (Options)); }
}
+#if VS2015
+ protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress progress)
+ {
+ await JoinableTaskFactory.SwitchToMainThreadAsync();
+#else
protected override void Initialize()
{
+#endif
base.Initialize();
_dte = GetService(typeof (SDTE)) as DTE;
diff --git a/AutoT4MVC/source.extension.vsixmanifest b/AutoT4MVC/source.extension.vsixmanifest
index 9041d8e..d9fdd6f 100644
--- a/AutoT4MVC/source.extension.vsixmanifest
+++ b/AutoT4MVC/source.extension.vsixmanifest
@@ -1,27 +1,27 @@
-
-
- AutoT4MVC
- An extension for Visual Studio which automatically runs your T4MVC templates at build time and when you create/remove/rename/save a file that T4MVC cares about.
- http://bennor.github.io/AutoT4MVC/
- LICENCE.txt
- https://github.com/bennor/AutoT4MVC/releases
- noun_project_2223.png
- T4MVC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ AutoT4MVC
+ An extension for Visual Studio which automatically runs your T4MVC templates at build time and when you create/remove/rename/save a file that T4MVC cares about.
+ http://bennor.github.io/AutoT4MVC/
+ LICENCE.txt
+ https://github.com/bennor/AutoT4MVC/releases
+ noun_project_2223.png
+ T4MVC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+