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 2016/04/22 14:29:59 UTC
[17/50] [abbrv] ignite git commit: IGNITE-2397: .NET: Fixed NuGet
LINQPad examples for x86. This closes #596.
IGNITE-2397: .NET: Fixed NuGet LINQPad examples for x86. This closes #596.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/61c547a1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/61c547a1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/61c547a1
Branch: refs/heads/ignite-db-x-10884
Commit: 61c547a15b368f79bb53c59d78a2609953c4808d
Parents: 12a1966
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Mon Apr 11 14:36:40 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Apr 11 14:36:40 2016 +0300
----------------------------------------------------------------------
.../Apache.Ignite.Core.Tests.NuGet.csproj | 18 ++++++++++++++++++
.../Apache.Ignite.Core.Tests.NuGet.sln | 6 ++++++
.../Apache.Ignite.Core/Apache.Ignite.Core.csproj | 2 +-
.../NuGet/LINQPad/QueryExample.linq | 6 +++---
4 files changed, 28 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/61c547a1/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.csproj
index 3ff1a37..af3037c 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.csproj
@@ -51,6 +51,24 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="Apache.Ignite.Core">
<SpecificVersion>False</SpecificVersion>
http://git-wip-us.apache.org/repos/asf/ignite/blob/61c547a1/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.sln
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.sln b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.sln
index 1c79873..9d3a016 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.sln
@@ -5,16 +5,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests.Nu
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {134707F6-155D-47F6-9EB2-C67ABBF3C009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {134707F6-155D-47F6-9EB2-C67ABBF3C009}.Debug|Any CPU.Build.0 = Debug|Any CPU
{134707F6-155D-47F6-9EB2-C67ABBF3C009}.Debug|x64.ActiveCfg = Debug|x64
{134707F6-155D-47F6-9EB2-C67ABBF3C009}.Debug|x64.Build.0 = Debug|x64
{134707F6-155D-47F6-9EB2-C67ABBF3C009}.Debug|x86.ActiveCfg = Debug|x64
{134707F6-155D-47F6-9EB2-C67ABBF3C009}.Debug|x86.Build.0 = Debug|x64
+ {134707F6-155D-47F6-9EB2-C67ABBF3C009}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {134707F6-155D-47F6-9EB2-C67ABBF3C009}.Release|Any CPU.Build.0 = Release|Any CPU
{134707F6-155D-47F6-9EB2-C67ABBF3C009}.Release|x64.ActiveCfg = Release|x64
{134707F6-155D-47F6-9EB2-C67ABBF3C009}.Release|x64.Build.0 = Release|x64
{134707F6-155D-47F6-9EB2-C67ABBF3C009}.Release|x86.ActiveCfg = Release|x86
http://git-wip-us.apache.org/repos/asf/ignite/blob/61c547a1/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 7deaf69..24ccad2 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -471,7 +471,7 @@
<EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\x64\$(Configuration)\ignite.common.dll">
<Link>resources\$(Configuration)\x64\ignite.common.dll</Link>
</EmbeddedResource>
- <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll" Condition="Exists('$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll')">
+ <EmbeddedResource Include="$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll" Condition="'$(Configuration)' == 'Release' Or Exists('$(ProjectDir)..\..\cpp\common\project\vs\Win32\$(Configuration)\ignite.common.dll')">
<Link>resources\$(Configuration)\x86\ignite.common.dll</Link>
</EmbeddedResource>
</ItemGroup>
http://git-wip-us.apache.org/repos/asf/ignite/blob/61c547a1/modules/platforms/dotnet/Apache.Ignite.Linq/NuGet/LINQPad/QueryExample.linq
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Linq/NuGet/LINQPad/QueryExample.linq b/modules/platforms/dotnet/Apache.Ignite.Linq/NuGet/LINQPad/QueryExample.linq
index eedbd7b..9cce4ec 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Linq/NuGet/LINQPad/QueryExample.linq
+++ b/modules/platforms/dotnet/Apache.Ignite.Linq/NuGet/LINQPad/QueryExample.linq
@@ -29,13 +29,13 @@
/// with binary values. Note that binary object can be retrieved in
/// fully-deserialized form or in binary object format using special
/// cache projection.
+///
+/// Requirements:
+/// * Java Runtime Environment (JRE): http://www.oracle.com/technetwork/java/javase/downloads/index.html (x86 for regular LINQPad, x64 for AnyCPU LINQPad)
/// </summary>
void Main()
{
- if (!Environment.Is64BitProcess)
- throw new Exception("x64 LINQPad is required to run this sample (see AnyCPU build: http://www.linqpad.net/Download.aspx)");
-
// Force new LINQPad query process to reinit JVM
Util.NewProcess = true;