Changeset 1386


Ignore:
Timestamp:
May 5, 2010, 8:05:22 PM (12 years ago)
Author:
saternus
Message:

Converted internal solution to VS2010 Part 4

Location:
trunk
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypP2P/CrypP2P.csproj

    r1374 r1386  
    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>
    5     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     5    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
    66    <ProductVersion>9.0.30729</ProductVersion>
    77    <SchemaVersion>2.0</SchemaVersion>
     
    1111    <RootNamespace>Cryptool.P2P</RootNamespace>
    1212    <AssemblyName>CrypP2P</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    15   </PropertyGroup>
    16   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     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>
     34    <TargetFrameworkProfile>
     35    </TargetFrameworkProfile>
     36  </PropertyGroup>
     37  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    1738    <DebugSymbols>true</DebugSymbols>
    1839    <DebugType>full</DebugType>
    1940    <Optimize>false</Optimize>
    20     <OutputPath>bin\Debug\</OutputPath>
     41    <OutputPath>..\CrypBuild\x86\Debug\</OutputPath>
    2142    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2243    <ErrorReport>prompt</ErrorReport>
    2344    <WarningLevel>4</WarningLevel>
    24   </PropertyGroup>
    25   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     45    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     46  </PropertyGroup>
     47  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    2648    <DebugType>pdbonly</DebugType>
    2749    <Optimize>true</Optimize>
    28     <OutputPath>bin\Release\</OutputPath>
     50    <OutputPath>..\CrypBuild\x86\Release\</OutputPath>
    2951    <DefineConstants>TRACE</DefineConstants>
    3052    <ErrorReport>prompt</ErrorReport>
    3153    <WarningLevel>4</WarningLevel>
    32   </PropertyGroup>
    33   <ItemGroup>
    34     <Reference Include="Bootstrapper, Version=1.0.4654.4, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    35       <SpecificVersion>False</SpecificVersion>
     54    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     55    <PlatformTarget>x86</PlatformTarget>
     56  </PropertyGroup>
     57  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     58    <DebugSymbols>true</DebugSymbols>
     59    <DebugType>full</DebugType>
     60    <Optimize>false</Optimize>
     61    <OutputPath>..\CrypBuild\x64\Debug\</OutputPath>
     62    <DefineConstants>DEBUG;TRACE</DefineConstants>
     63    <ErrorReport>prompt</ErrorReport>
     64    <WarningLevel>4</WarningLevel>
     65    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     66    <PlatformTarget>x64</PlatformTarget>
     67  </PropertyGroup>
     68  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     69    <DebugType>pdbonly</DebugType>
     70    <Optimize>true</Optimize>
     71    <OutputPath>..\CrypBuild\x64\Release\</OutputPath>
     72    <DefineConstants>TRACE</DefineConstants>
     73    <ErrorReport>prompt</ErrorReport>
     74    <WarningLevel>4</WarningLevel>
     75    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     76    <PlatformTarget>x64</PlatformTarget>
     77  </PropertyGroup>
     78  <ItemGroup>
     79    <Reference Include="Bootstrapper">
    3680      <HintPath>..\AppReferences\Bootstrapper.dll</HintPath>
    3781    </Reference>
    38     <Reference Include="CertServices, Version=1.0.4654.4, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    39       <SpecificVersion>False</SpecificVersion>
     82    <Reference Include="CertServices">
    4083      <HintPath>..\AppReferences\CertServices.dll</HintPath>
    4184    </Reference>
     
    4487      <HintPath>..\CoreDeveloper\CrypWin\DevComponents.WpfRibbon.dll</HintPath>
    4588    </Reference>
    46     <Reference Include="FullMeshDHT, Version=1.0.4654.4, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    47       <SpecificVersion>False</SpecificVersion>
     89    <Reference Include="FullMeshDHT">
    4890      <HintPath>..\AppReferences\FullMeshDHT.dll</HintPath>
    4991    </Reference>
    50     <Reference Include="FullMeshOverlay, Version=1.0.4654.4, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    51       <SpecificVersion>False</SpecificVersion>
     92    <Reference Include="FullMeshOverlay">
    5293      <HintPath>..\AppReferences\FullMeshOverlay.dll</HintPath>
    5394    </Reference>
    54     <Reference Include="Gears4Net, Version=1.0.4654.4, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    55       <SpecificVersion>False</SpecificVersion>
     95    <Reference Include="Gears4Net">
    5696      <HintPath>..\AppReferences\Gears4Net.dll</HintPath>
    5797    </Reference>
    58     <Reference Include="LinkManager, Version=1.0.4654.4, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    59       <SpecificVersion>False</SpecificVersion>
     98    <Reference Include="LinkManager">
    6099      <HintPath>..\AppReferences\LinkManager.dll</HintPath>
    61100    </Reference>
    62     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    63       <SpecificVersion>False</SpecificVersion>
     101    <Reference Include="log4net">
    64102      <HintPath>..\AppReferences\log4net.dll</HintPath>
    65103    </Reference>
    66     <Reference Include="NetGearsTCP, Version=1.0.0.0, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    67       <SpecificVersion>False</SpecificVersion>
     104    <Reference Include="NetGearsTCP">
    68105      <HintPath>..\AppReferences\NetGearsTCP.dll</HintPath>
    69106    </Reference>
    70     <Reference Include="PeersAtPlayBase, Version=1.0.4654.4, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    71       <SpecificVersion>False</SpecificVersion>
     107    <Reference Include="PeersAtPlayBase">
    72108      <HintPath>..\AppReferences\PeersAtPlayBase.dll</HintPath>
    73109    </Reference>
     
    78114      <RequiredTargetFramework>3.0</RequiredTargetFramework>
    79115    </Reference>
    80     <Reference Include="Stun, Version=1.0.0.0, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    81       <SpecificVersion>False</SpecificVersion>
     116    <Reference Include="Stun">
    82117      <HintPath>..\AppReferences\Stun.dll</HintPath>
    83118    </Reference>
     
    88123    <Reference Include="System.Security" />
    89124    <Reference Include="System.Windows.Forms" />
     125    <Reference Include="System.Xaml" />
    90126    <Reference Include="System.Xml.Linq">
    91127      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    96132    <Reference Include="System.Data" />
    97133    <Reference Include="System.Xml" />
    98     <Reference Include="Util, Version=0.0.0.0, Culture=neutral, PublicKeyToken=95429f90c3a66dd4, processorArchitecture=MSIL">
    99       <SpecificVersion>False</SpecificVersion>
     134    <Reference Include="Util">
    100135      <HintPath>..\AppReferences\Util.dll</HintPath>
    101136    </Reference>
     
    118153  </ItemGroup>
    119154  <ItemGroup>
     155    <None Include="pap_certificates\CrypTool2.pfx" />
     156    <None Include="pap_certificates\opa.vs.uni-due.de.cer" />
     157    <None Include="pap_certificates\pap.cer" />
     158    <None Include="pap_certificates\pap0001.p12" />
     159    <None Include="pap_certificates\ServerCA.cer" />
     160  </ItemGroup>
     161  <ItemGroup>
     162    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     163      <Visible>False</Visible>
     164      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     165      <Install>false</Install>
     166    </BootstrapperPackage>
     167    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     168      <Visible>False</Visible>
     169      <ProductName>.NET Framework 3.5 SP1</ProductName>
     170      <Install>true</Install>
     171    </BootstrapperPackage>
     172    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     173      <Visible>False</Visible>
     174      <ProductName>Windows Installer 3.1</ProductName>
     175      <Install>true</Install>
     176    </BootstrapperPackage>
     177  </ItemGroup>
     178  <ItemGroup>
    120179    <ProjectReference Include="..\CrypPluginBase\CrypPluginBase.csproj">
    121180      <Project>{25DB2B47-A457-4EC2-960B-395CE07AE093}</Project>
     
    126185      <Name>KeySearcher</Name>
    127186    </ProjectReference>
    128     <ProjectReference Include="..\CrypPlugins\PeerToPeerCertificates\PeerToPeerCertificates.csproj">
    129       <Project>{7BED5C93-30BE-47BE-BC4A-16453F5DE9EA}</Project>
    130       <Name>PeerToPeerCertificates</Name>
     187    <ProjectReference Include="..\CrypPlugins\PeerToPeerJobs\PeerToPeerJobs.csproj">
     188      <Project>{F1258427-AFDF-4DF7-ABF1-758A2325F505}</Project>
     189      <Name>PeerToPeerJobs</Name>
    131190    </ProjectReference>
    132   </ItemGroup>
    133   <ItemGroup>
    134     <None Include="pap_certificates\CrypTool2.pfx" />
    135     <None Include="pap_certificates\opa.vs.uni-due.de.cer" />
    136     <None Include="pap_certificates\pap.cer" />
    137     <None Include="pap_certificates\pap0001.p12" />
    138     <None Include="pap_certificates\ServerCA.cer" />
    139191  </ItemGroup>
    140192  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  • trunk/CrypPluginBase/CrypPluginBase.csproj

    r1314 r1386  
    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.PluginBase</RootNamespace>
    1212    <AssemblyName>CrypPluginBase</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
    1616    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     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>Client</TargetFrameworkProfile>
    1737  </PropertyGroup>
    1838  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    2444    <ErrorReport>prompt</ErrorReport>
    2545    <WarningLevel>4</WarningLevel>
     46    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2647  </PropertyGroup>
    2748  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     
    3253    <ErrorReport>prompt</ErrorReport>
    3354    <WarningLevel>4</WarningLevel>
     55    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3456  </PropertyGroup>
    3557  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    3658    <DebugSymbols>true</DebugSymbols>
    37     <OutputPath>bin\x86\Debug\</OutputPath>
     59    <OutputPath>..\CrypBuild\x86\Debug\</OutputPath>
    3860    <DefineConstants>DEBUG;TRACE</DefineConstants>
    3961    <DebugType>full</DebugType>
     
    4264    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    4365    <ErrorReport>prompt</ErrorReport>
     66    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4467  </PropertyGroup>
    4568  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    46     <OutputPath>bin\x86\Release\</OutputPath>
     69    <OutputPath>..\CrypBuild\x86\Release\</OutputPath>
    4770    <DefineConstants>TRACE</DefineConstants>
    4871    <Optimize>true</Optimize>
     
    5275    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    5376    <ErrorReport>prompt</ErrorReport>
     77    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5478  </PropertyGroup>
    5579  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5680    <DebugSymbols>true</DebugSymbols>
    57     <OutputPath>bin\x64\Debug\</OutputPath>
     81    <OutputPath>..\CrypBuild\x64\Debug\</OutputPath>
    5882    <DefineConstants>DEBUG;TRACE</DefineConstants>
    5983    <DebugType>full</DebugType>
     
    6286    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    6387    <ErrorReport>prompt</ErrorReport>
     88    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    6489  </PropertyGroup>
    6590  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    66     <OutputPath>bin\x64\Release\</OutputPath>
     91    <OutputPath>..\CrypBuild\x64\Release\</OutputPath>
    6792    <DefineConstants>TRACE</DefineConstants>
    6893    <Optimize>true</Optimize>
     
    7297    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
    7398    <ErrorReport>prompt</ErrorReport>
     99    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    74100  </PropertyGroup>
    75101  <ItemGroup>
     
    85111    </Reference>
    86112    <Reference Include="System.Drawing" />
     113    <Reference Include="System.Xaml" />
    87114    <Reference Include="System.Xml.Linq">
    88115      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    187214    </EmbeddedResource>
    188215  </ItemGroup>
     216  <ItemGroup>
     217    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
     218      <Visible>False</Visible>
     219      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
     220      <Install>false</Install>
     221    </BootstrapperPackage>
     222    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
     223      <Visible>False</Visible>
     224      <ProductName>.NET Framework 3.5 SP1</ProductName>
     225      <Install>true</Install>
     226    </BootstrapperPackage>
     227    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
     228      <Visible>False</Visible>
     229      <ProductName>Windows Installer 3.1</ProductName>
     230      <Install>true</Install>
     231    </BootstrapperPackage>
     232  </ItemGroup>
    189233  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    190234  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
     
    196240  -->
    197241  <PropertyGroup>
    198     <PostBuildEvent>cd "$(ProjectDir)"
    199 cd ..\CrypWin\$(OutDir)
    200 
    201 del /F /Q /q "CrypPluginBase*.*"
    202 copy "$(TargetDir)CrypPluginBase*.*" "./"</PostBuildEvent>
     242    <PostBuildEvent>
     243    </PostBuildEvent>
    203244  </PropertyGroup>
    204245</Project>
  • trunk/CrypPluginBase/Resources/Resource.Designer.cs

    r210 r1386  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3053
     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()]
Note: See TracChangeset for help on using the changeset viewer.