You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/07 12:52:38 UTC
[3/5] ignite git commit: IGNITE-7002 .NET: Add cross-platform
examples on .NET Core (missed changes)
IGNITE-7002 .NET: Add cross-platform examples on .NET Core
(missed changes)
This closes #3119
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e15cbcc5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e15cbcc5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e15cbcc5
Branch: refs/heads/ignite-zk
Commit: e15cbcc5987e0674266efbc73ca15b9315f0efd5
Parents: 3b314f7
Author: Pavel Tupitsyn <pt...@apache.org>
Authored: Tue Dec 5 14:18:57 2017 +0300
Committer: Pavel Tupitsyn <pt...@apache.org>
Committed: Tue Dec 5 14:18:57 2017 +0300
----------------------------------------------------------------------
.../dotnet/Apache.Ignite.Core.Tests/Examples/Example.cs | 7 +++++--
.../dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e15cbcc5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/Example.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/Example.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/Example.cs
index 4d1eeb6..de43666 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/Example.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Examples/Example.cs
@@ -73,7 +73,8 @@ namespace Apache.Ignite.Core.Tests.Examples
{
var examplesAsm = typeof (ClosureExample).Assembly;
- var sourceFiles = Directory.GetFiles(PathUtil.ExamplesSourcePath, "*.cs", SearchOption.AllDirectories);
+ var sourceFiles = Directory.GetFiles(PathUtil.ExamplesSourcePath, "*.cs", SearchOption.AllDirectories)
+ .Where(x => !x.Contains("dotnetcore")).ToArray();
Assert.IsTrue(sourceFiles.Any());
@@ -102,7 +103,9 @@ namespace Apache.Ignite.Core.Tests.Examples
/// </summary>
private static Action GetRunAction(Type type)
{
- return (Action) Delegate.CreateDelegate(typeof (Action), type.GetMethod("Main"));
+ var mainMethod = type.GetMethod("Main");
+ Assert.IsNotNull(mainMethod);
+ return (Action) Delegate.CreateDelegate(typeof (Action), mainMethod);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/ignite/blob/e15cbcc5/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs
index 5415378..513ec0c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs
@@ -37,7 +37,7 @@ namespace Apache.Ignite.Core.Tests
public void TestCsprojToolsVersion()
{
var projFiles = GetDotNetSourceDir().GetFiles("*.csproj", SearchOption.AllDirectories)
- .Where(x => !x.Name.Contains("DotNetCore")).ToArray();
+ .Where(x => !x.FullName.ToLower().Contains("dotnetcore")).ToArray();
Assert.GreaterOrEqual(projFiles.Length, 7);
CheckFiles(projFiles, x => !x.Contains("ToolsVersion=\"4.0\""), "Invalid csproj files: ");