diff --git a/CurrentVersion.props b/CurrentVersion.props index 073b305df8..65e825e274 100644 --- a/CurrentVersion.props +++ b/CurrentVersion.props @@ -3,21 +3,21 @@ 2 7 - 6 + 7 - final - 3 + candidate + 0 - 3 + 0 1 1 1 - final - 1 + candidate + 0 - 21 + 22 diff --git a/Languages/IronPython/App.Debug.config b/Languages/IronPython/App.Debug.config index 62a4752b58..44b2cf1146 100644 --- a/Languages/IronPython/App.Debug.config +++ b/Languages/IronPython/App.Debug.config @@ -2,7 +2,7 @@ -
+
@@ -17,7 +17,7 @@ - + diff --git a/Languages/IronPython/App.Release.config b/Languages/IronPython/App.Release.config index 703ab41a5a..73f44177c8 100644 --- a/Languages/IronPython/App.Release.config +++ b/Languages/IronPython/App.Release.config @@ -2,7 +2,7 @@ -
+
@@ -17,7 +17,7 @@ - + diff --git a/Msi/Python/IronPython.Installer.wixproj b/Msi/Python/IronPython.Installer.wixproj index ef31ac461b..c72332ce7c 100644 --- a/Msi/Python/IronPython.Installer.wixproj +++ b/Msi/Python/IronPython.Installer.wixproj @@ -19,8 +19,8 @@ $(MSBuildProjectDirectory)\..\..\Stage\$(Configuration)\IronPython-$(DisplayVersion) $(MSBuildProjectDirectory)\..\..\bin\$(Configuration) - - $(MajorVersion).$(MinorVersion).$(MicroVersion)$(AssemblyFileRevision).0 + + $(MajorVersion).$(MinorVersion).$(MicroVersion).$(AssemblyFileRevision) True diff --git a/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs index 8e539fe9d3..a1d3870f43 100644 --- a/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs +++ b/Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs @@ -59,8 +59,8 @@ [assembly: InternalsVisibleTo("TestInternalDLR, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c10ce00dd2e0ce5046d68183d3ad035b47e92bf0ce7bcf8a03a217ca5d0b0c7db973fdf97579b52b502a23d4069dbf043389e1ab65a1d6c508a9837f3e2350f15e05cc63c0fc4b0410867a51919090e4c33f80203e9b0035b21c32bae20f98b068f90d99a50133a5336480d94039b176519f5fd8524765f33be43da65c4b68ba")] #if !SILVERLIGHT -[assembly: AssemblyVersion("1.1.1.21")] -[assembly: AssemblyFileVersion("1.1.1.21")] +[assembly: AssemblyVersion("1.1.1.22")] +[assembly: AssemblyFileVersion("1.1.1.22")] [assembly: AssemblyInformationalVersion("1.1")] #endif diff --git a/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs index 547ec99ae6..223e9b0fb0 100644 --- 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.21")] +[assembly: AssemblyVersion("1.1.1.22")] +[assembly: AssemblyFileVersion("1.1.1.22")] [assembly: AssemblyInformationalVersion("1.1")] #endif diff --git a/Runtime/Microsoft.Scripting.Metadata/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Scripting.Metadata/Properties/AssemblyInfo.cs index 49bdf6c997..ee55d2e89b 100644 --- a/Runtime/Microsoft.Scripting.Metadata/Properties/AssemblyInfo.cs +++ b/Runtime/Microsoft.Scripting.Metadata/Properties/AssemblyInfo.cs @@ -28,7 +28,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft.Scripting.Metadata")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] +[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -54,7 +54,7 @@ [assembly: SecurityCritical] [assembly: System.Resources.NeutralResourcesLanguage("en-US")] [assembly: InternalsVisibleTo("Metadata, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c10ce00dd2e0ce5046d68183d3ad035b47e92bf0ce7bcf8a03a217ca5d0b0c7db973fdf97579b52b502a23d4069dbf043389e1ab65a1d6c508a9837f3e2350f15e05cc63c0fc4b0410867a51919090e4c33f80203e9b0035b21c32bae20f98b068f90d99a50133a5336480d94039b176519f5fd8524765f33be43da65c4b68ba")] -[assembly: AssemblyVersion("1.1.1.21")] -[assembly: AssemblyFileVersion("1.1.1.21")] +[assembly: AssemblyVersion("1.1.1.22")] +[assembly: AssemblyFileVersion("1.1.1.22")] [assembly: AssemblyInformationalVersion("1.1")] diff --git a/Runtime/Microsoft.Scripting/Properties/AssemblyInfo.cs b/Runtime/Microsoft.Scripting/Properties/AssemblyInfo.cs index bb833d2af5..e68564cda8 100644 --- a/Runtime/Microsoft.Scripting/Properties/AssemblyInfo.cs +++ b/Runtime/Microsoft.Scripting/Properties/AssemblyInfo.cs @@ -27,7 +27,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Microsoft.Scripting")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] +[assembly: AssemblyCopyright("� Microsoft Corporation. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -51,8 +51,8 @@ #endif #if !SILVERLIGHT -[assembly: AssemblyVersion("1.1.1.21")] -[assembly: AssemblyFileVersion("1.1.1.21")] +[assembly: AssemblyVersion("1.1.1.22")] +[assembly: AssemblyFileVersion("1.1.1.22")] [assembly: AssemblyInformationalVersion("1.1")] #endif diff --git a/Test/TestRunner/TestRunner/Program.cs b/Test/TestRunner/TestRunner/Program.cs index 4f3663ff32..35ae51e3cc 100644 --- a/Test/TestRunner/TestRunner/Program.cs +++ b/Test/TestRunner/TestRunner/Program.cs @@ -283,7 +283,7 @@ private void RunTestForConsole(Test test) { lock (this) { if (!_quiet) { if (_verbose) { - const string resultFormat = "{0,-25}"; + const string resultFormat = "{0,-20}"; var originalColor = Console.ForegroundColor; switch (result.Status) { case TestResultStatus.Skipped: