Skip to content

Commit

Permalink
Build from source code fails
Browse files Browse the repository at this point in the history
  • Loading branch information
apobekiaris committed Sep 10, 2016
1 parent 4e0e6ca commit d7e8958
Show file tree
Hide file tree
Showing 55 changed files with 868 additions and 107 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<Content Include="FunctionalTests\PopupMenu\Config.xml">
<SubType>Designer</SubType>
</Content>
<None Include="FunctionalTests\PopupMenu\Init.inc" />
<Content Include="FunctionalTests\PopupMenu\Init.inc" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
*ScreenCapture

*Navigate ASPx Grid VIew Object
*ExecuteTableAction
SelectAll = True
*OptionalAction Delete
*OptionalAction Yes
*DeleteAllObjects
*Action New
*FillForm
Name = Tolis
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#Application SystemTester.Web
*UseModel
*LogOn
*ScreenCapture

;--------------setup--------------
*Navigate Column Chooser Object
*DeleteAllObjects
*Action New
*ExecuteEditorAction Column Chooser Reference(New)
*ExecuteEditorAction Column Chooser Reference Reference(New)
*FillForm
Reference Reference Name = Reference Reference Name
*Action OK
*FillForm
Reference Name = Reference Name
*Action OK
*FillForm
Name = Name
*SaveAndClose

;---------Hide name column-------------
*RClick [GridHeader]
*Sleep 1000
*LClick [ColumnChooser]
*Sleep 3000
*LClick [NodeName]
*Sleep 1000
*Action OK
!XpandProcessRecord
Name = Name
;---------add subreference column-------------
*RClick [GridHeader]
*Sleep 1000
*LClick [ColumnChooser2]
*Sleep 3000
*LClick [NodeReferenceExpand]
*Sleep 2000
*LClick [NodeSubReference]
*Sleep 1000
*Action OK
*XpandProcessRecord
Column Chooser Reference Reference = Reference Reference Name
*Navigate Column Chooser Object
;---------add subsubreference column-------------
*RClick [GridHeader]
*Sleep 1000
*LClick [ColumnChooser2]
*Sleep 3000
*LClick [NodeReferenceExpand]
*Sleep 2000
*LClick [NodeSubReferenceExpand]
*Sleep 1000
*LClick [NodeSubReferenceSub]
*Sleep 1000
*Action OK
*XpandProcessRecord
Reference Reference Name = Reference Reference Name
*Navigate Column Chooser Object
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Application Title="SystemTester" Logo="ExpressAppLogo">
<Options ColumnChooserContextMenu="True" />
</Application>
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
using DevExpress.Persistent.Base;
using DevExpress.Persistent.BaseImpl;
using DevExpress.Xpo;

namespace SystemTester.Module.Web.FunctionalTests.ColumnChooser{
[DefaultClassOptions]
public class ColumnChooserObject : BaseObject{
private ColumnChooserReference _columnChooserReference;

private string _name;

public ColumnChooserObject(Session session) : base(session){
}

public string Name{
get { return _name; }
set { SetPropertyValue(nameof(Name), ref _name, value); }
}

public ColumnChooserReference ColumnChooserReference{
get { return _columnChooserReference; }
set { SetPropertyValue(nameof(ColumnChooserReference), ref _columnChooserReference, value); }
}
}


public class ColumnChooserReference : BaseObject{
private string _referenceName;

public ColumnChooserReference(Session session) : base(session){
}

public string ReferenceName{
get { return _referenceName; }
set { SetPropertyValue(nameof(ReferenceName), ref _referenceName, value); }
}

ColumnChooserReferenceReference _columnChooserReferenceReference;

public ColumnChooserReferenceReference ColumnChooserReferenceReference{
get { return _columnChooserReferenceReference; }
set { SetPropertyValue(nameof(ColumnChooserReferenceReference), ref _columnChooserReferenceReference, value); }
}
}

public class ColumnChooserReferenceReference : BaseObject{
private string _referenceName;

public ColumnChooserReferenceReference(Session session) : base(session){
}

public string ReferenceReferenceName{
get { return _referenceName; }
set { SetPropertyValue(nameof(ReferenceReferenceName), ref _referenceName, value); }
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<Options xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" TestRunTimeLimit="3" >
<Applications>
<!-- Win -->
<Application
Name="SystemTester.Win"
FileName="[WinAppBin]\SystemTester.Win.exe"
AdapterFileName="[WinAdapterFileName]"
CommunicationPort="4100"/>
<!-- Web -->
<Application Parameter="ColumnChooser"
Name="SystemTester.Web"
Url="http://localhost:4030"
PhysicalPath="[WebAppBin]"
AdapterFileName="[WebAdapterFileName]"
/>
<!-- For IIS -->
<!--Application
Name="[SolutionName]Web"
Url="http://localhost/AdditionalCommands.Web/Default.aspx"
AdapterFileName="[WebAdapterFileName]"/-->
</Applications>
<TestDatabases>
<Database xsi:type="TestMSSQLDatabase" Server="(localdb)\mssqllocaldb" DBName="SystemTesterEasyTest" />
</TestDatabases>
<Aliases>
<Alias Name="WinAdapterFileName" Value="[ConfigPath]\..\..\..\..\..\..\Xpand.dll\Xpand.ExpressApp.EasyTest.WinAdapter.dll" />
<Alias Name="WebAdapterFileName" Value="[ConfigPath]\..\..\..\..\..\..\Xpand.dll\Xpand.ExpressApp.EasyTest.WebAdapter.dll" />
<Alias Name="WinAppBin" Value="[ConfigPath]\..\..\..\SystemTester.Win\Bin\EasyTest" />
<Alias Name="WebAppBin" Value="[ConfigPath]\..\..\..\SystemTester.Web" />
<Alias Name="GridHeader" Value="322x248"/>
<Alias Name="ColumnChooser" Value="353x408"/>
<Alias Name="ColumnChooser2" Value="353x390"/>
<Alias Name="NodeName" Value="201x348"/>
<Alias Name="NodeReference" Value="200x324"/>
<Alias Name="NodeReferenceExpand" Value="180x327"/>
<Alias Name="NodeSubReferenceExpand" Value="202x349"/>
<Alias Name="NodeSubReference" Value="221x351"/>
<Alias Name="NodeSubReferenceSub" Value="248x373"/>

</Aliases>
</Options>
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
<RootNamespace>SystemTester.Module.Web</RootNamespace>
<AssemblyName>SystemTester.Module.Web</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileUpgradeFlags></FileUpgradeFlags>
<UpgradeBackupLocation></UpgradeBackupLocation>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
Expand Down Expand Up @@ -68,6 +70,9 @@
<Reference Include="DevExpress.ExpressApp.ScriptRecorder.Web.v16.1">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DevExpress.ExpressApp.TreeListEditors.Web.v16.1">
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DevExpress.Printing.v16.1.Core">
<SpecificVersion>False</SpecificVersion>
</Reference>
Expand Down Expand Up @@ -115,6 +120,14 @@
<Reference Include="System.Xml">
<Private>False</Private>
</Reference>
<Reference Include="Xpand.ExpressApp.TreeListEditors.Web">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Xpand.DLL\Xpand.ExpressApp.TreeListEditors.Web.dll</HintPath>
</Reference>
<Reference Include="Xpand.ExpressApp.TreeListEditors.Web">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Xpand.DLL\Xpand.ExpressApp.TreeListEditors.Web.dll</HintPath>
</Reference>
<Reference Include="Xpand.ExpressApp.Web">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Xpand.DLL\Xpand.ExpressApp.Web.dll</HintPath>
Expand All @@ -125,6 +138,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="FunctionalTests\ColumnChooser\ColumnChooserObject.cs" />
<Compile Include="FunctionalTests\ASPXGridViewOptions\ASPxGridVIewObject.cs" />
<Compile Include="FunctionalTests\LayoutStyle\LayoutStyleObjects.cs" />
<Compile Include="FunctionalTests\MasterDetail\MasterDetail.cs">
Expand Down Expand Up @@ -162,6 +176,10 @@
<None Include="Editors\ReadMe.txt" />
</ItemGroup>
<ItemGroup>
<None Include="FunctionalTests\ColumnChooser\ColumnChooser.ets" />
<None Include="FunctionalTests\ColumnChooser\ColumnChooser.xafml">
<SubType>Designer</SubType>
</None>
<None Include="FunctionalTests\ASPXGridViewOptions\ASPXGridViewOptions.ets" />
<None Include="FunctionalTests\ASPXGridViewOptions\ASPXGridViewOptions.xafml">
<SubType>Designer</SubType>
Expand Down Expand Up @@ -204,6 +222,7 @@
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="FunctionalTests\ColumnChooser\Config.xml" />
<Content Include="FunctionalTests\ASPXGridViewOptions\Config.xml" />
<Content Include="FunctionalTests\LayoutStyle\Config.xml" />
<None Include="FunctionalTests\LayoutStyle\Init.inc" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using System.ComponentModel;
using DevExpress.ExpressApp;
using DevExpress.ExpressApp.Updating;
using Xpand.ExpressApp.TreeListEditors.Web;
using Xpand.Persistent.Base.General;

namespace SystemTester.Module.Web {
[ToolboxItemFilter("Xaf.Platform.Web")]
Expand All @@ -13,6 +15,12 @@ public SystemTesterAspNetModule() {
InitializeComponent();
}

public override void Setup(ApplicationModulesManager moduleManager){
base.Setup(moduleManager);
if (Application.GetEasyTestParameter("ColumnChooser"))
moduleManager.AddModule(Application,new XpandTreeListEditorsAspNetModule());
}

public override IEnumerable<ModuleUpdater> GetModuleUpdaters(IObjectSpace objectSpace, Version versionFromDB) {
return ModuleUpdater.EmptyModuleUpdaters;
}
Expand Down
5 changes: 2 additions & 3 deletions Demos/Modules/SystemTester/SystemTester.Web/WebApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@ private void OnLastLogonParametersReading(object sender, LastLogonParametersRead
}
}

protected override bool SupportMasterDetailMode{
get { return true; }
}
protected override bool SupportMasterDetailMode => true;

protected override void CreateDefaultObjectSpaceProvider(CreateCustomObjectSpaceProviderEventArgs args){
this.CreateCustomObjectSpaceprovider(args, null);
args.ObjectSpaceProviders.Add(new NonPersistentObjectSpaceProvider());
}

private void SystemTesterAspNetApplication_DatabaseVersionMismatch(object sender,
Expand Down
16 changes: 16 additions & 0 deletions Demos/SecurityDemo/SecurityDemo.Module/SecurityDemo.Module.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,22 @@
<Private>False</Private>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.4\lib\net40\Mono.Cecil.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.4\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.4\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.4\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System">
<Name>System</Name>
<Private>False</Private>
Expand Down
2 changes: 1 addition & 1 deletion GACUninstall.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

call .\Xpand.DLL\GACInstaller.exe -m UnInstall -r Xpand.*
call .\Xpand.DLL\GACInstaller.exe -m UnInstall
11 changes: 6 additions & 5 deletions Tests/Xpand.Test.WorldCreator/Xpand.Test.WorldCreator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<AssemblyName>Xpand.Test.WorldCreator</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp></NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<LangVersion>6</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -70,19 +71,19 @@
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
<HintPath>..\..\Support\_third_party_assemblies\Packages\Mono.Cecil.0.9.6.1\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq, Version=4.5.8.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
Expand Down
26 changes: 25 additions & 1 deletion Tests/Xpand.Test.WorldCreator/app.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Expand All @@ -10,6 +10,30 @@
<assemblyIdentity name="xunit.core" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.3179" newVersion="2.1.0.3179" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DevExpress.ExpressApp.v16.1" publicKeyToken="b88d1754d700e49a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.1.5.0" newVersion="16.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DevExpress.Persistent.Base.v16.1" publicKeyToken="b88d1754d700e49a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.1.5.0" newVersion="16.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DevExpress.ExpressApp.Xpo.v16.1" publicKeyToken="b88d1754d700e49a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.1.5.0" newVersion="16.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Xpand.Utils" publicKeyToken="c52ffed5d5ff0958" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.1.5.2" newVersion="16.1.5.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DevExpress.Xpo.v16.1" publicKeyToken="b88d1754d700e49a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.1.5.0" newVersion="16.1.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Xpand.Persistent.Base" publicKeyToken="c52ffed5d5ff0958" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-16.1.5.2" newVersion="16.1.5.2" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading

0 comments on commit d7e8958

Please sign in to comment.