Changeset 4149


Ignore:
Timestamp:
08/04/10 15:30:18 (12 years ago)
Author:
abeham
Message:

#1128

  • upgraded tools solution and configmerger project
Location:
trunk/tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/ConfigMerger/ConfigMerger.csproj

    r2260 r4149  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     
    1616    <AssemblyOriginatorKeyFile>HeuristicLab.snk</AssemblyOriginatorKeyFile>
    1717    <StartupObject>HeuristicLab.Tools.ConfigMerger.ConfigMerger</StartupObject>
     18    <FileUpgradeFlags>
     19    </FileUpgradeFlags>
     20    <OldToolsVersion>3.5</OldToolsVersion>
     21    <UpgradeBackupLocation />
     22    <PublishUrl>publish\</PublishUrl>
     23    <Install>true</Install>
     24    <InstallFrom>Disk</InstallFrom>
     25    <UpdateEnabled>false</UpdateEnabled>
     26    <UpdateMode>Foreground</UpdateMode>
     27    <UpdateInterval>7</UpdateInterval>
     28    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     29    <UpdatePeriodically>false</UpdatePeriodically>
     30    <UpdateRequired>false</UpdateRequired>
     31    <MapFileExtensions>true</MapFileExtensions>
     32    <ApplicationRevision>0</ApplicationRevision>
     33    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     34    <IsWebBootstrapper>false</IsWebBootstrapper>
     35    <UseApplicationTrust>false</UseApplicationTrust>
     36    <BootstrapperEnabled>true</BootstrapperEnabled>
    1837  </PropertyGroup>
    1938  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2544    <ErrorReport>prompt</ErrorReport>
    2645    <WarningLevel>4</WarningLevel>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2747  </PropertyGroup>
    2848  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3454    <WarningLevel>4</WarningLevel>
    3555    <DocumentationFile>bin\Release\ConfigMerger.XML</DocumentationFile>
     56    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3657  </PropertyGroup>
    3758  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     
    4263    <PlatformTarget>x86</PlatformTarget>
    4364    <ErrorReport>prompt</ErrorReport>
     65    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4466  </PropertyGroup>
    4567  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     
    5173    <PlatformTarget>x86</PlatformTarget>
    5274    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5376  </PropertyGroup>
    5477  <ItemGroup>
     
    7497    <None Include="Properties\AssemblyInfo.frame" />
    7598  </ItemGroup>
     99  <ItemGroup>
     100    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     101      <Visible>False</Visible>
     102      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     103      <Install>false</Install>
     104    </BootstrapperPackage>
     105    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     106      <Visible>False</Visible>
     107      <ProductName>.NET Framework 3.5 SP1</ProductName>
     108      <Install>true</Install>
     109    </BootstrapperPackage>
     110    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     111      <Visible>False</Visible>
     112      <ProductName>Windows Installer 3.1</ProductName>
     113      <Install>true</Install>
     114    </BootstrapperPackage>
     115  </ItemGroup>
    76116  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    77117  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • trunk/tools/Tools.sln

    r3587 r4149  
    11
    2 Microsoft Visual Studio Solution File, Format Version 10.00
    3 # Visual Studio 2008
    4 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigMerger", "ConfigMerger\ConfigMerger.csproj", "{E94C5E71-3F29-408D-BCDF-23E096CA84CA}"
    5 EndProject
     2Microsoft Visual Studio Solution File, Format Version 11.00
     3# Visual Studio 2010
    64Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B61EDC99-07A3-4B84-9174-06D8549963D0}"
    75  ProjectSection(SolutionItems) = preProject
     
    97    PreBuildEvent.cmd = PreBuildEvent.cmd
    108  EndProjectSection
     9EndProject
     10Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigMerger", "ConfigMerger\ConfigMerger.csproj", "{E94C5E71-3F29-408D-BCDF-23E096CA84CA}"
    1111EndProject
    1212Global
Note: See TracChangeset for help on using the changeset viewer.