Updating V8 Addon

BuildPackages/Optimus.AddOns.V8JavaScriptEngine/Package.build.xml

@@ -13,9 +13,9 @@
 	<!-- PROPERTIES -->
 	<PropertyGroup>
 		<VersionMajor>1</VersionMajor>
-		<VersionMinor>2</VersionMinor>
+		<VersionMinor>3</VersionMinor>
 		<VersionPatch>0</VersionPatch>
-		<VersionSuffix></VersionSuffix>
+		<VersionSuffix>-beta</VersionSuffix>
 		<UmbracoVersion>6.0.6</UmbracoVersion>
 	</PropertyGroup>
 
@@ -64,10 +64,10 @@
         <Copy SourceFiles="@(PackageFile)" DestinationFolder="$(BuildDir)" />
 
         <ItemGroup>
-            <Noesis Include="$(CoreProjectDir)\Noesis.Javascript\**\*.*" />
+            <ClearScript Include="$(CoreProjectDir)\ClearScript.V8\**\*.*" />
         </ItemGroup>
-        <Copy SourceFiles="@(Noesis)"
-        DestinationFiles="@(Noesis->'$(BuildDir)\Noesis.Javascript\%(RecursiveDir)%(Filename)%(Extension)')" />
+        <Copy SourceFiles="@(ClearScript)"
+        DestinationFiles="@(ClearScript->'$(BuildDir)\ClearScript.V8\%(RecursiveDir)%(Filename)%(Extension)')" />
 
     </Target>
 

Optimus.AddOns.V8JavaScriptEngine/Optimus.AddOns.V8JavaScriptEngine.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,6 +36,9 @@
       <HintPath>..\packages\UmbracoCms.Core.6.0.5\lib\businesslogic.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="ClearScript">
+      <HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.1.8\lib\net40\ClearScript.dll</HintPath>
+    </Reference>
     <Reference Include="ClientDependency.Core">
       <HintPath>..\packages\UmbracoCms.Core.6.0.5\lib\ClientDependency.Core.dll</HintPath>
       <Private>False</Private>
@@ -73,12 +76,10 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="JavaScriptEngineSwitcher.Core">
-      <HintPath>..\packages\JavaScriptEngineSwitcher.Core.0.9.2\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\JavaScriptEngineSwitcher.Core.1.1.3\lib\net40\JavaScriptEngineSwitcher.Core.dll</HintPath>
     </Reference>
-    <Reference Include="JavaScriptEngineSwitcher.V8, Version=0.9.3.0, Culture=neutral, PublicKeyToken=c608b2a8cc9e4472, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\JavaScriptEngineSwitcher.V8.0.9.3\lib\net40\JavaScriptEngineSwitcher.V8.dll</HintPath>
+    <Reference Include="JavaScriptEngineSwitcher.V8">
+      <HintPath>..\packages\JavaScriptEngineSwitcher.V8.1.1.8\lib\net40\JavaScriptEngineSwitcher.V8.dll</HintPath>
     </Reference>
     <Reference Include="log4net">
       <HintPath>..\packages\UmbracoCms.Core.6.0.5\lib\log4net.dll</HintPath>
@@ -229,8 +230,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="Noesis.Javascript\Noesis.Javascript.x64.dll" />
-    <None Include="Noesis.Javascript\Noesis.Javascript.x86.dll" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -240,6 +239,20 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="ClearScript.V8\ClearScriptV8-32.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ClearScript.V8\ClearScriptV8-64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ClearScript.V8\v8-ia32.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ClearScript.V8\v8-x64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>

Optimus.AddOns.V8JavaScriptEngine/Umbraco/Installer/PackageActions.cs

@@ -427,11 +427,13 @@ public bool Execute(string packageName, XmlNode xmlData)
             var addSectionAction = new AddConfigSection();
             var removeSection = addSectionAction.Undo(packageName, xmlData);
             string folderPath = HttpContext.Current.Server.MapPath("/Noesis.Javascript");
+
+            Directory.Delete(folderPath);
 
-            foreach (var subDir in new DirectoryInfo(folderPath).GetDirectories())
-            {
-                subDir.Delete(true);
-            }
+            //foreach (var subDir in new DirectoryInfo(folderPath).GetDirectories())
+            //{
+            //    subDir.Delete(true);
+            //}
             return removeSection;
         }
 

Optimus.AddOns.V8JavaScriptEngine/app.config

@@ -5,6 +5,7 @@
 			<section name="core" type="JavaScriptEngineSwitcher.Core.Configuration.CoreConfiguration, JavaScriptEngineSwitcher.Core" />
 		</sectionGroup>
 	</configSections>
+
   <jsEngineSwitcher xmlns="http://tempuri.org/JavaScriptEngineSwitcher.Configuration.xsd"><core>
 			<engines>
 				<add name="V8JsEngine" type="JavaScriptEngineSwitcher.V8.V8JsEngine, JavaScriptEngineSwitcher.V8" />

Optimus.AddOns.V8JavaScriptEngine/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="JavaScriptEngineSwitcher.Core" version="0.9.2" targetFramework="net45" />
-  <package id="JavaScriptEngineSwitcher.V8" version="0.9.3" targetFramework="net45" />
+  <package id="JavaScriptEngineSwitcher.Core" version="1.1.3" targetFramework="net45" />
+  <package id="JavaScriptEngineSwitcher.V8" version="1.1.8" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net45" />

Optimus.sln

@@ -75,6 +75,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimus.Providers.SassAndSC
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimus.Providers.TypeScript", "BundlingAndMinificationForTheMasses.Providers.Type\Optimus.Providers.TypeScript.csproj", "{034575BA-E003-4C09-BDD2-ECC66B6589C2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimus.AddOns.V8JavaScriptEngine", "Optimus.AddOns.V8JavaScriptEngine\Optimus.AddOns.V8JavaScriptEngine.csproj", "{AB157E90-DC19-4A2B-BD52-4365089F2AB8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -117,6 +119,10 @@ Global
 		{034575BA-E003-4C09-BDD2-ECC66B6589C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{034575BA-E003-4C09-BDD2-ECC66B6589C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{034575BA-E003-4C09-BDD2-ECC66B6589C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB157E90-DC19-4A2B-BD52-4365089F2AB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB157E90-DC19-4A2B-BD52-4365089F2AB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB157E90-DC19-4A2B-BD52-4365089F2AB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB157E90-DC19-4A2B-BD52-4365089F2AB8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE