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 <[email protected]> Authored: Wed Mar 30 17:36:26 2016 +0300 Committer: vozerov-gridgain <[email protected]> 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<T> { 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<Message> 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 @@ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x64</Platform> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{8F507DBE-56F9-437F-82D4-74C02EC44E41}</ProjectGuid> <OutputType>Exe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -15,33 +15,25 @@ <PropertyGroup> <StartupObject>Apache.Ignite.Benchmarks.BenchmarkRunner</StartupObject> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Debug\</OutputPath> - <DefineConstants>DEBUG</DefineConstants> - <LangVersion>4</LangVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Release\</OutputPath> - <Optimize>true</Optimize> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Debug\</OutputPath> - <DefineConstants>DEBUG</DefineConstants> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Release\</OutputPath> - <Optimize>true</Optimize> - </PropertyGroup> <PropertyGroup> <SignAssembly>true</SignAssembly> </PropertyGroup> <PropertyGroup> <AssemblyOriginatorKeyFile>Apache.Ignite.Benchmarks.snk</AssemblyOriginatorKeyFile> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG</DefineConstants> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> 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 @@ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x64</Platform> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{F4A69E2D-908E-4F0F-A794-84D508D60E5F}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -12,30 +12,24 @@ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Debug\</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Release\</OutputPath> - <Optimize>true</Optimize> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Debug\</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Release\</OutputPath> - <Optimize>true</Optimize> - </PropertyGroup> <PropertyGroup> <SignAssembly>true</SignAssembly> </PropertyGroup> <PropertyGroup> <AssemblyOriginatorKeyFile>Apache.Ignite.Core.Tests.TestDll.snk</AssemblyOriginatorKeyFile> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> 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 @@ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x64</Platform> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}</ProjectGuid> <OutputType>Exe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -15,35 +15,26 @@ <PropertyGroup> <StartupObject /> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Debug\</OutputPath> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <DefineConstants>DEBUG</DefineConstants> + <PropertyGroup> + <SignAssembly>true</SignAssembly> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Release\</OutputPath> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <Optimize>true</Optimize> + <PropertyGroup> + <AssemblyOriginatorKeyFile>Apache.Ignite.Core.Tests.snk</AssemblyOriginatorKeyFile> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Debug\</OutputPath> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> <DefineConstants>DEBUG</DefineConstants> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Release\</OutputPath> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> - </PropertyGroup> - <PropertyGroup> - <SignAssembly>true</SignAssembly> - </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile>Apache.Ignite.Core.Tests.snk</AssemblyOriginatorKeyFile> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp" /> @@ -281,10 +272,14 @@ </None> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> + <PropertyGroup Condition="'$(Platform)' != 'AnyCPU'"> <PostBuildEvent>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)</PostBuildEvent> </PropertyGroup> + <PropertyGroup Condition="'$(Platform)' == 'AnyCPU'"> + <PostBuildEvent>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)</PostBuildEvent> + </PropertyGroup> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/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 081dd89..75167b5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/ProjectFilesTest.cs @@ -38,13 +38,7 @@ namespace Apache.Ignite.Core.Tests Assert.GreaterOrEqual(projFiles.Length, 7); var invalidFiles = - projFiles.Where(x => - { - var text = File.ReadAllText(x.FullName); - - return !text.Contains("ToolsVersion=\"4.0\"") || - text.IndexOf("AnyCPU", StringComparison.OrdinalIgnoreCase) >= 0; - }).ToArray(); + projFiles.Where(x => !File.ReadAllText(x.FullName).Contains("ToolsVersion=\"4.0\"")).ToArray(); Assert.AreEqual(0, invalidFiles.Length, "Invalid csproj files: " + string.Join(", ", invalidFiles.Select(x => x.FullName))); http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/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 bfedce9..5ae7851 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -3,7 +3,7 @@ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x64</Platform> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -58,6 +58,24 @@ <PropertyGroup> <DelaySign>false</DelaySign> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>CODE_ANALYSIS;DEBUG</DefineConstants> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <DocumentationFile>bin\Debug\Apache.Ignite.Core.XML</DocumentationFile> + <PlatformTarget>AnyCPU</PlatformTarget> + <RunCodeAnalysis>true</RunCodeAnalysis> + <CodeAnalysisRuleSet>Apache.Ignite.Core.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <DocumentationFile>bin\Release\Apache.Ignite.Core.XML</DocumentationFile> + <Optimize>true</Optimize> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>Apache.Ignite.Core.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.configuration" /> @@ -443,9 +461,18 @@ <Link>resources\release\x86\ignite.common.dll</Link> </EmbeddedResource> </ItemGroup> + <ItemGroup Condition="'$(Platform)' == 'AnyCPU'"> + <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')"> + <Link>resources\$(Configuration)\x86\ignite.common.dll</Link> + </EmbeddedResource> + </ItemGroup> <ItemGroup> <None Include="Apache.Ignite.Core.ruleset" /> <None Include="Apache.Ignite.Core.nuspec" /> + <None Include="build-common.ps1" /> <None Include="NuGet\Uninstall.ps1" /> <None Include="NuGet\PostBuild.ps1" /> <None Include="NuGet\Install.ps1" /> @@ -457,6 +484,11 @@ </ItemGroup> <ItemGroup /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <PropertyGroup Condition="'$(Platform)' == 'AnyCPU'"> + <PreBuildEvent>cd "$(ProjectDir)" + set COMPLUS_ApplicationMigrationRuntimeActivationConfigPath=$(ProjectDir) + PowerShell.exe -executionpolicy remotesigned -File build-common.ps1 -Configuration $(ConfigurationName) -msbuildexe "$(MSBuildBinPath)\msbuild.exe"</PreBuildEvent> + </PropertyGroup> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> http://git-wip-us.apache.org/repos/asf/ignite/blob/b2d40756/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec index ff3ce34..275ee69 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.nuspec @@ -21,16 +21,16 @@ Creating NuGet package: 1) Build Java: mvn clean package -DskipTests -U -Plgpl -2) Build Apache.Ignite.sln (x64 configuration) +2) Build Apache.Ignite.sln (AnyCPU configuration) 3) Create package (use csproj instead of nuspec so that template substitution works): - nuget pack Apache.Ignite.Core.csproj -Prop Configuration=Release -Prop Platform=x64 + nuget pack Apache.Ignite.Core.csproj -Prop Configuration=Release -Prop Platform=AnyCPU --> <package > <metadata> <id>Apache.Ignite</id> - <title>Apache Ignite x64</title> + <title>Apache Ignite</title> <!-- --> <version>$version$</version> <authors>Apache Ignite</authors> @@ -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. </description> <summary> 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. <tags>Apache Ignite In-Memory Distributed Computing SQL NoSQL Grid Map Reduce Cache linqpad-samples</tags> </metadata> <files> - <!-- Dll will be included automatically in the lib folder. --> - <!--<file src="bin\x64\Release\*.dll" target="lib\net40" />--> - <!-- Install script should be in tools --> <file src="NuGet\Install.ps1" target="tools" /> <file src="NuGet\Uninstall.ps1" target="tools" /> 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. /// </summary> /// <param name="resourceName">Resource name.</param> - /// <returns>Path to a temp file with an unpacked resource.</returns> - public static string UnpackEmbeddedResource(string resourceName) + /// <param name="fileName">Name of the resulting file.</param> + /// <returns> + /// Path to a temp file with an unpacked resource. + /// </returns> + 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); } /// <summary> 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 @@ /// <summary> /// 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) /// </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; 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) /// </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; 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) /// </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; 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 @@ +<?xml version="1.0" encoding="utf-8" ?> + +<!-- + 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. +--> + +<!-- + This file is required to run old PowerShell (v2) with .NET 4 enabled. + Environment variable COMPLUS_ApplicationMigrationRuntimeActivationConfigPath should point to a folder with this file. +--> + +<configuration> + <startup useLegacyV2RuntimeActivationPolicy="true"> + <supportedRuntime version="v4.0"/> + </startup> +</configuration> \ 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 @@ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x64</Platform> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{27F7F3C6-BDDE-43A9-B565-856F8395A04B}</ProjectGuid> <OutputType>Exe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -12,31 +12,24 @@ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Debug\</OutputPath> - <RunCodeAnalysis>false</RunCodeAnalysis> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Release\</OutputPath> - <Optimize>true</Optimize> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Debug\</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> - <PlatformTarget>x86</PlatformTarget> - <OutputPath>bin\x86\Release\</OutputPath> - <Optimize>true</Optimize> - </PropertyGroup> <PropertyGroup> <SignAssembly>true</SignAssembly> </PropertyGroup> <PropertyGroup> <AssemblyOriginatorKeyFile>Apache.Ignite.snk</AssemblyOriginatorKeyFile> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Configuration" /> 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 @@ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x64</Platform> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{069FA680-3C4D-43A9-B84F-E67513B87827}</ProjectGuid> <OutputType>Exe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -12,43 +12,33 @@ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Debug\</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Release\</OutputPath> - <DebugType>full</DebugType> - <DebugSymbols>true</DebugSymbols> - <Optimize>true</Optimize> - </PropertyGroup> <PropertyGroup> <StartupObject>Apache.Ignite.Examples.Compute.TaskExample</StartupObject> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\x86\Debug\</OutputPath> - <PlatformTarget>x86</PlatformTarget> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> - <OutputPath>bin\x86\Release\</OutputPath> - <PlatformTarget>x86</PlatformTarget> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - <Optimize>true</Optimize> - </PropertyGroup> <PropertyGroup> <SignAssembly>true</SignAssembly> </PropertyGroup> <PropertyGroup> <AssemblyOriginatorKeyFile>Apache.Ignite.Examples.snk</AssemblyOriginatorKeyFile> </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Debug\</OutputPath> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Release\</OutputPath> + <Optimize>true</Optimize> + <DebugType>full</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> <ItemGroup> <Reference Include="Apache.Ignite.Core"> - <HintPath Condition="Exists('..\..\Apache.Ignite')">..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath> - <HintPath Condition="'$(Platform)' == 'x86' And Exists('..\..\bin\x86\Apache.Ignite.Core.dll')">..\..\bin\x86\Apache.Ignite.Core.dll</HintPath> - <HintPath Condition="'$(Platform)' == 'x64' And Exists('..\..\bin\Apache.Ignite.Core.dll')">..\..\bin\Apache.Ignite.Core.dll</HintPath> + <HintPath Condition="Exists('..\..\Apache.Ignite')">..\..\Apache.Ignite\bin\$(Configuration)\Apache.Ignite.Core.dll</HintPath> + <HintPath Condition="Exists('..\..\bin\Apache.Ignite.Core.dll')">..\..\bin\Apache.Ignite.Core.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> 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 @@ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">x64</Platform> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{DFB08363-202E-412D-8812-349EF10A8702}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -12,40 +12,30 @@ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Debug\</OutputPath> + <PropertyGroup> + <SignAssembly>true</SignAssembly> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\x64\Release\</OutputPath> - <DebugType>full</DebugType> - <DebugSymbols>true</DebugSymbols> - <Optimize>true</Optimize> + <PropertyGroup> + <AssemblyOriginatorKeyFile>Apache.Ignite.ExamplesDll.snk</AssemblyOriginatorKeyFile> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\x86\Debug\</OutputPath> - <PlatformTarget>x86</PlatformTarget> + <OutputPath>bin\Debug\</OutputPath> + <PlatformTarget>AnyCPU</PlatformTarget> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> - <OutputPath>bin\x86\Release\</OutputPath> - <PlatformTarget>x86</PlatformTarget> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\Release\</OutputPath> <Optimize>true</Optimize> - </PropertyGroup> - <PropertyGroup> - <SignAssembly>true</SignAssembly> - </PropertyGroup> - <PropertyGroup> - <AssemblyOriginatorKeyFile>Apache.Ignite.ExamplesDll.snk</AssemblyOriginatorKeyFile> + <DebugType>full</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <ItemGroup> <Reference Include="Apache.Ignite.Core"> - <HintPath Condition="Exists('..\..\Apache.Ignite')">..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath> - <HintPath Condition="'$(Platform)' == 'x86' And Exists('..\..\bin\x86\Apache.Ignite.Core.dll')">..\..\bin\x86\Apache.Ignite.Core.dll</HintPath> - <HintPath Condition="'$(Platform)' == 'x64' And Exists('..\..\bin\Apache.Ignite.Core.dll')">..\..\bin\Apache.Ignite.Core.dll</HintPath> + <HintPath Condition="Exists('..\..\Apache.Ignite')">..\..\Apache.Ignite\bin\$(Configuration)\Apache.Ignite.Core.dll</HintPath> + <HintPath Condition="Exists('..\..\bin\Apache.Ignite.Core.dll')">..\..\bin\Apache.Ignite.Core.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" />
