Changes DLR version to 1.1.0.30

jschementi · Mar 13, 2011 · baf189f · baf189f
1 parent 6ad0033
commit baf189f
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 21 deletions.
diff --git a/Config/Signed/App.config b/Config/Signed/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <configSections>
-    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false"/>
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false"/>
   </configSections>
 
   <microsoft.scripting>

diff --git a/Config/Unsigned/App.config b/Config/Unsigned/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <configSections>
-    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1" requirePermission="false" />
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=7f709c5b713576e1" requirePermission="false" />
   </configSections>
 
   <microsoft.scripting>

diff --git a/Hosts/IronRuby.Rack/Examples/Sinatra/Web.config b/Hosts/IronRuby.Rack/Examples/Sinatra/Web.config
@@ -2,7 +2,7 @@
 <configuration>
 	<configSections>
 		<!-- custom configuration section for DLR hosting -->
-		<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false"/>
+		<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false"/>
 	</configSections>
 	<system.webServer>
 		<handlers>

diff --git a/Hosts/IronRuby.Rack/ironruby-rack/lib/rack/deploy/template/ir.exe.config.erb b/Hosts/IronRuby.Rack/ironruby-rack/lib/rack/deploy/template/ir.exe.config.erb
@@ -4,7 +4,7 @@
   tweak as necessary based on your setup.
 -->
 <configSections>
-  <section name='microsoft.scripting' requirePermission='false' type='Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=<%= config.public_key_token %>'/>
+  <section name='microsoft.scripting' requirePermission='false' type='Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=<%= config.public_key_token %>'/>
 </configSections>
 
 <microsoft.scripting debugMode="<%= config.dlr_debug %>">

diff --git a/Hosts/MerlinWeb/examples/Web.config b/Hosts/MerlinWeb/examples/Web.config
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <configSections>
-    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false"/>
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false"/>
   </configSections>
   <system.web>
     <compilation debug="false" batch="false" targetFramework="4.0" />

diff --git a/Languages/IronPython/App.config b/Languages/IronPython/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <configSections>
-    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=null" requirePermission="false" />
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=null" requirePermission="false" />
   </configSections>
 
   <microsoft.scripting>

diff --git a/Languages/IronPython/Samples/BadPaint/App.config b/Languages/IronPython/Samples/BadPaint/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <configSections>
-    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
+    <section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" />
   </configSections>
 
   <microsoft.scripting>

diff --git a/Msi/Runtime/DLR.wxs b/Msi/Runtime/DLR.wxs
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-    <Module Id='DynamicLanguageRuntime' Language='1033' Version='1.1.0.20'>
+    <Module Id='DynamicLanguageRuntime' Language='1033' Version='1.1.0.30'>
       <Package Id='4621283F-BB38-4D6F-A7C6-FA1059E2824D' Description='Dynamic Language Runtime Merge Module'
                 Manufacturer='Microsoft Corporation' InstallerVersion='200' />
 

diff --git a/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs
@@ -60,8 +60,8 @@
 [assembly: InternalsVisibleTo("TestInternalDLR, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c10ce00dd2e0ce5046d68183d3ad035b47e92bf0ce7bcf8a03a217ca5d0b0c7db973fdf97579b52b502a23d4069dbf043389e1ab65a1d6c508a9837f3e2350f15e05cc63c0fc4b0410867a51919090e4c33f80203e9b0035b21c32bae20f98b068f90d99a50133a5336480d94039b176519f5fd8524765f33be43da65c4b68ba")]
 
 #if !SILVERLIGHT
-[assembly: AssemblyVersion("1.1.0.20")]
-[assembly: AssemblyFileVersion("1.1.0.20")]
+[assembly: AssemblyVersion("1.1.0.30")]
+[assembly: AssemblyFileVersion("1.1.0.30")]
 [assembly: AssemblyInformationalVersion("1.1")]
 [assembly: AllowPartiallyTrustedCallers]
 [assembly: TypeForwardedTo(typeof(Microsoft.Scripting.Runtime.DynamicStackFrame))]

diff --git a/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs
@@ -55,8 +55,8 @@
 [assembly: System.Resources.NeutralResourcesLanguage("en-US")]
 
 #if !SILVERLIGHT
-[assembly: AssemblyVersion("1.1.0.20")]
-[assembly: AssemblyFileVersion("1.1.0.20")]
+[assembly: AssemblyVersion("1.1.0.30")]
+[assembly: AssemblyFileVersion("1.1.0.30")]
 [assembly: AssemblyInformationalVersion("1.1")]
 [assembly: AllowPartiallyTrustedCallers]
 #endif
diff --git a/Runtime/Microsoft.Scripting.Metadata/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Scripting.Metadata/Properties/AssemblyInfo.cs
@@ -54,7 +54,7 @@
 [assembly: SecurityCritical]
 [assembly: System.Resources.NeutralResourcesLanguage("en-US")]
 [assembly: InternalsVisibleTo("Metadata, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c10ce00dd2e0ce5046d68183d3ad035b47e92bf0ce7bcf8a03a217ca5d0b0c7db973fdf97579b52b502a23d4069dbf043389e1ab65a1d6c508a9837f3e2350f15e05cc63c0fc4b0410867a51919090e4c33f80203e9b0035b21c32bae20f98b068f90d99a50133a5336480d94039b176519f5fd8524765f33be43da65c4b68ba")]
-[assembly: AssemblyVersion("1.1.0.20")]
-[assembly: AssemblyFileVersion("1.1.0.20")]
+[assembly: AssemblyVersion("1.1.0.30")]
+[assembly: AssemblyFileVersion("1.1.0.30")]
 [assembly: AssemblyInformationalVersion("1.1")]
 
diff --git a/Runtime/Microsoft.Scripting/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Scripting/Properties/AssemblyInfo.cs
@@ -59,8 +59,8 @@
 [assembly: InternalsVisibleTo("TestInternalDLR, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c10ce00dd2e0ce5046d68183d3ad035b47e92bf0ce7bcf8a03a217ca5d0b0c7db973fdf97579b52b502a23d4069dbf043389e1ab65a1d6c508a9837f3e2350f15e05cc63c0fc4b0410867a51919090e4c33f80203e9b0035b21c32bae20f98b068f90d99a50133a5336480d94039b176519f5fd8524765f33be43da65c4b68ba")]
 
 #if !SILVERLIGHT
-[assembly: AssemblyVersion("1.1.0.20")]
-[assembly: AssemblyFileVersion("1.1.0.20")]
+[assembly: AssemblyVersion("1.1.0.30")]
+[assembly: AssemblyFileVersion("1.1.0.30")]
 [assembly: AssemblyInformationalVersion("1.1")]
 [assembly: AllowPartiallyTrustedCallers]
 #endif
diff --git a/Runtime/Tests/HostingTest/ScriptRuntimeSetupTestHelper.cs b/Runtime/Tests/HostingTest/ScriptRuntimeSetupTestHelper.cs
@@ -57,7 +57,7 @@ public partial class ScriptRuntimeSetupTest : HAPITestBase {
             string xmlPrefix = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +  
 "<configuration>" +
   "<configSections>"+
-    "<section name=\"microsoft.scripting\" type=\"Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=31bf3856ad364e35\" requirePermission=\"false\" />"+
+    "<section name=\"microsoft.scripting\" type=\"Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.0.30, Culture=neutral, PublicKeyToken=31bf3856ad364e35\" requirePermission=\"false\" />"+
   "</configSections>"+
 
   "<microsoft.scripting>"+
@@ -67,10 +67,6 @@ public partial class ScriptRuntimeSetupTest : HAPITestBase {
   "</microsoft.scripting>"+
 "</configuration>";
 
-    //"<options>"+
-    //  "<set language=\"Ruby\" option=\"LibraryPaths\" value=\"..\\..\\Languages\\Ruby\\libs;..\\..\\External.LCA_RESTRICTED\\Languages\\Ruby\\Ruby-1.8.6p287\\lib\\ruby\\site_ruby\\1.8;..\\..\\..\\External.LCA_RESTRICTED\\Languages\\Ruby\\Ruby-1.8.6p287\\lib\\ruby\\site_ruby;..\\..\\..\\External.LCA_RESTRICTED\\Languages\\Ruby\\Ruby-1.8.6p287\\lib\\ruby\\1.8\" />"+
-    //"</options>"+
-
             StringBuilder ret = new StringBuilder();
             Array.ForEach(langs, lang => ret.AppendLine(lang.ToString()));