2.7.7 RC1

IronLanguages · Oct 22, 2016 · 3314ac7 · 3314ac7
1 parent bd98ae7
commit 3314ac7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/CurrentVersion.props b/CurrentVersion.props
@@ -6,7 +6,7 @@
     <MicroVersion>7</MicroVersion>
     <!-- Allowed: alpha,beta,candidate,final -->
     <ReleaseLevel>candidate</ReleaseLevel>
-    <ReleaseSerial>0</ReleaseSerial>
+    <ReleaseSerial>1</ReleaseSerial>
 
     <AssemblyRevision>0</AssemblyRevision>
   </PropertyGroup>
@@ -16,7 +16,7 @@
     <DlrMicroVersion>1</DlrMicroVersion>
     <!-- Allowed: alpha,beta,candidate,final -->
     <DlrReleaseLevel>candidate</DlrReleaseLevel>
-    <DlrReleaseSerial>0</DlrReleaseSerial>
+    <DlrReleaseSerial>1</DlrReleaseSerial>
 
     <DlrAssemblyRevision>22</DlrAssemblyRevision>
   </PropertyGroup>

diff --git a/Languages/IronPython/IronPython.StdLib.nuspec b/Languages/IronPython/IronPython.StdLib.nuspec
@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>IronPython.StdLib</id>
     <title>IronPython Standard Library</title>
-    <version>2.7.0</version>
+    <version>2.7.7</version>
     <authors>IronPython Contributors,Python Contributors</authors>
     <owners>IronPython Community</owners>
     <projectUrl>http://ironpython.net</projectUrl>
@@ -14,7 +14,7 @@
     <language>en-US</language>
     <tags>ironpython python dynamic dlr standard library</tags>
     <dependencies>
-      <dependency id="IronPython" version="2.7.0" />
+      <dependency id="IronPython" version="2.7.7" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Languages/IronPython/IronPython.nuspec b/Languages/IronPython/IronPython.nuspec
@@ -3,7 +3,7 @@
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>IronPython</id>
     <title>IronPython</title>
-    <version>2.7.0</version>
+    <version>2.7.7</version>
     <authors>IronPython Contributors,Microsoft</authors>
     <owners>IronPython Community</owners>
     <projectUrl>http://ironpython.net</projectUrl>
@@ -14,7 +14,7 @@
     <language>en-US</language>
     <tags>ironpython python dynamic dlr</tags>
     <dependencies>
-      <dependency id="DynamicLanguageRuntime" version="1.1.0" />
+      <dependency id="DynamicLanguageRuntime" version="1.1.1" />
     </dependencies>
   </metadata>
   <files>

diff --git a/Languages/IronPython/Scripts/test_parrot.py b/Languages/IronPython/Scripts/test_parrot.py
@@ -19,8 +19,8 @@
 """
 
 from time import clock
-import sys, nt
-sys.path.append([nt.environ[x] for x in nt.environ.keys() if x.lower() == "dlr_root"][0] + "\\Languages\\IronPython\\External\\parrotbench")
+import sys, os
+sys.path.append(os.path.join([os.environ[x] for x in os.environ.keys() if x.lower() == "dlr_root"][0], "Languages", "IronPython", "External", "parrotbench"))
 if sys.platform=="cli":
     import System
     is_cli64 = System.IntPtr.Size == 8

diff --git a/Package/msi/Python/IronPython.Installer.wixproj b/Package/msi/Python/IronPython.Installer.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)..\..\Solutions\Versioning.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\Solutions\Versioning.targets" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>