Skip to content

Commit 4db0a37

Browse files
committed
Revert "IGNITE-13979 .NET: Modernize examples"
This reverts commit 9b6aa64
1 parent baf3a40 commit 4db0a37

176 files changed

Lines changed: 3130 additions & 5277 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/_config.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ attrs: &asciidoc_attributes
2424
javaCodeDir: code-snippets/java/src/main/java/org/apache/ignite/snippets
2525
csharpCodeDir: code-snippets/dotnet
2626
githubUrl: https://github.com/apache/ignite/tree/master
27-
githubVersionUrl: https://github.com/apache/ignite/tree/ignite-{version}
2827
docSourceUrl: https://github.com/apache/ignite/tree/IGNITE-7595/docs
2928
collections:
3029
docs:
@@ -40,8 +39,8 @@ defaults:
4039
scope:
4140
path: '_docs'
4241
values:
43-
toc: ignite
42+
toc: ignite
4443
asciidoctor:
45-
base_dir: _docs/
44+
base_dir: _docs/
4645
attributes: *asciidoc_attributes
47-
46+

docs/_docs/quick-start/dotnet.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ From here, you may want to:
8888

8989
* Check out the link:thin-clients/dotnet-thin-client[.NET thin client] that provides a lightweight form of connectivity
9090
to Ignite clusters
91-
* Explore the link:{githubVersionUrl}/modules/platforms/dotnet/examples[additional examples] included with Ignite
91+
* Explore the link:{githubUrl}/modules/platforms/dotnet/examples[additional examples] included with Ignite
9292
* Refer to the link:net-specific[NET-specific section] of the documentation to learn more about capabilities
9393
that are available for C# and .NET applications.
9494

modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll2/Apache.Ignite.Core.Tests.TestDll2.csproj

Lines changed: 0 additions & 58 deletions
This file was deleted.
Binary file not shown.

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.DotNetCore.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4242
</None>
4343
<None Remove="Deployment\**" />
44+
<None Remove="Examples\**" />
4445

4546
<None Update="Config\ignite-halthandler-dotnet-cfg.xml" CopyToOutputDirectory="PreserveNewest" />
4647
<None Update="Config\native-client-test-cache-affinity.xml" CopyToOutputDirectory="PreserveNewest" />
@@ -101,11 +102,13 @@
101102

102103
<ItemGroup>
103104
<Compile Remove="Deployment\**" />
105+
<Compile Remove="Examples\**" />
104106
<Compile Remove="Compute\Forked\**" />
105107
</ItemGroup>
106108

107109
<ItemGroup>
108110
<EmbeddedResource Remove="Deployment\**" />
111+
<EmbeddedResource Remove="Examples\**" />
109112
<EmbeddedResource Remove="Compute\Forked\**" />
110113
</ItemGroup>
111114

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,10 @@
360360
<Compile Include="DataStructures\AtomicSequenceTest.cs" />
361361
<Compile Include="DeploymentTest.cs" />
362362
<Compile Include="EventsTest.cs" />
363+
<Compile Include="Examples\Example.cs" />
364+
<Compile Include="Examples\ExamplesTest.cs" />
365+
<Compile Include="Examples\PathUtil.cs" />
366+
<Compile Include="Examples\ProjectFilesTest.cs" />
363367
<Compile Include="ExceptionsTest.cs" />
364368
<Compile Include="ExecutableTest.cs" />
365369
<Compile Include="FutureTest.cs" />
@@ -407,11 +411,6 @@
407411
<Compile Include="WindowsServiceTest.cs" />
408412
</ItemGroup>
409413
<ItemGroup>
410-
<ProjectReference Include="..\Apache.Ignite.Core.Tests.TestDll2\Apache.Ignite.Core.Tests.TestDll2.csproj">
411-
<Project>{f4a69e2d-908e-4f0f-a794-84d508d60e5f}</Project>
412-
<Name>Apache.Ignite.Core.Tests.TestDll2</Name>
413-
<Aliases>TestDll2</Aliases>
414-
</ProjectReference>
415414
<ProjectReference Include="..\Apache.Ignite.Core\Apache.Ignite.Core.csproj">
416415
<Project>{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}</Project>
417416
<Name>Apache.Ignite.Core</Name>
@@ -432,6 +431,15 @@
432431
<Project>{27F7F3C6-BDDE-43A9-B565-856F8395A04B}</Project>
433432
<Name>Apache.Ignite</Name>
434433
</ProjectReference>
434+
<ProjectReference Include="..\examples\Apache.Ignite.ExamplesDll\Apache.Ignite.ExamplesDll.csproj">
435+
<Project>{dfb08363-202e-412d-8812-349ef10a8702}</Project>
436+
<Name>Apache.Ignite.ExamplesDll</Name>
437+
<Aliases>ExamplesDll</Aliases>
438+
</ProjectReference>
439+
<ProjectReference Include="..\examples\Apache.Ignite.Examples\Apache.Ignite.Examples.csproj">
440+
<Project>{069fa680-3c4d-43a9-b84f-e67513b87827}</Project>
441+
<Name>Apache.Ignite.Examples</Name>
442+
</ProjectReference>
435443
<ProjectReference Include="..\Apache.Ignite.Core.Tests.TestDll\Apache.Ignite.Core.Tests.TestDll.csproj">
436444
<Project>{F4A69E2D-908E-4F0F-A794-84D508D60E5F}</Project>
437445
<Name>Apache.Ignite.Core.Tests.TestDll</Name>
@@ -615,4 +623,4 @@
615623
<Target Name="AfterBuild">
616624
</Target>
617625
-->
618-
</Project>
626+
</Project>

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/BinaryDynamicRegistrationTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
namespace Apache.Ignite.Core.Tests.Binary
2020
{
2121
#if !NETCOREAPP
22-
extern alias TestDll2;
23-
using Apache.Ignite.Core.Tests.TestDll2;
24-
using ExamplesAccount = TestDll2.Apache.Ignite.Core.Tests.TestDll2.Account;
22+
extern alias ExamplesDll;
23+
using Apache.Ignite.ExamplesDll.Binary;
24+
using ExamplesAccount = ExamplesDll::Apache.Ignite.ExamplesDll.Binary.Account;
2525
#endif
2626

2727
using System;
@@ -596,10 +596,10 @@ public DateTime Invoke()
596596
}
597597

598598
#if !NETCOREAPP
599-
namespace Apache.Ignite.Core.Tests.TestDll2
599+
namespace Apache.Ignite.ExamplesDll.Binary
600600
{
601601
/// <summary>
602-
/// Copy of Account class in TestDll2. Same name and namespace, different assembly.
602+
/// Copy of Account class in ExamplesDll. Same name and namespace, different assembly.
603603
/// </summary>
604604
public class Account
605605
{

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Binary/TypeResolverTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void TestArraysSimpleName()
178178
[Test]
179179
public void TestReferencedAssemblyLoading()
180180
{
181-
const string dllName = "Apache.Ignite.Core.Tests.TestDll,";
181+
const string dllName = "Apache.Ignite.Core.Tests.TestDll";
182182

183183
const string typeName = "Apache.Ignite.Core.Tests.TestDll.TestClass";
184184

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Deployment/GetAddressFunc.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
namespace Apache.Ignite.Core.Tests.Deployment
1919
{
20-
extern alias TestDll2;
20+
extern alias ExamplesDll;
2121
using Apache.Ignite.Core.Compute;
22-
using Address = TestDll2.Apache.Ignite.Core.Tests.TestDll2.Address;
22+
using Address = ExamplesDll::Apache.Ignite.ExamplesDll.Binary.Address;
2323

2424
/// <summary>
2525
/// Function that returns an instance of a class from another assembly.
@@ -32,4 +32,4 @@ public Address Invoke(int arg)
3232
return new Address("addr" + arg, arg);
3333
}
3434
}
35-
}
35+
}

modules/platforms/dotnet/Apache.Ignite.Core.Tests/Deployment/PeerAssemblyLoadingAllApisTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
namespace Apache.Ignite.Core.Tests.Deployment
1919
{
20-
extern alias TestDll2;
20+
extern alias ExamplesDll;
2121
using System.Linq;
2222
using Apache.Ignite.Core.Tests.Compute;
2323
using Apache.Ignite.Core.Tests.Process;
2424
using Apache.Ignite.NLog;
2525
using NUnit.Framework;
26-
using Address = TestDll2::Apache.Ignite.Core.Tests.TestDll2.Address;
26+
using Address = ExamplesDll::Apache.Ignite.ExamplesDll.Binary.Address;
2727

2828
/// <summary>
2929
/// Tests all APIs that support peer assembly loading.

0 commit comments

Comments
 (0)