Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A777718A0F for ; Wed, 6 Apr 2016 07:55:06 +0000 (UTC) Received: (qmail 66476 invoked by uid 500); 6 Apr 2016 07:55:06 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 66351 invoked by uid 500); 6 Apr 2016 07:55:06 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 66087 invoked by uid 99); 6 Apr 2016 07:55:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2016 07:55:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3572DDFC74; Wed, 6 Apr 2016 07:55:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Wed, 06 Apr 2016 07:55:14 -0000 Message-Id: <6ecea6e3cbf8445f8e349816be13f2f9@git.apache.org> In-Reply-To: <2aa8831670f14c30abc23165697f9659@git.apache.org> References: <2aa8831670f14c30abc23165697f9659@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/50] [abbrv] ignite git commit: IGNITE-2694: .NET: Added "AnyCPU" build. This closes #546. IGNITE-2694: .NET: Added "AnyCPU" build. This closes #546. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b2d40756 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b2d40756 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b2d40756 Branch: refs/heads/ignite-2630 Commit: b2d4075697dff686d9f6a43669b01728ead24c80 Parents: bae8615 Author: Pavel Tupitsyn Authored: Wed Mar 30 17:36:26 2016 +0300 Committer: vozerov-gridgain Committed: Wed Mar 30 17:36:26 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/nio/GridNioServer.java | 3 +- .../communication/tcp/TcpCommunicationSpi.java | 3 +- .../Apache.Ignite.Benchmarks.csproj | 36 ++--- .../Apache.Ignite.Core.Tests.TestDll.csproj | 32 ++--- .../Apache.Ignite.Core.Tests.csproj | 45 +++--- .../ProjectFilesTest.cs | 8 +- .../Apache.Ignite.Core.csproj | 34 ++++- .../Apache.Ignite.Core.nuspec | 11 +- .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 11 +- .../Impl/Unmanaged/UnmanagedUtils.cs | 6 +- .../NuGet/LINQPad/ComputeExample.linq | 6 +- .../NuGet/LINQPad/PutGetExample.linq | 6 +- .../NuGet/LINQPad/QueryExample.linq | 6 +- .../dotnet/Apache.Ignite.Core/build-common.ps1 | 64 +++++++++ .../powershell.exe.activation_config | 29 ++++ modules/platforms/dotnet/Apache.Ignite.sln | 141 +++++++++++-------- .../dotnet/Apache.Ignite/Apache.Ignite.csproj | 33 ++--- modules/platforms/dotnet/DEVNOTES.txt | 7 +- modules/platforms/dotnet/build.bat | 94 ------------- .../dotnet/examples/Apache.Ignite.Examples.sln | 24 ++-- .../Apache.Ignite.Examples.csproj | 44 +++--- .../Apache.Ignite.ExamplesDll.csproj | 42 +++--- 22 files changed, 347 insertions(+), 338 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index c9c64ec..a32f04f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -1481,8 +1481,7 @@ public class GridNioServer { sb.append("]").append(U.nl()); } - if (log.isInfoEnabled()) - log.info(sb.toString()); + U.warn(log, sb.toString()); // Complete the request just in case (none should wait on this future). req.onDone(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index df60982..19858b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -1394,8 +1394,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter .append(']').append(U.nl()); } - if (log.isInfoEnabled()) - log.info(sb.toString()); + U.warn(log, sb.toString()); GridNioServer nioSrvr1 = nioSrvr; http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj index b477d17..811047c 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj @@ -3,7 +3,7 @@ Debug - x64 + AnyCPU {8F507DBE-56F9-437F-82D4-74C02EC44E41} Exe Properties @@ -15,33 +15,25 @@ Apache.Ignite.Benchmarks.BenchmarkRunner - - x86 - bin\x86\Debug\ - DEBUG - 4 - - - x86 - bin\x86\Release\ - true - - - x64 - bin\x64\Debug\ - DEBUG - - - x64 - bin\x64\Release\ - true - true Apache.Ignite.Benchmarks.snk + + true + bin\Debug\ + DEBUG + AnyCPU + MinimumRecommendedRules.ruleset + + + bin\Release\ + true + AnyCPU + MinimumRecommendedRules.ruleset + http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj index ebe07eb..031f6cc 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj @@ -3,7 +3,7 @@ Debug - x64 + AnyCPU {F4A69E2D-908E-4F0F-A794-84D508D60E5F} Library Properties @@ -12,30 +12,24 @@ v4.0 512 - - x86 - bin\x86\Debug\ - - - x86 - bin\x86\Release\ - true - - - x64 - bin\x64\Debug\ - - - x64 - bin\x64\Release\ - true - true Apache.Ignite.Core.Tests.TestDll.snk + + true + bin\Debug\ + AnyCPU + MinimumRecommendedRules.ruleset + + + bin\Release\ + true + AnyCPU + MinimumRecommendedRules.ruleset + http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj index 38ddd4d..6df25d4 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj @@ -3,7 +3,7 @@ Debug - x64 + AnyCPU {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A} Exe Properties @@ -15,35 +15,26 @@ - - x64 - bin\x64\Debug\ - true - DEBUG + + true - - x64 - bin\x64\Release\ - true - true + + Apache.Ignite.Core.Tests.snk - - x86 - bin\x86\Debug\ - true + + true + bin\Debug\ DEBUG + true + AnyCPU + MinimumRecommendedRules.ruleset - - x86 - bin\x86\Release\ + + bin\Release\ true true - - - true - - - Apache.Ignite.Core.Tests.snk + AnyCPU + MinimumRecommendedRules.ruleset @@ -281,10 +272,14 @@ - + copy /Y $(SolutionDir)Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe $(ProjectDir)$(OutDir) copy /Y $(SolutionDir)Apache.Ignite\bin\$(PlatformName)\$(ConfigurationName)\Apache.Ignite.exe.config $(ProjectDir)$(OutDir) + + copy /Y $(SolutionDir)Apache.Ignite\bin\$(ConfigurationName)\Apache.Ignite.exe $(ProjectDir)$(OutDir) +copy /Y $(SolutionDir)Apache.Ignite\bin\$(ConfigurationName)\Apache.Ignite.exe.config $(ProjectDir)$(OutDir) + Apache.Ignite - Apache Ignite x64 + Apache Ignite $version$ Apache Ignite @@ -43,8 +43,6 @@ Creating NuGet package: Apache Ignite In-Memory Data Fabric is a high-performance, integrated and distributed in-memory platform for computing and transacting on large-scale data sets in real-time, orders of magnitude faster than possible with traditional disk-based or flash technologies. More info: https://apacheignite-net.readme.io/ - -WARNING: this only works with x64 build targets. High-performance in-memory platform for computing and transacting on large-scale data sets in real-time. @@ -54,9 +52,6 @@ WARNING: this only works with x64 build targets. Apache Ignite In-Memory Distributed Computing SQL NoSQL Grid Map Reduce Cache linqpad-samples - - - http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs index 7f6fab8..b02239d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/IgniteUtils.cs @@ -278,7 +278,7 @@ namespace Apache.Ignite.Core.Impl // Current version comes first var versions = new[] {curVer}.Concat(jSubKey.GetSubKeyNames().Where(x => x != curVer)); - foreach (var ver in versions) + foreach (var ver in versions.Where(v => !string.IsNullOrEmpty(v))) { using (var verKey = jSubKey.OpenSubKey(ver)) { @@ -296,13 +296,16 @@ namespace Apache.Ignite.Core.Impl /// Unpacks an embedded resource into a temporary folder and returns the full path of resulting file. /// /// Resource name. - /// Path to a temp file with an unpacked resource. - public static string UnpackEmbeddedResource(string resourceName) + /// Name of the resulting file. + /// + /// Path to a temp file with an unpacked resource. + /// + public static string UnpackEmbeddedResource(string resourceName, string fileName) { var dllRes = Assembly.GetExecutingAssembly().GetManifestResourceNames() .Single(x => x.EndsWith(resourceName, StringComparison.OrdinalIgnoreCase)); - return WriteResourceToTempFile(dllRes, resourceName); + return WriteResourceToTempFile(dllRes, fileName); } /// http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs index cdcddf0..afe46a8 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Unmanaged/UnmanagedUtils.cs @@ -37,7 +37,11 @@ namespace Apache.Ignite.Core.Impl.Unmanaged [SuppressMessage("Microsoft.Design", "CA1065:DoNotRaiseExceptionsInUnexpectedLocations")] static UnmanagedUtils() { - var path = IgniteUtils.UnpackEmbeddedResource(IgniteUtils.FileIgniteJniDll); + var platfrom = Environment.Is64BitProcess ? "x64" : "x86"; + + var resName = string.Format("{0}.{1}", platfrom, IgniteUtils.FileIgniteJniDll); + + var path = IgniteUtils.UnpackEmbeddedResource(resName, IgniteUtils.FileIgniteJniDll); var ptr = NativeMethods.LoadLibrary(path); http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/ComputeExample.linq ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/ComputeExample.linq b/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/ComputeExample.linq index 921af3e..2ed0493 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/ComputeExample.linq +++ b/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/ComputeExample.linq @@ -26,13 +26,13 @@ /// /// Example demonstrating closure execution. +/// +/// Requirements: +/// * Java Runtime Environment (JRE): http://www.oracle.com/technetwork/java/javase/downloads/index.html (x86 for regular LINQPad, x64 for AnyCPU LINQPad) /// 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; http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/PutGetExample.linq ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/PutGetExample.linq b/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/PutGetExample.linq index 2995f01..97d9bbe 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/PutGetExample.linq +++ b/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/PutGetExample.linq @@ -25,13 +25,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) /// 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; http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/QueryExample.linq ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/QueryExample.linq b/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/QueryExample.linq index 5a37f36..b7f7981 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/QueryExample.linq +++ b/modules/platforms/dotnet/Apache.Ignite.Core/NuGet/LINQPad/QueryExample.linq @@ -28,13 +28,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) /// 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; http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1 ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1 b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1 new file mode 100644 index 0000000..3df6c76 --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core/build-common.ps1 @@ -0,0 +1,64 @@ +param([string]$configuration="Debug", [string]$msbuildexe = "MSBuild.exe") + +$x64 = [System.Environment]::Is64BitOperatingSystem +$jdkRegKey = 'Software\JavaSoft\Java Development Kit' + +# Fisrt, check if JAVA_HOME env vars are set +if (Test-Path Env:\JAVA_HOME) { + if ($x64 -and !$env:JAVA_HOME64) { + $env:JAVA_HOME64 = $env:JAVA_HOME + } + elseif (!$env:JAVA_HOME32) { + $env:JAVA_HOME32 = $env:JAVA_HOME + } +} + +# Next, check registry +Function GetJavaHome([string]$path, [Microsoft.Win32.RegistryView] $mode) { + $key = [Microsoft.Win32.RegistryKey]::OpenBaseKey([Microsoft.Win32.RegistryHive]::LocalMachine, $mode).OpenSubKey($path) + + if ($key -eq $null) { + return $null + } + + $subKeys = $key.GetSubKeyNames() + $curVer = $key.GetValue("CurrentVersion") + + if ($subKeys.Length -eq 0) { + return $null + } + + if ($curVer -eq $null -or !$subKeys.Contains($curVer)) { + $curVer = $subKeys[0] + } + + return $key.OpenSubKey($curVer).GetValue("JavaHome") +} + +# do not read registry if env vars are already set +if (!$env:JAVA_HOME32) { + $env:JAVA_HOME32 = GetJavaHome $jdkRegKey Registry32 +} + + +if ($x64 -and !$env:JAVA_HOME64) { + $env:JAVA_HOME64 = GetJavaHome $jdkRegKey Registry64 +} + +echo "JAVA_HOME64: $env:JAVA_HOME64" +echo "JAVA_HOME32: $env:JAVA_HOME32" +echo "msbuildexe: $msbuildexe" +echo "x64: $x64" + +# build common project +if ($env:JAVA_HOME64) { + $env:JAVA_HOME = $env:JAVA_HOME64 + + & $msbuildexe "..\..\cpp\common\project\vs\common.vcxproj" /p:Platform=x64 /p:Configuration=$Configuration /t:Rebuild +} + +if ($env:JAVA_HOME32) { + $env:JAVA_HOME = $env:JAVA_HOME32 + + & $msbuildexe "..\..\cpp\common\project\vs\common.vcxproj" /p:Platform=Win32 /p:Configuration=$Configuration /t:Rebuild +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/powershell.exe.activation_config ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/powershell.exe.activation_config b/modules/platforms/dotnet/Apache.Ignite.Core/powershell.exe.activation_config new file mode 100644 index 0000000..4d753cd --- /dev/null +++ b/modules/platforms/dotnet/Apache.Ignite.Core/powershell.exe.activation_config @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.sln ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln index 12fd82b..f323a28 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln +++ b/modules/platforms/dotnet/Apache.Ignite.sln @@ -26,7 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Apache.Ignite.FxCop = Apache.Ignite.FxCop Apache.Ignite.sln.DotSettings = Apache.Ignite.sln.DotSettings Apache.Ignite.sln.TeamCity.DotSettings = Apache.Ignite.sln.TeamCity.DotSettings - build.bat = build.bat DEVNOTES.txt = DEVNOTES.txt examples\Config\examples-config.xml = examples\Config\examples-config.xml README.txt = README.txt @@ -34,76 +33,106 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution 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 + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x64.ActiveCfg = Debug|x64 {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x64.Build.0 = Debug|x64 {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x86.ActiveCfg = Debug|x86 {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Debug|x86.Build.0 = Debug|x86 - {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x64.ActiveCfg = Release|x64 - {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x64.Build.0 = Release|x64 - {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x86.ActiveCfg = Release|x86 - {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x86.Build.0 = Release|x86 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x64.ActiveCfg = Debug|x64 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x64.Build.0 = Debug|x64 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x86.ActiveCfg = Debug|x86 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x86.Build.0 = Debug|x86 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.ActiveCfg = Release|x64 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.Build.0 = Release|x64 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.ActiveCfg = Release|x86 - {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.Build.0 = Release|x86 + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|Any CPU.Build.0 = Release|Any CPU + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x64.ActiveCfg = Release|Any CPU + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x64.Build.0 = Release|Any CPU + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x86.ActiveCfg = Release|Any CPU + {4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}.Release|x86.Build.0 = Release|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x64.ActiveCfg = Debug|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x64.Build.0 = Debug|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x86.ActiveCfg = Debug|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Debug|x86.Build.0 = Debug|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|Any CPU.Build.0 = Release|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.ActiveCfg = Release|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x64.Build.0 = Release|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.ActiveCfg = Release|Any CPU + {6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}.Release|x86.Build.0 = Release|Any CPU + {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Any CPU.ActiveCfg = Debug|x64 {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64 {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.Build.0 = Debug|x64 {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.ActiveCfg = Debug|Win32 {4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x86.Build.0 = Debug|Win32 + {4F7E4917-4612-4B96-9838-025711ADE391}.Release|Any CPU.ActiveCfg = Release|x64 {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64 - {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = Release|x64 - {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.ActiveCfg = Release|Win32 - {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.Build.0 = Release|Win32 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x64.ActiveCfg = Debug|x64 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x64.Build.0 = Debug|x64 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x86.ActiveCfg = Debug|x86 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x86.Build.0 = Debug|x86 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x64.ActiveCfg = Release|x64 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x64.Build.0 = Release|x64 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x86.ActiveCfg = Release|x86 - {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x86.Build.0 = Release|x86 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x64.ActiveCfg = Debug|x64 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x64.Build.0 = Debug|x64 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x86.ActiveCfg = Debug|x86 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x86.Build.0 = Debug|x86 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x64.ActiveCfg = Release|x64 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x64.Build.0 = Release|x64 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x86.ActiveCfg = Release|x86 - {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x86.Build.0 = Release|x86 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x64.ActiveCfg = Debug|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x64.Build.0 = Debug|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x86.ActiveCfg = Debug|x86 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x86.Build.0 = Debug|x86 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x64.ActiveCfg = Release|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x64.Build.0 = Release|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x86.ActiveCfg = Release|x86 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x86.Build.0 = Release|x86 - {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x64.ActiveCfg = Debug|x64 - {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x64.Build.0 = Debug|x64 - {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x86.ActiveCfg = Debug|x86 - {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x86.Build.0 = Debug|x86 - {DFB08363-202E-412D-8812-349EF10A8702}.Release|x64.ActiveCfg = Release|x64 - {DFB08363-202E-412D-8812-349EF10A8702}.Release|x64.Build.0 = Release|x64 - {DFB08363-202E-412D-8812-349EF10A8702}.Release|x86.ActiveCfg = Release|x86 - {DFB08363-202E-412D-8812-349EF10A8702}.Release|x86.Build.0 = Release|x86 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x64.ActiveCfg = Debug|x64 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x64.Build.0 = Debug|x64 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x86.ActiveCfg = Debug|x86 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x86.Build.0 = Debug|x86 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x64.ActiveCfg = Release|x64 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x64.Build.0 = Release|x64 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.ActiveCfg = Release|x86 - {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.Build.0 = Release|x86 + {4F7E4917-4612-4B96-9838-025711ADE391}.Release|x86.ActiveCfg = Release|x64 + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x64.ActiveCfg = Debug|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x64.Build.0 = Debug|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x86.ActiveCfg = Debug|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Debug|x86.Build.0 = Debug|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|Any CPU.Build.0 = Release|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x64.ActiveCfg = Release|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x64.Build.0 = Release|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x86.ActiveCfg = Release|Any CPU + {F4A69E2D-908E-4F0F-A794-84D508D60E5F}.Release|x86.Build.0 = Release|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x64.ActiveCfg = Debug|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x64.Build.0 = Debug|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x86.ActiveCfg = Debug|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Debug|x86.Build.0 = Debug|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|Any CPU.Build.0 = Release|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x64.ActiveCfg = Release|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x64.Build.0 = Release|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x86.ActiveCfg = Release|Any CPU + {27F7F3C6-BDDE-43A9-B565-856F8395A04B}.Release|x86.Build.0 = Release|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|Any CPU.Build.0 = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x64.ActiveCfg = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x64.Build.0 = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x86.ActiveCfg = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x86.Build.0 = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|Any CPU.ActiveCfg = Release|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|Any CPU.Build.0 = Release|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x64.ActiveCfg = Release|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x64.Build.0 = Release|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x86.ActiveCfg = Release|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x86.Build.0 = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x64.ActiveCfg = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x64.Build.0 = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x86.ActiveCfg = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x86.Build.0 = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|Any CPU.Build.0 = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|x64.ActiveCfg = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|x64.Build.0 = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|x86.ActiveCfg = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|x86.Build.0 = Release|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x64.ActiveCfg = Debug|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x64.Build.0 = Debug|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x86.ActiveCfg = Debug|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Debug|x86.Build.0 = Debug|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|Any CPU.Build.0 = Release|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x64.ActiveCfg = Release|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x64.Build.0 = Release|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.ActiveCfg = Release|Any CPU + {8F507DBE-56F9-437F-82D4-74C02EC44E41}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj index ccebbfe..08c14f2 100644 --- a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj +++ b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj @@ -3,7 +3,7 @@ Debug - x64 + AnyCPU {27F7F3C6-BDDE-43A9-B565-856F8395A04B} Exe Properties @@ -12,31 +12,24 @@ v4.0 512 - - x64 - bin\x64\Debug\ - false - - - x64 - bin\x64\Release\ - true - - - x86 - bin\x86\Debug\ - - - x86 - bin\x86\Release\ - true - true Apache.Ignite.snk + + true + bin\Debug\ + AnyCPU + MinimumRecommendedRules.ruleset + + + bin\Release\ + true + AnyCPU + MinimumRecommendedRules.ruleset + http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/DEVNOTES.txt ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/DEVNOTES.txt b/modules/platforms/dotnet/DEVNOTES.txt index 5650283..630960e 100644 --- a/modules/platforms/dotnet/DEVNOTES.txt +++ b/modules/platforms/dotnet/DEVNOTES.txt @@ -9,8 +9,13 @@ Requirements: * JAVA_HOME environment variable set to the corresponding JDK (x64 or x86). Building binaries: - msbuild Apache.Ignite.sln /p:Configuration=Release /p:Platform=x64 + msbuild Apache.Ignite.sln /p:Configuration=Release Resulting binaries will be in Apache.Ignite\bin folder +NOTE: +* x86 solution platform requires x86 Oracle JDK. +* x64 solution platform requires x64 Oracle JDK. +* AnyCPU platform requires at least one of the above. +To build truly universal AnyCPU binaries (suitable for x86 and x64 modes), both x64 and x86 Oracle JDKs should be installed. Building in later versions of Visual Studio: * Open Apache.Ignite.sln in Visual Studio http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/build.bat ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/build.bat b/modules/platforms/dotnet/build.bat deleted file mode 100644 index e2dfeed..0000000 --- a/modules/platforms/dotnet/build.bat +++ /dev/null @@ -1,94 +0,0 @@ -:: -:: Licensed to the Apache Software Foundation (ASF) under one or more -:: contributor license agreements. See the NOTICE file distributed with -:: this work for additional information regarding copyright ownership. -:: The ASF licenses this file to You under the Apache License, Version 2.0 -:: (the "License"); you may not use this file except in compliance with -:: the License. You may obtain a copy of the License at -:: -:: http://www.apache.org/licenses/LICENSE-2.0 -:: -:: Unless required by applicable law or agreed to in writing, software -:: distributed under the License is distributed on an "AS IS" BASIS, -:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -:: See the License for the specific language governing permissions and -:: limitations under the License. -:: - -:: -:: Ignite.NET build script. -:: - -@echo OFF - -rem uncomment the following if having problems with Microsoft.Cpp.Default.props -rem SET VCTargetsPath=C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120 - -set PLATFORM=%1 -if [%PLATFORM%]==[] set PLATFORM=x64 - -set TARGET_DIR=bin -if not [%PLATFORM%]==[x64] set TARGET_DIR=%TARGET_DIR%\%PLATFORM% - -rem Validate path to .Net installation. -IF NOT EXIST %DOTNET_PATH%\MSBuild.exe SET DOTNET_PATH=c:\Windows\Microsoft.NET\Framework\v4.0.30319 -IF NOT EXIST %DOTNET_PATH%\MSBuild.exe GOTO INVALID_DOTNET_PATH - -set PATH0=%PATH% -set PATH=%PATH0%;%DOTNET_PATH% - -echo Switch to build script directory %~dp0 -cd %~dp0 - -rem Build project. -echo . -echo Build project for platform: %PLATFORM% -MSBuild.exe Apache.Ignite.sln /t:Clean;Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /val /m /nologo /ds - -IF %ERRORLEVEL% NEQ 0 GOTO ERROR - -set PATH=%PATH0% - -rem Build distributions. -echo . -echo Copy client libraries into the distribution directory: %TARGET_DIR% - -rmdir /S /Q %TARGET_DIR% -IF NOT EXIST %TARGET_DIR%\NUL mkdir %TARGET_DIR% - -copy /Y Apache.Ignite\bin\%PLATFORM%\Release\*.* %TARGET_DIR% - -copy /Y readme.txt %TARGET_DIR% - -goto DONE - -:INVALID_DOTNET_PATH -echo DOTNET_PATH=%DOTNET_PATH% is invalid path to .Net installation. - -set ERRORLEVEL=1 -goto ERROR - -:INVALID_TEST_RESULT -echo No test results generated during tests execution. - -set ERRORLEVEL=1 - -goto ERROR - -:ERROR -set _ERRORLVL=%ERRORLEVEL% - -echo Breaked due to upper errors with exit code: %_ERRORLVL% - -echo ON - -@exit /b %_ERRORLVL% - -:DONE - -echo. -echo Done! - -:END - -echo ON http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/examples/Apache.Ignite.Examples.sln ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples.sln b/modules/platforms/dotnet/examples/Apache.Ignite.Examples.sln index d898abc..1254245 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples.sln +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples.sln @@ -15,22 +15,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{F14916 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|x64 = Release|x64 - Release|x86 = Release|x86 + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x64.ActiveCfg = Debug|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x64.Build.0 = Debug|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x86.ActiveCfg = Debug|x86 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|x86.Build.0 = Debug|x86 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x64.ActiveCfg = Release|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x64.Build.0 = Release|x64 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x86.ActiveCfg = Release|x86 - {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|x86.Build.0 = Release|x86 - {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x64.ActiveCfg = Debug|x64 - {DFB08363-202E-412D-8812-349EF10A8702}.Debug|x86.ActiveCfg = Debug|x86 - {DFB08363-202E-412D-8812-349EF10A8702}.Release|x64.ActiveCfg = Release|x64 - {DFB08363-202E-412D-8812-349EF10A8702}.Release|x86.ActiveCfg = Release|x86 + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Debug|Any CPU.Build.0 = Debug|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|Any CPU.ActiveCfg = Release|Any CPU + {069FA680-3C4D-43A9-B84F-E67513B87827}.Release|Any CPU.Build.0 = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DFB08363-202E-412D-8812-349EF10A8702}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj index d72eaa3..14d0494 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj @@ -3,7 +3,7 @@ Debug - x64 + AnyCPU {069FA680-3C4D-43A9-B84F-E67513B87827} Exe Properties @@ -12,43 +12,33 @@ v4.0 512 - - x64 - bin\x64\Debug\ - - - x64 - bin\x64\Release\ - full - true - true - Apache.Ignite.Examples.Compute.TaskExample - - true - bin\x86\Debug\ - x86 - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - x86 - MinimumRecommendedRules.ruleset - true - true Apache.Ignite.Examples.snk + + true + bin\Debug\ + AnyCPU + MinimumRecommendedRules.ruleset + + + true + bin\Release\ + true + full + AnyCPU + MinimumRecommendedRules.ruleset + - ..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll - ..\..\bin\x86\Apache.Ignite.Core.dll - ..\..\bin\Apache.Ignite.Core.dll + ..\..\Apache.Ignite\bin\$(Configuration)\Apache.Ignite.Core.dll + ..\..\bin\Apache.Ignite.Core.dll http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj index 1cf729b..16d0be3 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj +++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj @@ -3,7 +3,7 @@ Debug - x64 + AnyCPU {DFB08363-202E-412D-8812-349EF10A8702} Library Properties @@ -12,40 +12,30 @@ v4.0 512 - - x64 - bin\x64\Debug\ + + true - - x64 - bin\x64\Release\ - full - true - true + + Apache.Ignite.ExamplesDll.snk - + true - bin\x86\Debug\ - x86 + bin\Debug\ + AnyCPU MinimumRecommendedRules.ruleset - - bin\x86\Release\ - x86 - MinimumRecommendedRules.ruleset + + true + bin\Release\ true - - - true - - - Apache.Ignite.ExamplesDll.snk + full + AnyCPU + MinimumRecommendedRules.ruleset - ..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll - ..\..\bin\x86\Apache.Ignite.Core.dll - ..\..\bin\Apache.Ignite.Core.dll + ..\..\Apache.Ignite\bin\$(Configuration)\Apache.Ignite.Core.dll + ..\..\bin\Apache.Ignite.Core.dll