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/22 11:18:42 UTC
ignite git commit: IGNITE-1513: No more csproj rel in Apache.Ignite
project.
Repository: ignite
Updated Branches:
refs/heads/ignite-1513-final 33cc8bc66 -> cec24d5aa
IGNITE-1513: No more csproj rel in Apache.Ignite project.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cec24d5a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cec24d5a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cec24d5a
Branch: refs/heads/ignite-1513-final
Commit: cec24d5aa049cc76161a9d112d6ee5f3a6ac0809
Parents: 33cc8bc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 22 12:19:21 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 22 12:19:21 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 12 +---
modules/platforms/dotnet/Apache.Ignite.sln | 6 +-
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 4 +-
.../Apache.Ignite/Apache.Ignite.csprojrel | 76 --------------------
4 files changed, 8 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cec24d5a/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index 3ef03b5..9d16904 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -47,13 +47,14 @@
<destName>ignite_x86.sln</destName>
</file>
- <!-- Copy .Net files. -->
+ <!-- Replace .Net sln to get rid of test end example projects. -->
<file>
<source>modules/platforms/dotnet/Apache.Ignite.slnrel</source>
<outputDirectory>/platforms/dotnet</outputDirectory>
<destName>Apache.Ignite.sln</destName>
</file>
+ <!-- Replace another .Net solution for x86 platform. -->
<file>
<source>modules/platforms/dotnet/Apache.Ignite_x86.slnrel</source>
<outputDirectory>/platforms/dotnet</outputDirectory>
@@ -61,12 +62,6 @@
</file>
<file>
- <source>modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csprojrel</source>
- <outputDirectory>/platforms/dotnet/Apache.Ignite</outputDirectory>
- <destName>Apache.Ignite.csproj</destName>
- </file>
-
- <file>
<source>assembly/LICENSE_FABRIC</source>
<destName>LICENSE</destName>
<outputDirectory>/</outputDirectory>
@@ -105,9 +100,6 @@
<fileSet>
<directory>modules/platforms/dotnet/Apache.Ignite</directory>
<outputDirectory>/platforms/dotnet/Apache.Ignite</outputDirectory>
- <excludes>
- <exclude>**/*.csproj*</exclude>
- </excludes>
</fileSet>
<!-- Move .Net examples. -->
http://git-wip-us.apache.org/repos/asf/ignite/blob/cec24d5a/modules/platforms/dotnet/Apache.Ignite.sln
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln
index ff6e124..77e7f3a 100644
--- a/modules/platforms/dotnet/Apache.Ignite.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.sln
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apache.Ignite.Core\Apache.Ignite.Core.csproj", "{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests", "Apache.Ignite.Core.Tests\Apache.Ignite.Core.Tests.csproj", "{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}"
http://git-wip-us.apache.org/repos/asf/ignite/blob/cec24d5a/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 0f75069..0883660 100644
--- a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj
@@ -63,8 +63,8 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PostBuildEvent>copy $(TargetPath) $(SolutionDir)\Apache.Ignite.Core.Tests\$(OutDir)
-copy $(TargetPath).config $(SolutionDir)\Apache.Ignite.Core.Tests\$(OutDir)</PostBuildEvent>
+ <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.
http://git-wip-us.apache.org/repos/asf/ignite/blob/cec24d5a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csprojrel
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csprojrel b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csprojrel
deleted file mode 100644
index 0883660..0000000
--- a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csprojrel
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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