Pokaż
Ignoruj:
Data:
2009-11-24 12:21:39 (16 years ago)
Autor:
sylwek
Opis:

Re #195 merged with latest trunk

Lokalizacja:
branches/Emisje
Pliki:
2 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • branches/Emisje

    • Property svn:mergeinfo

      •  

        old new  
         1/branches/Abonament:701-884 
        12/branches/AutoShopper:815-818 
        23/branches/ReklamaReorganizacja:568-731 
        34/tags/BazaReklam_1.1.28:831 
        4 /trunk:774-868 
         5/trunk:774-893 

  • branches/Emisje/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj

    r866 r895  
    3232  </PropertyGroup> 
    3333  <ItemGroup> 
     34    <Reference Include="Moq, Version=4.0.812.4, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL"> 
     35      <SpecificVersion>False</SpecificVersion> 
     36      <HintPath>..\..\..\..\Documents and Settings\Administrator\Pulpit\Moq.4.0.812.4-bin\Moq.dll</HintPath> 
     37    </Reference> 
    3438    <Reference Include="MvcContrib, Version=1.5.996.0, Culture=neutral, processorArchitecture=MSIL"> 
    3539      <SpecificVersion>False</SpecificVersion> 
    … …  
    5660      <RequiredTargetFramework>3.5</RequiredTargetFramework> 
    5761    </Reference> 
     62    <Reference Include="System.Web.Abstractions"> 
     63      <RequiredTargetFramework>3.5</RequiredTargetFramework> 
     64    </Reference> 
    5865    <Reference Include="System.Web.Mvc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> 
    5966    <Reference Include="System.Xml.Linq"> 
    … …  
    6572    <Reference Include="System.Data" /> 
    6673    <Reference Include="System.Xml" /> 
     74    <Reference Include="WatiN.Core, Version=2.0.10.928, Culture=neutral, PublicKeyToken=db7cfd3acb5ad44e, processorArchitecture=x86"> 
     75      <SpecificVersion>False</SpecificVersion> 
     76      <HintPath>..\..\..\..\Documents and Settings\Administrator\Pulpit\WatiN-2.0.10.928-net-2.0\bin\WatiN.Core.dll</HintPath> 
     77    </Reference> 
    6778  </ItemGroup> 
    6879  <ItemGroup> 
    6980    <Compile Include="Properties\AssemblyInfo.cs" /> 
     81    <Compile Include="Web\FakeDataContext.cs" /> 
     82    <Compile Include="Web\Function.cs" /> 
    7083    <Compile Include="Web\PlatnosciControllerTests.cs" /> 
     84    <Compile Include="Web\TestMethods.cs" /> 
     85    <Compile Include="Web\UIAccountTest.cs" /> 
     86    <Compile Include="Web\UIPlatnosciTests.cs" /> 
    7187  </ItemGroup> 
    7288  <ItemGroup> 
    … …  
    8096    </ProjectReference> 
    8197  </ItemGroup> 
     98  <ItemGroup> 
     99    <None Include="app.config" /> 
     100  </ItemGroup> 
    82101  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 
    83102  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.