Changeset 1433


Ignore:
Timestamp:
May 17, 2010, 2:38:37 PM (12 years ago)
Author:
Paul Lelgemann
Message:

o Extracted common classes from PeerToPeerBase plugin into new PeerToPeer plugin as a preparation for the new P2P proxy
o Modified directory properties to ignore the CrypBuild directory

Location:
trunk
Files:
7 added
9 deleted
31 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:ignore
      •  

        old new  
        1010bin
        1111obj
         12CrypBuild
  • trunk/CrypP2P/CrypP2P.csproj

    r1432 r1433  
    162162    <Compile Include="Worker\ConnectionWorker.cs" />
    163163    <Compile Include="Worker\WorkerBase.cs" />
    164     <Compile Include="Internal\DHT_CommonManagement.cs" />
    165     <Compile Include="Internal\IP2PControl.cs" />
    166     <Compile Include="Internal\KeySearcherResult.cs" />
    167164    <Compile Include="P2PManager.cs" />
    168165    <Compile Include="Helper\PAPCertificate.cs" />
    169166    <Compile Include="Internal\P2PBase.cs" />
    170167    <Compile Include="Properties\AssemblyInfo.cs" />
    171     <Compile Include="Internal\ResponseWait.cs" />
    172168  </ItemGroup>
    173169  <ItemGroup>
     
    206202      <Private>False</Private>
    207203    </ProjectReference>
    208     <ProjectReference Include="..\CrypPlugins\PeerToPeerJobs\PeerToPeerJobs.csproj">
    209       <Project>{F1258427-AFDF-4DF7-ABF1-758A2325F505}</Project>
    210       <Name>PeerToPeerJobs</Name>
    211       <Private>False</Private>
     204    <ProjectReference Include="..\CrypPlugins\PeerToPeer\PeerToPeer.csproj">
     205      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     206      <Name>PeerToPeer</Name>
    212207    </ProjectReference>
    213208  </ItemGroup>
  • trunk/CrypP2P/Internal/P2PBase.cs

    r1374 r1433  
    3232using PeersAtPlay.Util.Logging;
    3333using Gears4Net;
     34using Cryptool.Plugins.PeerToPeer.Internal;
    3435
    3536/* TODO:
     
    687688
    688689    }
    689 
    690     public class PeerId
    691     {
    692         private readonly string stringId;
    693         private readonly byte[] byteId;
    694 
    695         private const uint OFFSET_BASIS = 2166136261;
    696         private const uint PRIME = 16777619; // 2^24 + 2^8 + 0x93
    697         private readonly int hashCode;
    698 
    699         public PeerId(OverlayAddress oAddress)
    700         {
    701             if (oAddress != null)
    702             {
    703                 this.stringId = oAddress.ToString();
    704                 this.byteId = oAddress.ToByteArray();
    705 
    706                 // FNV-1 hashing
    707                 uint fnvHash = OFFSET_BASIS;
    708                 foreach (byte b in byteId)
    709                 {
    710                     fnvHash = (fnvHash * PRIME) ^ b;
    711                 }
    712                 hashCode = (int)fnvHash;
    713             }
    714         }
    715 
    716         /// <summary>
    717         /// Returns true when the byteId content is identical
    718         /// </summary>
    719         /// <param name="right"></param>
    720         /// <returns></returns>
    721         public override bool Equals(object right)
    722         {
    723             /* standard checks for reference types */
    724 
    725             if (right == null)
    726                 return false;
    727 
    728             if (object.ReferenceEquals(this, right))
    729                 return true;
    730 
    731             if (this.GetType() != right.GetType())
    732                 return false;
    733 
    734             // actual content comparison
    735             return this == (PeerId)right;
    736         }
    737 
    738         public static bool operator ==(PeerId left, PeerId right)
    739         {
    740             // because it's possible that one parameter is null, catch this exception
    741             /* Begin add - Christian Arnold, 2009.12.16, must cast the parameters, otherwise --> recursion */
    742             if ((object)left == (object)right)
    743                 return true;
    744 
    745             if ((object)left == null || (object)right == null)
    746                 return false;
    747             /* End add */
    748 
    749             if (left.hashCode != right.hashCode)
    750                 return false;
    751 
    752             if (left.byteId.Length != right.byteId.Length)
    753                 return false;
    754 
    755             for (int i = 0; i < left.byteId.Length; i++)
    756             {
    757                 // uneven pattern content
    758                 if (left.byteId[i] != right.byteId[i])
    759                     return false;
    760             }
    761 
    762             return true;
    763         }
    764 
    765         public static bool operator !=(PeerId left, PeerId right)
    766         {
    767             return !(left == right);
    768         }
    769 
    770         public override int GetHashCode()
    771         {
    772             return hashCode;
    773         }
    774 
    775         public override string ToString()
    776         {
    777             return this.stringId;
    778         }
    779 
    780         public byte[] ToByteArray()
    781         {
    782             return this.byteId;
    783         }
    784     }
    785690}
  • trunk/CrypP2P/P2PManager.cs

    r1378 r1433  
    2727using Cryptool.P2P.Helper;
    2828using Cryptool.P2P.Internal;
     29using Cryptool.Plugins.PeerToPeer;
     30using Cryptool.Plugins.PeerToPeer.Internal;
    2931
    3032namespace Cryptool.P2P
     
    5153
    5254        #region Private variables
    53         private P2PBase P2PBase { get; set; }
     55        public P2PBase P2PBase { get; set; }
    5456        private P2PSettings P2PSettings { get; set; }
    5557        private ButtonDropDown P2PButton { get; set; }
     
    116118        }
    117119
     120        public PeerId GetPeerId(out string userName)
     121        {
     122            return P2PBase.GetPeerID(out userName);
     123        }
     124
    118125        #region DHT operations
    119126        // TODO add error handling, if P2P if not connected
    120127        public static bool Store(string key, byte[] data)
     128        {
     129            return INSTANCE.P2PBase.SynchStore(key, data);
     130        }
     131
     132         public static bool Store(string key, string data)
    121133        {
    122134            return INSTANCE.P2PBase.SynchStore(key, data);
  • trunk/CrypP2P/P2PSettings.cs

    r1374 r1433  
    2121using Cryptool.P2P.Helper;
    2222using Cryptool.P2P.Internal;
     23using Cryptool.Plugins.PeerToPeer.Internal;
    2324
    2425namespace Cryptool.P2P
     
    3839        {
    3940            PeerName = PAPCertificate.CERTIFIED_PEER_NAME;
    40             WorldName = "CrypTool";
     41            WorldName = "CrypTool2";
    4142            Log2Monitor = true;
    4243            LinkManagerType = P2PLinkManagerType.Snal;
  • trunk/CrypPlugins

    • Property svn:ignore set to
      CrypBuild
  • trunk/CrypPlugins/PeerToPeer/PeerToPeer.csproj

    r1378 r1433  
    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>Cryptool.Plugins.PeerToPeer</RootNamespace>
    1212    <AssemblyName>PeerToPeer</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
     15    <FileUpgradeFlags>
     16    </FileUpgradeFlags>
     17    <OldToolsVersion>3.5</OldToolsVersion>
     18    <UpgradeBackupLocation />
     19    <TargetFrameworkProfile />
     20    <PublishUrl>publish\</PublishUrl>
     21    <Install>true</Install>
     22    <InstallFrom>Disk</InstallFrom>
     23    <UpdateEnabled>false</UpdateEnabled>
     24    <UpdateMode>Foreground</UpdateMode>
     25    <UpdateInterval>7</UpdateInterval>
     26    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     27    <UpdatePeriodically>false</UpdatePeriodically>
     28    <UpdateRequired>false</UpdateRequired>
     29    <MapFileExtensions>true</MapFileExtensions>
     30    <ApplicationRevision>0</ApplicationRevision>
     31    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     32    <IsWebBootstrapper>false</IsWebBootstrapper>
     33    <UseApplicationTrust>false</UseApplicationTrust>
     34    <BootstrapperEnabled>true</BootstrapperEnabled>
    1535  </PropertyGroup>
    1636  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    1838    <DebugType>full</DebugType>
    1939    <Optimize>false</Optimize>
    20     <OutputPath>bin\Debug\</OutputPath>
     40    <OutputPath>..\..\CrypBuild\x86\Debug\CrypPlugins\</OutputPath>
    2141    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2242    <ErrorReport>prompt</ErrorReport>
    2343    <WarningLevel>4</WarningLevel>
     44    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     45    <PlatformTarget>x86</PlatformTarget>
    2446  </PropertyGroup>
    2547  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3052    <ErrorReport>prompt</ErrorReport>
    3153    <WarningLevel>4</WarningLevel>
     54    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3255  </PropertyGroup>
    3356  <ItemGroup>
     
    6891      <HintPath>..\..\AppReferences\PeersAtPlayBase.dll</HintPath>
    6992    </Reference>
     93    <Reference Include="RUDP, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     94      <SpecificVersion>False</SpecificVersion>
     95      <HintPath>..\..\AppReferences\RUDP.dll</HintPath>
     96    </Reference>
    7097    <Reference Include="Stun, Version=1.0.0.0, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    7198      <SpecificVersion>False</SpecificVersion>
     
    90117  </ItemGroup>
    91118  <ItemGroup>
     119    <Compile Include="DebugToFile.cs" />
     120    <Compile Include="DHT_CommonManagement.cs" />
     121    <Compile Include="IP2PControl.cs" />
     122    <Compile Include="IPeer2PeerManager.cs" />
     123    <Compile Include="KeySearcherResult.cs" />
     124    <Compile Include="PeedId.cs" />
    92125    <Compile Include="Properties\AssemblyInfo.cs" />
     126    <Compile Include="ResponseWait.cs" />
     127  </ItemGroup>
     128  <ItemGroup>
     129    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     130      <Visible>False</Visible>
     131      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     132      <Install>false</Install>
     133    </BootstrapperPackage>
     134    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     135      <Visible>False</Visible>
     136      <ProductName>.NET Framework 3.5 SP1</ProductName>
     137      <Install>true</Install>
     138    </BootstrapperPackage>
     139    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     140      <Visible>False</Visible>
     141      <ProductName>Windows Installer 3.1</ProductName>
     142      <Install>true</Install>
     143    </BootstrapperPackage>
     144  </ItemGroup>
     145  <ItemGroup>
     146    <ProjectReference Include="..\..\CrypPluginBase\CrypPluginBase.csproj">
     147      <Project>{25DB2B47-A457-4EC2-960B-395CE07AE093}</Project>
     148      <Name>CrypPluginBase</Name>
     149    </ProjectReference>
     150    <ProjectReference Include="..\KeySearcher\KeySearcher.csproj">
     151      <Project>{0579E099-66B2-43C3-B8A0-43CAE4895E68}</Project>
     152      <Name>KeySearcher</Name>
     153    </ProjectReference>
    93154  </ItemGroup>
    94155  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     
    101162  -->
    102163  <PropertyGroup>
    103     <PostBuildEvent>SET outdir="$(ProjectDir)..\..\CrypWin\$(OutDir)"
    104 if exist %25outdir%25 (
    105         cd %25outdir%25
    106         if not exist "./CrypPlugins" mkdir "./CrypPlugins"
    107 
    108         del /S /Q /A:-S-R-H "$(TargetName)*.*"
    109         copy "$(TargetDir)$(TargetName)*.*" "./CrypPlugins"
    110 
    111         if not exist "./Data" mkdir "./Data"
    112         if exist "$(TargetDir)Data" xcopy /Y /S "$(TargetDir)Data" "./Data"
    113 
    114 copy "$(ProjectDir)..\..\AppReferences\*.*" "."
    115 
    116 )</PostBuildEvent>
     164    <PostBuildEvent>
     165    </PostBuildEvent>
    117166  </PropertyGroup>
    118167</Project>
  • trunk/CrypPlugins/PeerToPeerBase/P2PBase.cs

    r1430 r1433  
    3232using PeersAtPlay.Util.Logging;
    3333using Gears4Net;
     34using Cryptool.Plugins.PeerToPeer.Internal;
    3435
    3536/* TODO:
     
    680681
    681682    }
    682 
    683     public class PeerId
    684     {
    685         private readonly string stringId;
    686         private readonly byte[] byteId;
    687 
    688         private const uint OFFSET_BASIS = 2166136261;
    689         private const uint PRIME = 16777619; // 2^24 + 2^8 + 0x93
    690         private readonly int hashCode;
    691 
    692         public PeerId(OverlayAddress oAddress)
    693         {
    694             if (oAddress != null)
    695             {
    696                 this.stringId = oAddress.ToString();
    697                 this.byteId = oAddress.ToByteArray();
    698 
    699                 // FNV-1 hashing
    700                 uint fnvHash = OFFSET_BASIS;
    701                 foreach (byte b in byteId)
    702                 {
    703                     fnvHash = (fnvHash * PRIME) ^ b;
    704                 }
    705                 hashCode = (int)fnvHash;
    706             }
    707         }
    708 
    709         /// <summary>
    710         /// Returns true when the byteId content is identical
    711         /// </summary>
    712         /// <param name="right"></param>
    713         /// <returns></returns>
    714         public override bool Equals(object right)
    715         {
    716             /* standard checks for reference types */
    717 
    718             if (right == null)
    719                 return false;
    720 
    721             if (object.ReferenceEquals(this, right))
    722                 return true;
    723 
    724             if (this.GetType() != right.GetType())
    725                 return false;
    726 
    727             // actual content comparison
    728             return this == (PeerId)right;
    729         }
    730 
    731         public static bool operator ==(PeerId left, PeerId right)
    732         {
    733             // because it's possible that one parameter is null, catch this exception
    734             /* Begin add - Christian Arnold, 2009.12.16, must cast the parameters, otherwise --> recursion */
    735             if ((object)left == (object)right)
    736                 return true;
    737 
    738             if ((object)left == null || (object)right == null)
    739                 return false;
    740             /* End add */
    741 
    742             if (left.hashCode != right.hashCode)
    743                 return false;
    744 
    745             if (left.byteId.Length != right.byteId.Length)
    746                 return false;
    747 
    748             for (int i = 0; i < left.byteId.Length; i++)
    749             {
    750                 // uneven pattern content
    751                 if (left.byteId[i] != right.byteId[i])
    752                     return false;
    753             }
    754 
    755             return true;
    756         }
    757 
    758         public static bool operator !=(PeerId left, PeerId right)
    759         {
    760             return !(left == right);
    761         }
    762 
    763         public override int GetHashCode()
    764         {
    765             return hashCode;
    766         }
    767 
    768         public override string ToString()
    769         {
    770             return this.stringId;
    771         }
    772 
    773         public byte[] ToByteArray()
    774         {
    775             return this.byteId;
    776         }
    777     }
    778683}
  • trunk/CrypPlugins/PeerToPeerBase/P2PPeer.cs

    r1251 r1433  
    2424using System.ComponentModel;
    2525using Cryptool.PluginBase.IO;
     26using Cryptool.Plugins.PeerToPeer.Internal;
    2627
    2728namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeerBase/P2PPeerSettings.cs

    r1212 r1433  
    77using Cryptool.PluginBase.Control;
    88using System.Windows;
     9using Cryptool.Plugins.PeerToPeer.Internal;
    910
    1011namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeerBase/PeerToPeerBase.csproj

    r1416 r1433  
    171171  </ItemGroup>
    172172  <ItemGroup>
    173     <Compile Include="DebugToFile.cs" />
    174     <Compile Include="DHT_CommonManagement.cs" />
    175     <Compile Include="IP2PControl.cs" />
    176     <Compile Include="KeySearcherResult.cs" />
    177173    <Compile Include="P2PPeerSettings.cs" />
    178174    <Compile Include="P2PPeer.cs" />
    179     <Compile Include="ResponseWait.cs" />
    180     <Compile Include="PeerToPeerBase.cs" />
     175    <Compile Include="P2PBase.cs" />
    181176    <Compile Include="Properties\AssemblyInfo.cs" />
    182177  </ItemGroup>
     
    222217      <Private>False</Private>
    223218    </ProjectReference>
     219    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     220      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     221      <Name>PeerToPeer</Name>
     222    </ProjectReference>
    224223  </ItemGroup>
    225224  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/CrypPlugins/PeerToPeerManager_NEW/P2PManagerBase_NEW.cs

    r1348 r1433  
    2222using Cryptool.PluginBase;
    2323using Cryptool.PluginBase.Miscellaneous;
     24using Cryptool.Plugins.PeerToPeer.Internal;
    2425
    2526/* TODO:
  • trunk/CrypPlugins/PeerToPeerManager_NEW/P2PManager_KeyPattern.cs

    r1244 r1433  
    3030using System.Timers;
    3131using System.Windows.Media;
     32using Cryptool.Plugins.PeerToPeer.Internal;
    3233
    3334/*TODO:
  • trunk/CrypPlugins/PeerToPeerManager_NEW/PeerToPeerManager_NEW.csproj

    r1416 r1433  
    156156      <Private>False</Private>
    157157    </ProjectReference>
     158    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     159      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     160      <Name>PeerToPeer</Name>
     161    </ProjectReference>
    158162  </ItemGroup>
    159163  <ItemGroup>
  • trunk/CrypPlugins/PeerToPeerManager_NEW/WorkersManagement.cs

    r1137 r1433  
    1818using System.Linq;
    1919using System.Text;
     20using Cryptool.Plugins.PeerToPeer.Internal;
    2021
    2122/* CLASS INFORMATION
  • trunk/CrypPlugins/PeerToPeerPublisher/P2PPublisher.cs

    r1139 r1433  
    2424using Cryptool.PluginBase.Miscellaneous;
    2525using System.ComponentModel;
     26using Cryptool.Plugins.PeerToPeer.Internal;
    2627
    2728namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeerPublisher/P2PPublisherBase.cs

    r1244 r1433  
    99using System.IO;
    1010using System.Threading;
     11using Cryptool.Plugins.PeerToPeer.Internal;
    1112
    1213/*
  • trunk/CrypPlugins/PeerToPeerPublisher/PeerToPeerPublisher.csproj

    r1416 r1433  
    139139      <Private>False</Private>
    140140    </ProjectReference>
     141    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     142      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     143      <Name>PeerToPeer</Name>
     144    </ProjectReference>
    141145  </ItemGroup>
    142146  <ItemGroup>
  • trunk/CrypPlugins/PeerToPeerPublisher/SubscribersManagement.cs

    r1221 r1433  
    66using System.IO;
    77using Cryptool.PluginBase.Control;
     8using Cryptool.Plugins.PeerToPeer.Internal;
    89
    910namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeerSubscriber/P2PSubscriber.cs

    r1139 r1433  
    2424using Cryptool.PluginBase.Miscellaneous;
    2525using System.ComponentModel;
     26using Cryptool.Plugins.PeerToPeer.Internal;
    2627
    2728namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeerSubscriber/P2PSubscriberBase.cs

    r1254 r1433  
    66using Cryptool.PluginBase;
    77using System.Timers;
     8using Cryptool.Plugins.PeerToPeer.Internal;
    89
    910/*
  • trunk/CrypPlugins/PeerToPeerSubscriber/PeerToPeerSubscriber.csproj

    r1416 r1433  
    141141      <Private>False</Private>
    142142    </ProjectReference>
     143    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     144      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     145      <Name>PeerToPeer</Name>
     146    </ProjectReference>
    143147  </ItemGroup>
    144148  <ItemGroup>
  • trunk/CrypPlugins/PeerToPeerWorker_NEW/P2PJobAdmin.cs

    r1220 r1433  
    2525using System.ComponentModel;
    2626using Cryptool.Plugins.PeerToPeer.Jobs;
     27using Cryptool.Plugins.PeerToPeer.Internal;
    2728
    2829namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeerWorker_NEW/P2PJobAdminBase.cs

    r1368 r1433  
    2323using Cryptool.Plugins.PeerToPeer.Jobs;
    2424using System.Timers;
     25using Cryptool.Plugins.PeerToPeer.Internal;
    2526
    2627/* TWO DIFFERENT STOPPING CASE:
  • trunk/CrypPlugins/PeerToPeerWorker_NEW/PeerToPeerJobAdmin.csproj

    r1416 r1433  
    149149      <Private>False</Private>
    150150    </ProjectReference>
     151    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     152      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     153      <Name>PeerToPeer</Name>
     154    </ProjectReference>
    151155  </ItemGroup>
    152156  <ItemGroup>
  • trunk/CrypPlugins/PeerToPeer_DHTremove/P2PDHTremove.cs

    r862 r1433  
    2525using Cryptool.PluginBase.Tool;
    2626using Cryptool.PluginBase.Control;
     27using Cryptool.Plugins.PeerToPeer.Internal;
    2728
    2829/*TODO:
  • trunk/CrypPlugins/PeerToPeer_DHTremove/PeerToPeer_DHTremove.csproj

    r1416 r1433  
    137137      <Private>False</Private>
    138138    </ProjectReference>
     139    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     140      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     141      <Name>PeerToPeer</Name>
     142    </ProjectReference>
    139143  </ItemGroup>
    140144  <ItemGroup>
  • trunk/CrypPlugins/PeerToPeer_DHTretrieve/P2P_DHTload.cs

    r798 r1433  
    2626using Cryptool.PluginBase.Tool;
    2727using Cryptool.PluginBase.Control;
     28using Cryptool.Plugins.PeerToPeer.Internal;
    2829
    2930namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeer_DHTretrieve/PeerToPeer_DHTretrieve.csproj

    r1416 r1433  
    137137      <Private>False</Private>
    138138    </ProjectReference>
     139    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     140      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     141      <Name>PeerToPeer</Name>
     142    </ProjectReference>
    139143  </ItemGroup>
    140144  <ItemGroup>
  • trunk/CrypPlugins/PeerToPeer_DHTstore/P2PDHTstore.cs

    r800 r1433  
    2626using Cryptool.PluginBase.Tool;
    2727using Cryptool.PluginBase.Control;
     28using Cryptool.Plugins.PeerToPeer.Internal;
    2829
    2930namespace Cryptool.Plugins.PeerToPeer
  • trunk/CrypPlugins/PeerToPeer_DHTstore/PeerToPeer_DHTstore.csproj

    r1416 r1433  
    137137      <Private>False</Private>
    138138    </ProjectReference>
     139    <ProjectReference Include="..\PeerToPeer\PeerToPeer.csproj">
     140      <Project>{12829116-8FAD-4D09-A0AA-D75D88F07626}</Project>
     141      <Name>PeerToPeer</Name>
     142    </ProjectReference>
    139143  </ItemGroup>
    140144  <ItemGroup>
  • trunk/CrypTool/CrypTool.csproj

    r1429 r1433  
    9797      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
    9898    </EmbeddedResource>
    99     <None Include="app.config" />
     99    <None Include="app.config">
     100      <SubType>Designer</SubType>
     101    </None>
    100102    <None Include="Properties\Settings.settings">
    101103      <Generator>SettingsSingleFileGenerator</Generator>
Note: See TracChangeset for help on using the changeset viewer.