Add the proper version information to IronPython.SQLite, and dump it and

IronPython.Wpf in the right build directory. (cherry picked from commit 585a5ad)
jdhardy · Mar 4, 2012 · adfba80 · adfba80
1 parent d0bebaf
commit adfba80
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/Languages/IronPython/IronPython.SQLite/IronPython.SQLite.csproj b/Languages/IronPython/IronPython.SQLite/IronPython.SQLite.csproj
@@ -5,11 +5,11 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4A617A40-2BA7-4713-AAFE-F90C4325C581}</ProjectGuid>
     <OutputType>Library</OutputType>
+    <OutputPath>$(OutputPath)\DLLs</OutputPath>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>IronPython.SQLite</RootNamespace>
     <AssemblyName>IronPython.SQLite</AssemblyName>
-    <DocumentationFile>$(SolutionDir)..\bin\$(Configuration)\IronPython.SQLite.xml</DocumentationFile>
-    <OutputPath>$(OutputPath)\DLLs</OutputPath>
+    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
     <SQLiteCommon>SQLITE_DEBUG;TRUE;WIN32;_MSC_VER;SQLITE_ASCII;SQLITE_MEM_POOL;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF</SQLiteCommon>
     <SQLiteCommonOmit>SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL</SQLiteCommonOmit>
     <NoWarn>$(NoWarn);0168 ; 0169; 0414; 0618; 0649; 1587;219</NoWarn>
@@ -76,6 +76,9 @@
     <Reference Include="System.Management" Condition=" '$(IsFullFramework)' == 'true'" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\AssemblyVersion.cs">
+      <Link>Properties\AssemblyVersion.cs</Link>
+    </Compile>
     <Compile Include="c#sqlite\alter_c.cs" />
     <Compile Include="c#sqlite\analyze_c.cs" />
     <Compile Include="c#sqlite\attach_c.cs" />

diff --git a/Languages/IronPython/IronPython.Wpf/IronPython.Wpf.csproj b/Languages/IronPython/IronPython.Wpf/IronPython.Wpf.csproj
@@ -5,17 +5,19 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65E997B7-E99B-4C83-B29E-9951429BB293}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <OutputPath>$(SolutionDir)..\bin\$(Configuration)\DLLs\</OutputPath>
+    <OutputPath>$(OutputPath)\DLLs</OutputPath>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>IronPython.Wpf</RootNamespace>
     <AssemblyName>IronPython.Wpf</AssemblyName>
-    <DocumentationFile>$(SolutionDir)..\bin\$(Configuration)\IronPython.Wpf.xml</DocumentationFile>
+    <DocumentationFile>$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
     <BaseAddress>885063680</BaseAddress>
-    <OutputPath>$(OutputPath)\DLLs</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\BuildInfo.Generated.cs" />
@@ -53,6 +55,7 @@
     <Reference Include="PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, ProcessorArchitecture=MSIL">
       <SpecificVersion>True</SpecificVersion>
       <HintPath>$(WpfReferences)\PresentationCore.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, ProcessorArchitecture=MSIL">
       <SpecificVersion>True</SpecificVersion>
@@ -66,4 +69,4 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)Versioning.targets" />
   <Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo" />
-</Project>
+</Project>
diff --git a/Solutions/Versioning.targets b/Solutions/Versioning.targets
@@ -27,7 +27,7 @@
 
   <Target Name="GenerateCurrentVersion"
           DependsOnTargets="Bootstrap"
-          Inputs="$(MSBuildThisFileDirectory)..\CurrentVersion.props;@(CurrentVersionTemplate)"
+          Inputs="$(MSBuildThisFileDirectory)..\CurrentVersion.props;@(CurrentVersionTemplate);$(MSBuildThisFile)"
           Outputs="Properties\CurrentVersion.Generated.cs">
     <FormatTemplate TemplateFile="@(CurrentVersionTemplate)"
                     OutputFile="Properties\CurrentVersion.Generated.cs"
@@ -36,10 +36,10 @@
 
   <Target Name="GenerateBuildInfo"
           DependsOnTargets="Bootstrap"
-          Inputs="$(MSBuildThisFileDirectory)..\CurrentVersion.props;@(BuildInfoTemplate)"
+          Inputs="$(MSBuildThisFileDirectory)..\CurrentVersion.props;@(BuildInfoTemplate);$(MSBuildThisFile)"
           Outputs="Properties\BuildInfo.Generated.cs">
     <FormatTemplate TemplateFile="@(BuildInfoTemplate)"
                     OutputFile="Properties\BuildInfo.Generated.cs"
-                    Parameters="'$(Configuration)'" />
+                    Parameters="$(Configuration)" />
   </Target>
 </Project>