From 728928e580ef75603edb5c38a4d4d82fdae60d83 Mon Sep 17 00:00:00 2001
From: slace <unknown@kiln.example.com>
Date: Mon, 21 Jun 2010 20:57:18 +0000
Subject: [PATCH] fixing the upgrade of the scripting libraries

[TFS Changeset #70615]
---
 config templates/config/scripting.config     |  4 ++--
 umbraco/presentation/config/scripting.config | 14 +++++++-------
 umbraco/presentation/web.STANDARD.config     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config templates/config/scripting.config b/config templates/config/scripting.config
index 31b0dc3e13..97c759b7bc 100644
--- a/config templates/config/scripting.config	
+++ b/config templates/config/scripting.config	
@@ -1,7 +1,7 @@
 <microsoft.scripting>
     <languages>
-      <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.0" type="IronPython.Runtime.PythonContext, IronPython, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby 1.0 Alpha" type="IronRuby.Runtime.RubyContext, IronRuby, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.10920.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby 1.0" type="IronRuby.Runtime.RubyContext, IronRuby, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
    </languages>
 
     <options>
diff --git a/umbraco/presentation/config/scripting.config b/umbraco/presentation/config/scripting.config
index 31b0dc3e13..6de82e06ee 100644
--- a/umbraco/presentation/config/scripting.config
+++ b/umbraco/presentation/config/scripting.config
@@ -1,10 +1,10 @@
 <microsoft.scripting>
-    <languages>
-      <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.0" type="IronPython.Runtime.PythonContext, IronPython, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby 1.0 Alpha" type="IronRuby.Runtime.RubyContext, IronRuby, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-   </languages>
+  <languages>
+    <language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.6" type="IronPython.Runtime.PythonContext, IronPython, Version=2.6.10920.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+    <language names="IronRuby;Ruby;rb" extensions=".rb" displayName="IronRuby 1.0" type="IronRuby.Runtime.RubyContext, IronRuby, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+  </languages>
 
-    <options>
-      <set language="Ruby" option="LibraryPaths" value="..\..\Languages\Ruby\libs\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\1.8\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\1.8\" />
-    </options>
+  <options>
+    <set language="Ruby" option="LibraryPaths" value="..\..\Languages\Ruby\libs\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\1.8\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\site_ruby\;..\..\..\External\Languages\Ruby\ruby-1.8.6\lib\ruby\1.8\" />
+  </options>
 </microsoft.scripting>
\ No newline at end of file
diff --git a/umbraco/presentation/web.STANDARD.config b/umbraco/presentation/web.STANDARD.config
index 085724150a..c0769c0917 100644
--- a/umbraco/presentation/web.STANDARD.config
+++ b/umbraco/presentation/web.STANDARD.config
@@ -2,7 +2,7 @@
 <configuration>
   <configSections >
     <section name="urlrewritingnet" restartOnExternalChanges="true" requirePermission="false" type="UrlRewritingNet.Configuration.UrlRewriteSection, UrlRewritingNet.UrlRewriter" />
-    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=2.6.1003.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
     <!--
       ASPNETAJAX ** DISABLED BY ALEX NORCLIFFE 2010 06 03 FOR COMPATIBILITY WITH RUNNING UNDER .NET 4
       USERS CAN ADD THIS THEMSELVES IF THEY WISH TO USE ASP.NET AJAX