Merge remote-tracking branch 'jdhardy/cp35119-update-version' into ip…

…y-2.7-maint
IronLanguages · May 25, 2014 · d01c3ed · d01c3ed
2 parents 384d861 + 14298b4
commit d01c3ed
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 5 deletions.
diff --git a/CurrentVersion.props b/CurrentVersion.props
@@ -5,8 +5,8 @@
     <MinorVersion>7</MinorVersion>
     <MicroVersion>5</MicroVersion>
     <ReleaseLevel>beta</ReleaseLevel>
-    <ReleaseSerial>1</ReleaseSerial>
+    <ReleaseSerial>2</ReleaseSerial>
 
-    <AssemblyRevision>40</AssemblyRevision>
+    <AssemblyRevision>0</AssemblyRevision>
   </PropertyGroup>
 </Project>
diff --git a/Languages/IronPython/IronPython.Modules/IronPython.Modules.csproj b/Languages/IronPython/IronPython.Modules/IronPython.Modules.csproj
@@ -156,6 +156,9 @@
   <ItemGroup>
     <None Include="IronPython.Modules.ruleset" />
   </ItemGroup>
+  <ItemGroup>
+    <PolicyFile Include="policy.$(AssemblyName).config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Runtime\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj" Condition="'$(FeatureCoreDlr)' != 'true'">
       <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project>
@@ -180,4 +183,5 @@
   <Import Project="$(CSharpTargets)" />
   <Import Project="$(SolutionDir)Versioning.targets" />
   <Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo" />
+  <Target Name="AfterBuild" DependsOnTargets="GeneratePolicy" />
 </Project>
diff --git a/Languages/IronPython/IronPython.Modules/policy.IronPython.Modules.config b/Languages/IronPython/IronPython.Modules/policy.IronPython.Modules.config
@@ -0,0 +1,13 @@
+<configuration>
+   <runtime>
+     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+       <dependentAssembly>
+         <assemblyIdentity name="IronPython.Modules"
+                           publicKeyToken="7f709c5b713576e1"
+                           culture="neutral" />
+         <bindingRedirect oldVersion="2.7.0.40"
+                          newVersion="2.7.5.0"/>
+       </dependentAssembly>
+     </assemblyBinding>
+   </runtime>
+</configuration>
diff --git a/Languages/IronPython/IronPython/IronPython.csproj b/Languages/IronPython/IronPython/IronPython.csproj
@@ -521,6 +521,9 @@
     <None Include="IronPython.ruleset" />
     <EmbeddedResource Include="Modules\unicodedata\IPyUnicodeData.txt.gz" />
   </ItemGroup>
+  <ItemGroup>
+    <PolicyFile Include="policy.$(AssemblyName).config" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
@@ -546,4 +549,5 @@
   <Import Project="$(CSharpTargets)" />
   <Import Project="$(SolutionDir)Versioning.targets" />
   <Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo;GenerateCurrentVersion" />
+  <Target Name="AfterBuild" DependsOnTargets="GeneratePolicy" />
 </Project>
diff --git a/Languages/IronPython/IronPython/policy.IronPython.config b/Languages/IronPython/IronPython/policy.IronPython.config
@@ -0,0 +1,13 @@
+<configuration>
+   <runtime>
+     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+       <dependentAssembly>
+         <assemblyIdentity name="IronPython"
+                           publicKeyToken="7f709c5b713576e1"
+                           culture="neutral" />
+         <bindingRedirect oldVersion="2.7.0.40"
+                          newVersion="2.7.5.0"/>
+       </dependentAssembly>
+     </assemblyBinding>
+   </runtime>
+</configuration>
diff --git a/Msi/Python/IronPython.Installer.wixproj b/Msi/Python/IronPython.Installer.wixproj
@@ -18,6 +18,7 @@
     <WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
 
     <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>
     <SetMsiAssemblyNameFileVersion>True</SetMsiAssemblyNameFileVersion>
@@ -34,6 +35,10 @@
       <Value>$(MajorVersion).$(MinorVersion)</Value>
     </WixConstant>
 
+    <WixConstant Include="BuildDir">
+      <Value>$(BuildDir)</Value>
+    </WixConstant>
+
     <!-- These are needed by HarvestDirectory, one for each directory. -->
     <WixConstant Include="DocDir">
       <Value>Doc</Value>

diff --git a/Msi/Python/IronPython.wxs b/Msi/Python/IronPython.wxs
@@ -92,11 +92,25 @@
         </File>
       </Component>
 
+      <Component Guid="{40B104FB-E966-425C-A960-7DB19E3344E3}">
+        <File Id="policy.$(var.ReleaseSeries).IronPython.dll" KeyPath="yes" 
+              Source="$(var.BuildDir)\policy.$(var.ReleaseSeries).IronPython.dll" Assembly=".net" />
+        <File Id="policy.$(var.ReleaseSeries).IronPython.config" KeyPath="no" 
+              Source="$(var.BuildDir)\policy.IronPython.config" />
+      </Component>
+
       <Component Guid="{24B20236-2211-46B6-816E-A2118BDE76C9}">
         <File Id="gac_IronPython.Modules.dll" Name="IronPython.Modules.dll" Assembly=".net" KeyPath="yes">
           <netfx:NativeImage Id="ngen_IronPython.Modules.dll" Platform="all" AppBaseDirectory="INSTALLDIR"/>
         </File>
       </Component>
+
+      <Component Guid="{9883A38B-A77C-4818-A13E-029F33A2D914}">
+        <File Id="policy.$(var.ReleaseSeries).IronPython.Modules.dll" KeyPath="yes" 
+              Source="$(var.BuildDir)\policy.$(var.ReleaseSeries).IronPython.Modules.dll" Assembly=".net" />
+        <File Id="policy.$(var.ReleaseSeries).IronPython.Modules.config" KeyPath="no" 
+              Source="$(var.BuildDir)\policy.IronPython.Modules.config" />
+      </Component>
     </DirectoryRef>
 
     <ComponentGroup Id="IronPython">
@@ -117,7 +131,9 @@
 
     <ComponentGroup Id="IronPythonGac">
       <ComponentRef Id="gac_IronPython.dll"/>
+      <ComponentRef Id="policy.$(var.ReleaseSeries).IronPython.dll"/>
       <ComponentRef Id="gac_IronPython.Modules.dll"/>
+      <ComponentRef Id="policy.$(var.ReleaseSeries).IronPython.Modules.dll"/>
     </ComponentGroup>
   </Fragment>
 </Wix>
diff --git a/Solutions/Build.IronPython.proj b/Solutions/Build.IronPython.proj
@@ -36,7 +36,7 @@
       <Properties>Configuration=Silverlight5$(BaseConfiguration)</Properties>
     </BuildProject>
     <InstallerProject Include="$(BaseDir)\Msi\Python\IronPython.Installer.wixproj">
-      <Properties>Configuration=$(BaseConfiguration);BaseInputPaths=$(StageDir);WixToolPath=$(UtilDir)\Wix35\;OutputPath=$(PackageDir)</Properties>
+      <Properties>Configuration=$(BaseConfiguration);BaseInputPaths=$(StageDir);WixToolPath=$(UtilDir)\Wix35\;OutputPath=$(PackageDir);BuildDir=$(BuildDir)</Properties>
     </InstallerProject>
   </ItemGroup>
 

diff --git a/Solutions/Templates/CurrentVersion.Template.cs b/Solutions/Templates/CurrentVersion.Template.cs
@@ -13,9 +13,9 @@ public static class CurrentVersion {{
         public const string DisplayName = "IronPython {6}";
 
 #if !SILVERLIGHT
-        public const string AssemblyVersion = "{0}.{1}.0.{7}";
+        public const string AssemblyVersion = "{0}.{1}.{2}.{7}";
 #else
-        public const string AssemblyVersion = "{0}.{1}.1300.{7}";
+        public const string AssemblyVersion = "{0}.{1}.130{2}.{7}";
 #endif
 
         public const string AssemblyFileVersion = "{0}.{1}.{2}.{8}";

diff --git a/Solutions/Versioning.targets b/Solutions/Versioning.targets
@@ -43,4 +43,20 @@
                     OutputFile="Properties\BuildInfo.Generated.cs"
                     Parameters="$(Configuration)" />
   </Target>
+
+  <ItemGroup>
+    <PolicyFileOutput Include="@(PolicyFile->'$(OutputPath)\%(Filename)%(Extension)')" />
+    <PolicyAssemblyOutput Include="$(OutputPath)\policy.$(MajorVersion).$(MinorVersion).$(AssemblyName).dll" />
+  </ItemGroup>
+
+  <Target Name="GeneratePolicy"
+          Inputs="@(PolicyFile)"
+          Outputs="@(PolicyFileOutput);@(PolicyAssemblyOutput)">
+    <Copy SourceFiles="@(PolicyFile)"
+          DestinationFiles="@(PolicyFileOutput)" />
+    <Al LinkResources="@(PolicyFile)"
+        OutputAssembly="@(PolicyAssemblyOutput)"
+        Platform="$(Platform)"
+        KeyFile="$(PublicKey)" />
+  </Target>
 </Project>