You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/18 15:26:36 UTC
[1/2] ignite git commit: IGNITE-1513: Fixing .Net slnrel.
Repository: ignite
Updated Branches:
refs/heads/ignite-1513 bf8187412 -> 72b3dee27
IGNITE-1513: Fixing .Net slnrel.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b663dbed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b663dbed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b663dbed
Branch: refs/heads/ignite-1513
Commit: b663dbed5feb79b867e491f0d2f3bb4bce56c412
Parents: bf81874
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Sep 18 16:24:10 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Sep 18 16:24:10 2015 +0300
----------------------------------------------------------------------
modules/platform/src/main/dotnet/Apache.Ignite.slnrel | 2 +-
modules/platform/src/main/dotnet/Apache.Ignite_x86.slnrel | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b663dbed/modules/platform/src/main/dotnet/Apache.Ignite.slnrel
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.slnrel b/modules/platform/src/main/dotnet/Apache.Ignite.slnrel
index 2d1d35e..2ad9e5d 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite.slnrel
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.slnrel
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apache.Ignite.Core\Apache.Ignite.Core.csproj", "{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\cpp\common\project\vs\common.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\cpp\src\common\project\vs\common.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite", "Apache.Ignite\Apache.Ignite.csproj", "{27F7F3C6-BDDE-43A9-B565-856F8395A04B}"
EndProject
http://git-wip-us.apache.org/repos/asf/ignite/blob/b663dbed/modules/platform/src/main/dotnet/Apache.Ignite_x86.slnrel
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite_x86.slnrel b/modules/platform/src/main/dotnet/Apache.Ignite_x86.slnrel
index 35f6286..81a4f3b 100644
--- a/modules/platform/src/main/dotnet/Apache.Ignite_x86.slnrel
+++ b/modules/platform/src/main/dotnet/Apache.Ignite_x86.slnrel
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apache.Ignite.Core\Apache.Ignite.Core.csproj", "{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\cpp\common\project\vs\common.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\cpp\src\common\project\vs\common.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite", "Apache.Ignite\Apache.Ignite.csproj", "{27F7F3C6-BDDE-43A9-B565-856F8395A04B}"
EndProject
[2/2] ignite git commit: IGNITE-1513: Fixing .Net..
Posted by vo...@apache.org.
IGNITE-1513: Fixing .Net..
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72b3dee2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72b3dee2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72b3dee2
Branch: refs/heads/ignite-1513
Commit: 72b3dee2735874e139d4e94862bcc4da08e133b0
Parents: b663dbe
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Sep 18 16:27:14 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Sep 18 16:27:14 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 13 +++-
.../Apache.Ignite/Apache.Ignite.csprojrel | 76 ++++++++++++++++++++
2 files changed, 87 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/72b3dee2/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index dae13e9..74aefc9 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -61,6 +61,12 @@
</file>
<file>
+ <source>modules/platform/src/main/dotnet/Apache.Ignite/Apache.Ignite.csprojrel</source>
+ <outputDirectory>/platforms/dotnet/src/Apache.Ignite</outputDirectory>
+ <destName>Apache.Ignite.csproj</destName>
+ </file>
+
+ <file>
<source>modules/platform/src/main/dotnet/Examples/Apache.Ignite.Examples.slnrel</source>
<outputDirectory>/platforms/dotnet/Examples</outputDirectory>
<destName>Apache.Ignite.Examples.sln</destName>
@@ -117,6 +123,9 @@
<fileSet>
<directory>modules/platform/src/main/dotnet/Apache.Ignite</directory>
<outputDirectory>/platforms/dotnet/src/Apache.Ignite</outputDirectory>
+ <excludes>
+ <exclude>**/*.csproj*</exclude>
+ </excludes>
</fileSet>
<!-- Move .Net examples. -->
@@ -124,8 +133,8 @@
<directory>modules/platform/src/main/dotnet/Examples</directory>
<outputDirectory>/platforms/dotnet/Examples</outputDirectory>
<excludes>
- <exclude>**/*.csproj</exclude>
- <exclude>**/*.sln</exclude>
+ <exclude>**/*.csproj*</exclude>
+ <exclude>**/*.sln*</exclude>
</excludes>
</fileSet>
http://git-wip-us.apache.org/repos/asf/ignite/blob/72b3dee2/modules/platform/src/main/dotnet/Apache.Ignite/Apache.Ignite.csprojrel
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/dotnet/Apache.Ignite/Apache.Ignite.csprojrel b/modules/platform/src/main/dotnet/Apache.Ignite/Apache.Ignite.csprojrel
new file mode 100644
index 0000000..0883660
--- /dev/null
+++ b/modules/platform/src/main/dotnet/Apache.Ignite/Apache.Ignite.csprojrel
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{27F7F3C6-BDDE-43A9-B565-856F8395A04B}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Apache.Ignite</RootNamespace>
+ <AssemblyName>Apache.Ignite</AssemblyName>
+ <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>
+ </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>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.ServiceProcess" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Config\AppSettingsConfigurator.cs" />
+ <Compile Include="Config\ArgsConfigurator.cs" />
+ <Compile Include="Config\ConfigValueParser.cs" />
+ <Compile Include="Config\IConfigurator.cs" />
+ <Compile Include="IgniteRunner.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="Service\IgniteService.cs">
+ <SubType>Component</SubType>
+ </Compile>
+ <Compile Include="Service\NativeMethods.cs" />
+ <Compile Include="Service\ServiceDescription.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Apache.Ignite.Core\Apache.Ignite.Core.csproj">
+ <Project>{4cd2f726-7e2b-46c4-a5ba-057bb82eecb6}</Project>
+ <Name>Apache.Ignite.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="App.config" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PostBuildEvent>
+ </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">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file