Repository: ignite Updated Branches: refs/heads/ignite-1537 f6d483628 -> 5da19c7fc
http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/Apache.Ignite.sln ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln index 929af73..19916f2 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln +++ b/modules/platforms/dotnet/Apache.Ignite.sln @@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject Apache.Ignite.FxCop = Apache.Ignite.FxCop Apache.Ignite.sln.DotSettings = Apache.Ignite.sln.DotSettings + build.bat = build.bat examples\Config\example-cache-query.xml = examples\Config\example-cache-query.xml examples\Config\example-cache-store.xml = examples\Config\example-cache-store.xml examples\Config\example-cache.xml = examples\Config\example-cache.xml http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/modules/platforms/dotnet/build.bat ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/build.bat b/modules/platforms/dotnet/build.bat new file mode 100644 index 0000000..e2dfeed --- /dev/null +++ b/modules/platforms/dotnet/build.bat @@ -0,0 +1,94 @@ +:: +:: 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/01a22328/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 a693930..2f4ce18 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 @@ -46,7 +46,9 @@ </PropertyGroup> <ItemGroup> <Reference Include="Apache.Ignite.Core"> - <HintPath>..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath> + <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> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/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 59d2866..df19d2e 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 @@ -43,7 +43,9 @@ </PropertyGroup> <ItemGroup> <Reference Include="Apache.Ignite.Core"> - <HintPath>..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath> + <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> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/01a22328/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 68ba62b..18ee4a7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -903,6 +903,7 @@ <exclude>**/project/vs/**</exclude> <exclude>**/obj/x64/**</exclude> <exclude>**/obj/x86/**</exclude> + <exclude>**/*.dxg</exclude> </excludes> </configuration> </execution>