Skip to content
This repository has been archived by the owner on Sep 14, 2018. It is now read-only.

Commit

Permalink
Prepare for RC
Browse files Browse the repository at this point in the history
  • Loading branch information
slide committed Oct 16, 2016
1 parent b31b0ad commit 3d98947
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
14 changes: 7 additions & 7 deletions CurrentVersion.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
<PropertyGroup>
<MajorVersion>2</MajorVersion>
<MinorVersion>7</MinorVersion>
<MicroVersion>6</MicroVersion>
<MicroVersion>7</MicroVersion>
<!-- Allowed: alpha,beta,candidate,final -->
<ReleaseLevel>final</ReleaseLevel>
<ReleaseSerial>3</ReleaseSerial>
<ReleaseLevel>candidate</ReleaseLevel>
<ReleaseSerial>0</ReleaseSerial>

<AssemblyRevision>3</AssemblyRevision>
<AssemblyRevision>0</AssemblyRevision>
</PropertyGroup>
<PropertyGroup>
<DlrMajorVersion>1</DlrMajorVersion>
<DlrMinorVersion>1</DlrMinorVersion>
<DlrMicroVersion>1</DlrMicroVersion>
<!-- Allowed: alpha,beta,candidate,final -->
<DlrReleaseLevel>final</DlrReleaseLevel>
<DlrReleaseSerial>1</DlrReleaseSerial>
<DlrReleaseLevel>candidate</DlrReleaseLevel>
<DlrReleaseSerial>0</DlrReleaseSerial>

<DlrAssemblyRevision>21</DlrAssemblyRevision>
<DlrAssemblyRevision>22</DlrAssemblyRevision>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions Languages/IronPython/App.Debug.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Debug version of App.Config -->
<configuration>
<configSections>
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.1.21, Culture=neutral, PublicKeyToken=cde11cd8ecc94417" requirePermission="false"/>
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.1.22, Culture=neutral, PublicKeyToken=cde11cd8ecc94417" requirePermission="false"/>
</configSections>

<!-- Enable mixed-mode CLRv2 assemblies. -->
Expand All @@ -17,7 +17,7 @@

<microsoft.scripting>
<languages>
<language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.7" type="IronPython.Runtime.PythonContext, IronPython, Version=2.7.6.3, Culture=neutral, PublicKeyToken=cde11cd8ecc94417"/>
<language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.7" type="IronPython.Runtime.PythonContext, IronPython, Version=2.7.7.0, Culture=neutral, PublicKeyToken=cde11cd8ecc94417"/>
</languages>
</microsoft.scripting>
</configuration>
4 changes: 2 additions & 2 deletions Languages/IronPython/App.Release.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Release version of App.config -->
<configuration>
<configSections>
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.1.21, Culture=neutral, PublicKeyToken=7f709c5b713576e1" requirePermission="false"/>
<section name="microsoft.scripting" type="Microsoft.Scripting.Hosting.Configuration.Section, Microsoft.Scripting, Version=1.1.1.22, Culture=neutral, PublicKeyToken=7f709c5b713576e1" requirePermission="false"/>
</configSections>

<!-- Enable mixed-mode CLRv2 assemblies. -->
Expand All @@ -17,7 +17,7 @@

<microsoft.scripting>
<languages>
<language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.7" type="IronPython.Runtime.PythonContext, IronPython, Version=2.7.6.3, Culture=neutral, PublicKeyToken=7f709c5b713576e1"/>
<language names="IronPython;Python;py" extensions=".py" displayName="IronPython 2.7" type="IronPython.Runtime.PythonContext, IronPython, Version=2.7.7.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1"/>
</languages>
</microsoft.scripting>
</configuration>
4 changes: 2 additions & 2 deletions Msi/Python/IronPython.Installer.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

<BaseInputPaths Condition=" '$(BaseInputPaths)' == '' ">$(MSBuildProjectDirectory)\..\..\Stage\$(Configuration)\IronPython-$(DisplayVersion)</BaseInputPaths>
<BuildDir Condition=" '$(BuildDir)' == '' ">$(MSBuildProjectDirectory)\..\..\bin\$(Configuration)</BuildDir>

<MsiVersion Condition=" '$(MsiVersion)' == '' ">$(MajorVersion).$(MinorVersion).$(MicroVersion)$(AssemblyFileRevision).0</MsiVersion>
<MsiVersion Condition=" '$(MsiVersion)' == '' ">$(MajorVersion).$(MinorVersion).$(MicroVersion).$(AssemblyFileRevision)</MsiVersion>
<SetMsiAssemblyNameFileVersion>True</SetMsiAssemblyNameFileVersion>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions Runtime/Microsoft.Dynamic/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Runtime/Microsoft.Scripting.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand All @@ -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")]

6 changes: 3 additions & 3 deletions Runtime/Microsoft.Scripting/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Test/TestRunner/TestRunner/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 3d98947

Please sign in to comment.