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:05:48 UTC
ignite git commit: IGNITE-1513: No more need for csprojrel in Apache
.Net examples project.
Repository: ignite
Updated Branches:
refs/heads/ignite-1513-final 004f8cc41 -> 33cc8bc66
IGNITE-1513: No more need for csprojrel in Apache .Net examples project.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33cc8bc6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33cc8bc6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33cc8bc6
Branch: refs/heads/ignite-1513-final
Commit: 33cc8bc66c46e2e29083875f70eb250ee01ef217
Parents: 004f8cc
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Sep 22 12:06:28 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Sep 22 12:06:28 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric.xml | 15 ----
modules/platforms/dotnet/Apache.Ignite.sln | 3 +
.../Apache.Ignite.Examples.csproj | 7 +-
.../Apache.Ignite.Examples.csprojrel | 79 --------------------
.../Apache.Ignite.ExamplesDll.csproj | 9 +--
.../Apache.Ignite.ExamplesDll.csprojrel | 72 ------------------
6 files changed, 9 insertions(+), 176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/33cc8bc6/assembly/release-fabric.xml
----------------------------------------------------------------------
diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml
index f0ec97d..3ef03b5 100644
--- a/assembly/release-fabric.xml
+++ b/assembly/release-fabric.xml
@@ -67,18 +67,6 @@
</file>
<file>
- <source>modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csprojrel</source>
- <outputDirectory>/platforms/dotnet/examples/Apache.Ignite.Examples</outputDirectory>
- <destName>Apache.Ignite.Examples.csproj</destName>
- </file>
-
- <file>
- <source>modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csprojrel</source>
- <outputDirectory>/platforms/dotnet/examples/Apache.Ignite.ExamplesDll</outputDirectory>
- <destName>Apache.Ignite.ExamplesDll.csproj</destName>
- </file>
-
- <file>
<source>assembly/LICENSE_FABRIC</source>
<destName>LICENSE</destName>
<outputDirectory>/</outputDirectory>
@@ -126,9 +114,6 @@
<fileSet>
<directory>modules/platforms/dotnet/examples</directory>
<outputDirectory>/platforms/dotnet/examples</outputDirectory>
- <excludes>
- <exclude>**/*.csproj*</exclude>
- </excludes>
</fileSet>
<!-- Move .Net licenses. -->
http://git-wip-us.apache.org/repos/asf/ignite/blob/33cc8bc6/modules/platforms/dotnet/Apache.Ignite.sln
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln
index 8c099b2..ff6e124 100644
--- a/modules/platforms/dotnet/Apache.Ignite.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.sln
@@ -14,6 +14,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Examples", "Examples\Apache.Ignite.Examples\Apache.Ignite.Examples.csproj", "{069FA680-3C4D-43A9-B84F-E67513B87827}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.ExamplesDll", "Examples\Apache.Ignite.ExamplesDll\Apache.Ignite.ExamplesDll.csproj", "{DFB08363-202E-412D-8812-349EF10A8702}"
+ ProjectSection(ProjectDependencies) = postProject
+ {27F7F3C6-BDDE-43A9-B565-856F8395A04B} = {27F7F3C6-BDDE-43A9-B565-856F8395A04B}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
http://git-wip-us.apache.org/repos/asf/ignite/blob/33cc8bc6/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 8ee90d9..ff13ddc 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
@@ -35,6 +35,9 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Apache.Ignite.Core">
+ <HintPath>..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
@@ -56,10 +59,6 @@
<Compile Include="Services\ServicesExample.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>
<ProjectReference Include="..\Apache.Ignite.ExamplesDll\Apache.Ignite.ExamplesDll.csproj">
<Project>{dfb08363-202e-412d-8812-349ef10a8702}</Project>
<Name>Apache.Ignite.ExamplesDll</Name>
http://git-wip-us.apache.org/repos/asf/ignite/blob/33cc8bc6/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csprojrel
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csprojrel b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csprojrel
deleted file mode 100644
index ff13ddc..0000000
--- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csprojrel
+++ /dev/null
@@ -1,79 +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>{069FA680-3C4D-43A9-B84F-E67513B87827}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Apache.Ignite.Examples</RootNamespace>
- <AssemblyName>Apache.Ignite.Examples</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>
- <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>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Apache.Ignite.Core">
- <HintPath>..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Compute\ClosureExample.cs" />
- <Compile Include="Compute\TaskExample.cs" />
- <Compile Include="Datagrid\ContinuousQueryExample.cs" />
- <Compile Include="Datagrid\CrossPlatformExample.cs" />
- <Compile Include="Datagrid\DataStreamerExample.cs" />
- <Compile Include="Datagrid\PutGetExample.cs" />
- <Compile Include="Datagrid\QueryExample.cs" />
- <Compile Include="Datagrid\StoreExample.cs" />
- <Compile Include="Datagrid\TransactionExample.cs" />
- <Compile Include="Events\EventsExample.cs" />
- <Compile Include="Messaging\MessagingExample.cs" />
- <Compile Include="Misc\LifecycleExample.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Services\IMapService.cs" />
- <Compile Include="Services\ServicesExample.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Apache.Ignite.ExamplesDll\Apache.Ignite.ExamplesDll.csproj">
- <Project>{dfb08363-202e-412d-8812-349ef10a8702}</Project>
- <Name>Apache.Ignite.ExamplesDll</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <None Include="App.config" />
- </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- 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
http://git-wip-us.apache.org/repos/asf/ignite/blob/33cc8bc6/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 cb2ff6f..fa6b71c 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
@@ -32,6 +32,9 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Apache.Ignite.Core">
+ <HintPath>..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
@@ -58,12 +61,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\MapService.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>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- 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/33cc8bc6/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csprojrel
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csprojrel b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csprojrel
deleted file mode 100644
index fa6b71c..0000000
--- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csprojrel
+++ /dev/null
@@ -1,72 +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>{DFB08363-202E-412D-8812-349EF10A8702}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Apache.Ignite.ExamplesDll</RootNamespace>
- <AssemblyName>Apache.Ignite.ExamplesDll</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'">
- <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>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Apache.Ignite.Core">
- <HintPath>..\..\Apache.Ignite\bin\$(Platform)\$(Configuration)\Apache.Ignite.Core.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Compute\AverageSalaryJob.cs" />
- <Compile Include="Compute\AverageSalaryTask.cs" />
- <Compile Include="Compute\CharacterCountClosure.cs" />
- <Compile Include="Compute\CharacterCountReducer.cs" />
- <Compile Include="Datagrid\EmployeeStorePredicate.cs" />
- <Compile Include="Datagrid\ContinuousQueryFilter.cs" />
- <Compile Include="Datagrid\EmployeeStore.cs" />
- <Compile Include="Events\LocalListener.cs" />
- <Compile Include="Events\RemoteFilter.cs" />
- <Compile Include="Messaging\LocalListener.cs" />
- <Compile Include="Messaging\RemoteOrderedListener.cs" />
- <Compile Include="Messaging\RemoteUnorderedListener.cs" />
- <Compile Include="Messaging\Topic.cs" />
- <Compile Include="Portable\Account.cs" />
- <Compile Include="Portable\Address.cs" />
- <Compile Include="Portable\Employee.cs" />
- <Compile Include="Portable\EmployeeKey.cs" />
- <Compile Include="Portable\Organization.cs" />
- <Compile Include="Portable\OrganizationType.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Services\MapService.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- 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