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/CrypResourceLocator
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypResourceLocator/CrypResourceLocator.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>
     
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <FileUpgradeFlags>
     16    </FileUpgradeFlags>
     17    <OldToolsVersion>3.5</OldToolsVersion>
     18    <UpgradeBackupLocation />
     19    <PublishUrl>publish\</PublishUrl>
     20    <Install>true</Install>
     21    <InstallFrom>Disk</InstallFrom>
     22    <UpdateEnabled>false</UpdateEnabled>
     23    <UpdateMode>Foreground</UpdateMode>
     24    <UpdateInterval>7</UpdateInterval>
     25    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     26    <UpdatePeriodically>false</UpdatePeriodically>
     27    <UpdateRequired>false</UpdateRequired>
     28    <MapFileExtensions>true</MapFileExtensions>
     29    <ApplicationRevision>0</ApplicationRevision>
     30    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     31    <IsWebBootstrapper>false</IsWebBootstrapper>
     32    <UseApplicationTrust>false</UseApplicationTrust>
     33    <BootstrapperEnabled>true</BootstrapperEnabled>
    1534  </PropertyGroup>
    16   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    17     <PlatformTarget>x64</PlatformTarget>
    18     <OutputPath>..\CrypBuild\x64\Release</OutputPath>
     35  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     36    <PlatformTarget>x86</PlatformTarget>
     37    <OutputPath>..\CrypBuild\Release</OutputPath>
    1938    <ErrorReport>prompt</ErrorReport>
    2039    <WarningLevel>4</WarningLevel>
     
    2241    <Optimize>true</Optimize>
    2342    <DefineConstants>TRACE</DefineConstants>
     43    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2444  </PropertyGroup>
    25   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     45  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    2646    <PlatformTarget>x86</PlatformTarget>
    27     <OutputPath>..\CrypBuild\x86\Release</OutputPath>
    28     <ErrorReport>prompt</ErrorReport>
    29     <WarningLevel>4</WarningLevel>
    30     <DebugType>pdbonly</DebugType>
    31     <Optimize>true</Optimize>
    32     <DefineConstants>TRACE</DefineConstants>
    33   </PropertyGroup>
    34   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    35     <PlatformTarget>x64</PlatformTarget>
    36     <OutputPath>..\CrypBuild\x64\Debug</OutputPath>
     47    <OutputPath>..\CrypBuild\Debug</OutputPath>
    3748    <ErrorReport>prompt</ErrorReport>
    3849    <WarningLevel>4</WarningLevel>
     
    4152    <Optimize>false</Optimize>
    4253    <DefineConstants>DEBUG;TRACE</DefineConstants>
     54    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4355  </PropertyGroup>
    44   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    45     <PlatformTarget>x86</PlatformTarget>
    46     <OutputPath>..\CrypBuild\x86\Debug</OutputPath>
    47     <ErrorReport>prompt</ErrorReport>
    48     <WarningLevel>4</WarningLevel>
    49     <DebugSymbols>true</DebugSymbols>
    50     <DebugType>full</DebugType>
    51     <Optimize>false</Optimize>
    52     <DefineConstants>DEBUG;TRACE</DefineConstants>
    53   </PropertyGroup>
    54   <ItemGroup Condition=" '$(Platform)' == 'x86' " />
    55   <ItemGroup Condition=" '$(Platform)' == 'x64' " />
    5656  <ItemGroup>
    5757    <Reference Include="System" />
     
    9292      <AutoGen>True</AutoGen>
    9393      <DependentUpon>Resources.resx</DependentUpon>
     94      <DesignTime>True</DesignTime>
    9495    </Compile>
    9596    <None Include="Properties\Settings.settings">
     
    103104    </Compile>
    104105  </ItemGroup>
     106  <ItemGroup>
     107    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     108      <Visible>False</Visible>
     109      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     110      <Install>false</Install>
     111    </BootstrapperPackage>
     112    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     113      <Visible>False</Visible>
     114      <ProductName>.NET Framework 3.5 SP1</ProductName>
     115      <Install>true</Install>
     116    </BootstrapperPackage>
     117    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     118      <Visible>False</Visible>
     119      <ProductName>Windows Installer 3.1</ProductName>
     120      <Install>true</Install>
     121    </BootstrapperPackage>
     122  </ItemGroup>
    105123  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    106124  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • trunk/CrypResourceLocator/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
     
    99//------------------------------------------------------------------------------
    1010
    11 namespace CrypResourceLocator.Properties
    12 {
    13 
    14 
     11namespace CrypResourceLocator.Properties {
     12    using System;
     13   
     14   
    1515    /// <summary>
    1616    ///   A strongly-typed resource class, for looking up localized strings, etc.
     
    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()]
    25     internal class Resources
    26     {
    27 
     25    internal class Resources {
     26       
    2827        private static global::System.Resources.ResourceManager resourceMan;
    29 
     28       
    3029        private static global::System.Globalization.CultureInfo resourceCulture;
    31 
     30       
    3231        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
    33         internal Resources()
    34         {
     32        internal Resources() {
    3533        }
    36 
     34       
    3735        /// <summary>
    3836        ///   Returns the cached ResourceManager instance used by this class.
    3937        /// </summary>
    4038        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
    41         internal static global::System.Resources.ResourceManager ResourceManager
    42         {
    43             get
    44             {
    45                 if ((resourceMan == null))
    46                 {
     39        internal static global::System.Resources.ResourceManager ResourceManager {
     40            get {
     41                if (object.ReferenceEquals(resourceMan, null)) {
    4742                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CrypResourceLocator.Properties.Resources", typeof(Resources).Assembly);
    4843                    resourceMan = temp;
     
    5146            }
    5247        }
    53 
     48       
    5449        /// <summary>
    5550        ///   Overrides the current thread's CurrentUICulture property for all
     
    5752        /// </summary>
    5853        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
    59         internal static global::System.Globalization.CultureInfo Culture
    60         {
    61             get
    62             {
     54        internal static global::System.Globalization.CultureInfo Culture {
     55            get {
    6356                return resourceCulture;
    6457            }
    65             set
    66             {
     58            set {
    6759                resourceCulture = value;
    6860            }
  • trunk/CrypResourceLocator/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
     
    99//------------------------------------------------------------------------------
    1010
    11 namespace CrypResourceLocator.Properties
    12 {
    13 
    14 
     11namespace CrypResourceLocator.Properties {
     12   
     13   
    1514    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    16     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
    17     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
    18     {
    19 
     15    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     16    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
     17       
    2018        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
    21 
    22         public static Settings Default
    23         {
    24             get
    25             {
     19       
     20        public static Settings Default {
     21            get {
    2622                return defaultInstance;
    2723            }
Note: See TracChangeset for help on using the changeset viewer.