Skip to content

Commit

Permalink
minor uppdates
Browse files Browse the repository at this point in the history
  • Loading branch information
apobekiaris committed Jun 21, 2019
1 parent b1df47f commit 3ad7b67
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions go.ps1
Expand Up @@ -2,13 +2,13 @@ param(
[string]$packageSources = "C:\Program Files (x86)\DevExpress 18.2\Components\System\Components\packages",
[string]$msbuild = $null,
[string]$nugetApiKey = $null,
[string]$dxVersion = "19.1.3",
[string]$dxVersion = "18.2.7",
[bool]$build = $true,
[bool]$cleanBin = $true,
[string]$branch="lab",
[switch]$InstallModules,
[string[]]$taskList=@("Release"),
[string]$XpandPwshVersion = "0.8.0",
[string]$XpandPwshVersion = "0.9.2",
[switch]$Release
)
$ErrorActionPreference = "Stop"
Expand Down
5 changes: 1 addition & 4 deletions src/Tests/Modules/ModelMapper/ModelExtendingServiceTests.cs
@@ -1,16 +1,13 @@
using System;
using System.Linq;
using System.Reactive.Linq;
using System.Reflection;
using System.Threading.Tasks;
using DevExpress.Data.Filtering;
using DevExpress.ExpressApp;
using DevExpress.ExpressApp.Model;
using DevExpress.ExpressApp.Win.Editors;
using DevExpress.Utils;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
using Fasterflect;
using Shouldly;
using Tests.Modules.ModelMapper.BOModel;
using Xpand.Source.Extensions.System.String;
Expand Down Expand Up @@ -80,7 +77,7 @@ public class ModelMapperExtenderServiceTests : ModelMapperBaseTest{
}

[Fact]
public async Task Extend_Multiple_Objects_with_common_types(){
public void Extend_Multiple_Objects_with_common_types(){
var typeToMap1 = typeof(TestModelMapperCommonType1);
var typeToMap2 = typeof(TestModelMapperCommonType2);
InitializeMapperService(nameof(Extend_Multiple_Objects_with_common_types));
Expand Down
2 changes: 2 additions & 0 deletions tools/Build/CreateNuspec.ps1
Expand Up @@ -76,6 +76,8 @@ get-childitem "$root\src\" -Include "*.csproj" -Exclude "*Tests*", "*.Source.*"
ReferenceToPackageFilter="Xpand.XAF*"
PublishedSource=(Get-PackageFeed -Xpand)
Release=$Release
ReadMe=$true

}
$nuspec=Update-Nuspec @uArgs
New-Item -ItemType Directory -Path "$root\bin\nuspec" -Force -ErrorAction SilentlyContinue|Out-Null
Expand Down
2 changes: 1 addition & 1 deletion tools/Build/lab-Pipeline.yml
Expand Up @@ -40,7 +40,7 @@ steps:
uiTests: true
runInParallel: false
diagnosticsEnabled: true
runTestsInIsolation: false
runTestsInIsolation: true
codeCoverageEnabled: true
rerunFailedTests: true
- task: PowerShell@2
Expand Down

0 comments on commit 3ad7b67

Please sign in to comment.