Ignore:
Timestamp:
Jan 11, 2011, 2:49:14 PM (11 years ago)
Author:
Matthäus Wander
Message:

Consolidating x64 and x86 build targets. Please use only "x86", see #172.

override-bad-extension: Bdev.Net.Dns.dll
override-bad-extension: Bootstrapper.dll
override-bad-extension: Bootstrapper.pdb
override-bad-extension: CertificateLibrary.dll
override-bad-extension: CertificateLibrary.pdb
override-bad-extension: CertServices.dll
override-bad-extension: CertServices.pdb
override-bad-extension: Chord.dll
override-bad-extension: Chord.pdb
override-bad-extension: FullMeshDHT.dll
override-bad-extension: FullMeshDHT.pdb
override-bad-extension: FullMeshOverlay.dll
override-bad-extension: FullMeshOverlay.pdb
override-bad-extension: Gears4Net.dll
override-bad-extension: Gears4Net.pdb
override-bad-extension: LinkManager.dll
override-bad-extension: LinkManager.pdb
override-bad-extension: log4net.dll
override-bad-extension: log4net.pdb
override-bad-extension: msieve.dll
override-bad-extension: MySQLDHT.dll
override-bad-extension: MySQLDHT.pdb
override-bad-extension: NativeCryptography.dll
override-bad-extension: PapsClient.dll
override-bad-extension: PapsClient.pdb
override-bad-extension: PeersAtPlayBase.dll
override-bad-extension: PeersAtPlayBase.pdb
override-bad-extension: RUDP.dll
override-bad-extension: RUDP.pdb
override-bad-extension: Stun.dll
override-bad-extension: Stun.pdb
override-bad-extension: Util.dll
override-bad-extension: Util.pdb
override-bad-extension: WebDHT.dll
override-bad-extension: WebDHT.pdb
override-bad-extension: AnotherEditor.dll
override-bad-extension: CrypWin.exe

Location:
trunk/CrypPlugins/Primes
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/Primes/Primes.Standalone/Primes.Standalone.csproj

    r1487 r2310  
    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>
     
    1111    <RootNamespace>Primes.Standalone</RootNamespace>
    1212    <AssemblyName>Primes.Standalone</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    1616    <WarningLevel>4</WarningLevel>
     17    <FileUpgradeFlags>
     18    </FileUpgradeFlags>
     19    <OldToolsVersion>3.5</OldToolsVersion>
     20    <UpgradeBackupLocation />
     21    <PublishUrl>publish\</PublishUrl>
     22    <Install>true</Install>
     23    <InstallFrom>Disk</InstallFrom>
     24    <UpdateEnabled>false</UpdateEnabled>
     25    <UpdateMode>Foreground</UpdateMode>
     26    <UpdateInterval>7</UpdateInterval>
     27    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     28    <UpdatePeriodically>false</UpdatePeriodically>
     29    <UpdateRequired>false</UpdateRequired>
     30    <MapFileExtensions>true</MapFileExtensions>
     31    <ApplicationRevision>0</ApplicationRevision>
     32    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     33    <IsWebBootstrapper>false</IsWebBootstrapper>
     34    <UseApplicationTrust>false</UseApplicationTrust>
     35    <BootstrapperEnabled>true</BootstrapperEnabled>
     36    <TargetFrameworkProfile />
    1737  </PropertyGroup>
    18   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    19     <PlatformTarget>x64</PlatformTarget>
    20     <OutputPath>..\..\..\CrypBuild\x64\Release\CrypPlugins</OutputPath>
     38  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     39    <PlatformTarget>x86</PlatformTarget>
     40    <OutputPath>..\..\..\CrypBuild\Release\CrypPlugins</OutputPath>
    2141    <ErrorReport>prompt</ErrorReport>
    2242    <WarningLevel>4</WarningLevel>
     
    2444    <Optimize>true</Optimize>
    2545    <DefineConstants>TRACE</DefineConstants>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2647  </PropertyGroup>
    27   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     48  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    2849    <PlatformTarget>x86</PlatformTarget>
    29     <OutputPath>..\..\..\CrypBuild\x86\Release\CrypPlugins</OutputPath>
    30     <ErrorReport>prompt</ErrorReport>
    31     <WarningLevel>4</WarningLevel>
    32     <DebugType>pdbonly</DebugType>
    33     <Optimize>true</Optimize>
    34     <DefineConstants>TRACE</DefineConstants>
    35   </PropertyGroup>
    36   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    37     <PlatformTarget>x64</PlatformTarget>
    38     <OutputPath>..\..\..\CrypBuild\x64\Debug\CrypPlugins</OutputPath>
     50    <OutputPath>..\..\..\CrypBuild\Debug\CrypPlugins</OutputPath>
    3951    <ErrorReport>prompt</ErrorReport>
    4052    <WarningLevel>4</WarningLevel>
     
    4355    <Optimize>false</Optimize>
    4456    <DefineConstants>DEBUG;TRACE</DefineConstants>
     57    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4558  </PropertyGroup>
    46   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    47     <PlatformTarget>x86</PlatformTarget>
    48     <OutputPath>..\..\..\CrypBuild\x86\Debug\CrypPlugins</OutputPath>
    49     <ErrorReport>prompt</ErrorReport>
    50     <WarningLevel>4</WarningLevel>
    51     <DebugSymbols>true</DebugSymbols>
    52     <DebugType>full</DebugType>
    53     <Optimize>false</Optimize>
    54     <DefineConstants>DEBUG;TRACE</DefineConstants>
    55   </PropertyGroup>
    56   <ItemGroup Condition=" '$(Platform)' == 'x86' " />
    57   <ItemGroup Condition=" '$(Platform)' == 'x64' " />
    5859  <ItemGroup>
    5960    <Reference Include="System" />
     
    6162      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    6263    </Reference>
     64    <Reference Include="System.Xaml" />
    6365    <Reference Include="System.Xml.Linq">
    6466      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    8688      <Generator>MSBuild:Compile</Generator>
    8789      <SubType>Designer</SubType>
     90      <Generator>MSBuild:Compile</Generator>
     91      <SubType>Designer</SubType>
    8892    </ApplicationDefinition>
    8993    <Page Include="Window1.xaml">
     94      <Generator>MSBuild:Compile</Generator>
     95      <SubType>Designer</SubType>
    9096      <Generator>MSBuild:Compile</Generator>
    9197      <SubType>Designer</SubType>
     
    119125      <SubType>Designer</SubType>
    120126    </EmbeddedResource>
     127    <None Include="app.config" />
    121128    <None Include="Properties\Settings.settings">
    122129      <Generator>SettingsSingleFileGenerator</Generator>
     
    135142    </ProjectReference>
    136143  </ItemGroup>
     144  <ItemGroup>
     145    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     146      <Visible>False</Visible>
     147      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     148      <Install>false</Install>
     149    </BootstrapperPackage>
     150    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     151      <Visible>False</Visible>
     152      <ProductName>.NET Framework 3.5 SP1</ProductName>
     153      <Install>true</Install>
     154    </BootstrapperPackage>
     155    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     156      <Visible>False</Visible>
     157      <ProductName>Windows Installer 3.1</ProductName>
     158      <Install>true</Install>
     159    </BootstrapperPackage>
     160  </ItemGroup>
    137161  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    138162  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • trunk/CrypPlugins/Primes/Primes.Standalone/Properties/Resources.Designer.cs

    r4 r2310  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.1433
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    2020    // To add or remove a member, edit your .ResX file then rerun ResGen
    2121    // with the /str option, or rebuild your VS project.
    22     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
     22    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
    2323    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    2424    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
  • trunk/CrypPlugins/Primes/Primes.Standalone/Properties/Settings.Designer.cs

    r4 r2310  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.1433
     4//     Runtime Version:4.0.30319.1
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    1313   
    1414    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    15     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
    1616    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
    1717       
  • trunk/CrypPlugins/Primes/Primes/Primes.csproj

    r1487 r2310  
    3434    <TargetFrameworkProfile />
    3535  </PropertyGroup>
    36   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    37     <PlatformTarget>x64</PlatformTarget>
    38     <OutputPath>..\..\..\CrypBuild\x64\Release\CrypPlugins</OutputPath>
     36  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     37    <PlatformTarget>x86</PlatformTarget>
     38    <OutputPath>..\..\..\CrypBuild\Release\CrypPlugins</OutputPath>
    3939    <ErrorReport>prompt</ErrorReport>
    4040    <WarningLevel>4</WarningLevel>
     
    4343    <DefineConstants>TRACE</DefineConstants>
    4444  </PropertyGroup>
    45   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     45  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    4646    <PlatformTarget>x86</PlatformTarget>
    47     <OutputPath>..\..\..\CrypBuild\x86\Release\CrypPlugins</OutputPath>
    48     <ErrorReport>prompt</ErrorReport>
    49     <WarningLevel>4</WarningLevel>
    50     <DebugType>pdbonly</DebugType>
    51     <Optimize>true</Optimize>
    52     <DefineConstants>TRACE</DefineConstants>
    53   </PropertyGroup>
    54   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    55     <PlatformTarget>x64</PlatformTarget>
    56     <OutputPath>..\..\..\CrypBuild\x64\Debug\CrypPlugins</OutputPath>
     47    <OutputPath>..\..\..\CrypBuild\Debug\CrypPlugins</OutputPath>
    5748    <ErrorReport>prompt</ErrorReport>
    5849    <WarningLevel>4</WarningLevel>
     
    6253    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6354  </PropertyGroup>
    64   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    65     <PlatformTarget>x86</PlatformTarget>
    66     <OutputPath>..\..\..\CrypBuild\x86\Debug\CrypPlugins</OutputPath>
    67     <ErrorReport>prompt</ErrorReport>
    68     <WarningLevel>4</WarningLevel>
    69     <DebugSymbols>true</DebugSymbols>
    70     <DebugType>full</DebugType>
    71     <Optimize>false</Optimize>
    72     <DefineConstants>DEBUG;TRACE</DefineConstants>
    73   </PropertyGroup>
    74   <ItemGroup Condition=" '$(Platform)' == 'x86' " />
    75   <ItemGroup Condition=" '$(Platform)' == 'x64' " />
    7655  <ItemGroup>
    7756    <Reference Include="PresentationCore">
Note: See TracChangeset for help on using the changeset viewer.