diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj
index 9ea73bdc..8601510b 100644
--- a/OurUmbraco.Site/OurUmbraco.Site.csproj
+++ b/OurUmbraco.Site/OurUmbraco.Site.csproj
@@ -47,6 +47,10 @@
false
+
+ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll
+ True
+
..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll
True
@@ -172,6 +176,18 @@
..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll
True
+
+ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll
+ True
+
+
+ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll
+ True
+
+
+ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll
+ True
+
..\packages\Microsoft.AspNet.WebHelpers.3.2.3\lib\net45\Microsoft.Web.Helpers.dll
True
@@ -188,8 +204,8 @@
..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll
True
-
- ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
True
@@ -225,11 +241,20 @@
..\packages\UmbracoCms.Core.7.5.6\lib\System.Data.SqlServerCe.Entity.dll
True
+
+
+ ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll
+ True
+
..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
True
+
+ ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll
+ True
+
..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll
@@ -289,6 +314,10 @@
..\packages\UmbracoCms.Core.7.5.6\lib\TidyNet.dll
True
+
+ ..\packages\TweetinviAPI.1.2.0\lib\net45\Tweetinvi.dll
+ True
+
..\packages\UmbracoCms.Core.7.5.6\lib\umbraco.dll
True
@@ -1763,6 +1792,7 @@
+
@@ -4418,6 +4448,7 @@
+
web.config
@@ -4497,8 +4528,10 @@
+
+
+
+
+
+
+
@@ -523,7 +528,7 @@
-
+
diff --git a/OurUmbraco/Our/MigrationsHandler.cs b/OurUmbraco/Our/MigrationsHandler.cs
index ca16d98e..d03cee99 100644
--- a/OurUmbraco/Our/MigrationsHandler.cs
+++ b/OurUmbraco/Our/MigrationsHandler.cs
@@ -37,8 +37,9 @@ namespace OurUmbraco.Our
AddMarkAsSolutionReminderSent();
UseNewLoginForm();
UseNewForgotPasswordForm();
+ TwitterSearchMacro();
}
-
+
private void EnsureMigrationsMarkerPathExists()
{
var path = HostingEnvironment.MapPath(MigrationMarkersPath);
@@ -637,5 +638,40 @@ namespace OurUmbraco.Our
LogHelper.Error(string.Format("Migration: '{0}' failed", migrationName), ex);
}
}
+
+ private void TwitterSearchMacro()
+ {
+ var migrationName = MethodBase.GetCurrentMethod().Name;
+
+ try
+ {
+ var path = HostingEnvironment.MapPath(MigrationMarkersPath + migrationName + ".txt");
+ if (File.Exists(path))
+ return;
+
+ var macroService = ApplicationContext.Current.Services.MacroService;
+ var macroAlias = "TwitterSearchUmbraco";
+ if (macroService.GetByAlias(macroAlias) == null)
+ {
+ // Run migration
+
+ var macro = new Macro
+ {
+ Name = macroAlias,
+ Alias = macroAlias,
+ ScriptingFile = "~/Views/MacroPartials/Community/TwitterSearchUmbraco.cshtml",
+ UseInEditor = true
+ };
+ macro.Save();
+ }
+
+ string[] lines = { "" };
+ File.WriteAllLines(path, lines);
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Error(string.Format("Migration: '{0}' failed", migrationName), ex);
+ }
+ }
}
}
diff --git a/OurUmbraco/OurUmbraco.csproj b/OurUmbraco/OurUmbraco.csproj
index 0f1ff6de..17e63b10 100644
--- a/OurUmbraco/OurUmbraco.csproj
+++ b/OurUmbraco/OurUmbraco.csproj
@@ -12,6 +12,8 @@
v4.5.2
512
+
+
true
@@ -31,6 +33,10 @@
4
+
+ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll
+ True
+
..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll
True
@@ -155,6 +161,18 @@
..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll
True
+
+ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll
+ True
+
+
+ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll
+ True
+
+
+ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll
+ True
+
..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll
True
@@ -167,8 +185,8 @@
..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll
True
-
- ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
True
@@ -206,10 +224,19 @@
+
+
+ ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll
+ True
+
..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
True
+
+ ..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll
+ True
+
@@ -779,6 +806,13 @@
XCOPY "$(ProjectDir)Our\usercontrols\*.ascx" "$(ProjectDir)..\OurUmbraco.Site\usercontrols\our.umbraco.org" /y
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+