This is an automated email from the ASF dual-hosted git repository. mmartell pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-dotnet-core-client.git
The following commit(s) were added to refs/heads/develop by this push: new 0df0672 Simplify project and path names 0df0672 is described below commit 0df067221b2c75ad457e6adf3fce7ade7a993c6c Author: Mike Martell <mmart...@pivotal.io> AuthorDate: Sun May 17 19:31:32 2020 -0700 Simplify project and path names --- Apache.Geode.DotNetCore/Apache.Geode.DotNetCore.csproj | 7 ------- .../NetCore.Session.csproj | 2 +- .../NetCoreSessionState.cs | 2 +- .../CacheFactoryUnitTest.cs | 16 ++++++++-------- .../CacheUnitTest.cs | 16 ++++++++-------- .../NetCore.Test.csproj | 2 +- .../ObjectLeakUnitTest.cs | 4 ++-- .../PoolFactoryUnitTest.cs | 2 +- .../PoolManagerUnitTest.cs | 2 +- .../Properties/launchSettings.json | 0 .../RegionFactoryUnitTest.cs | 2 +- {Apache.Geode.DotNetCore => NetCore}/AuthInitialize.cs | 2 +- {Apache.Geode.DotNetCore => NetCore}/Cache.cs | 4 ++-- {Apache.Geode.DotNetCore => NetCore}/CacheFactory.cs | 4 ++-- .../GemfireClient.cs => NetCore/Client.cs | 6 +++--- {Apache.Geode.DotNetCore => NetCore}/Constants.cs | 2 +- .../GeodeNativeObject.cs | 4 ++-- {Apache.Geode.DotNetCore => NetCore}/ICacheFactory.cs | 2 +- {Apache.Geode.DotNetCore => NetCore}/IGeodeCache.cs | 2 +- {Apache.Geode.DotNetCore => NetCore}/IRegionService.cs | 2 +- NetCore/NetCore.csproj | 9 +++++++++ {Apache.Geode.DotNetCore => NetCore}/Pool.cs | 4 ++-- {Apache.Geode.DotNetCore => NetCore}/PoolFactory.cs | 4 ++-- {Apache.Geode.DotNetCore => NetCore}/PoolManager.cs | 4 ++-- {Apache.Geode.DotNetCore => NetCore}/Region.cs | 4 ++-- {Apache.Geode.DotNetCore => NetCore}/RegionFactory.cs | 4 ++-- {Apache.Geode.DotNetCore => NetCore}/RegionShortcut.cs | 2 +- .../NetCore.Session.IntegrationTests.csproj | 4 ++-- .../Properties/launchSettings.json | 0 .../SessionStateIntegrationTests.cs | 2 +- .../NetCore.Session.Tests.csproj | 4 ++-- .../SessionStateCacheTests.cs | 2 +- SessionSample/Models/BasicAuthInitialize.cs | 2 +- SessionSample/SessionSample.csproj | 11 +++++------ SessionSample/Startup.cs | 2 +- SessionSample/statArchive-19444.gfs | Bin 0 -> 10402 bytes SessionSample/statArchive-20992.gfs | Bin 0 -> 7654 bytes SessionSample/statArchive-23496.gfs | Bin 0 -> 14196 bytes SessionSample/statArchive-23824.gfs | Bin 0 -> 67316 bytes SessionSample/statArchive-25408.gfs | Bin 0 -> 10608 bytes SessionSample/statArchive-4448.gfs | Bin 0 -> 60278 bytes geode-dotnet-core.sln | 10 +++++----- 42 files changed, 76 insertions(+), 75 deletions(-) diff --git a/Apache.Geode.DotNetCore/Apache.Geode.DotNetCore.csproj b/Apache.Geode.DotNetCore/Apache.Geode.DotNetCore.csproj deleted file mode 100644 index 8642d92..0000000 --- a/Apache.Geode.DotNetCore/Apache.Geode.DotNetCore.csproj +++ /dev/null @@ -1,7 +0,0 @@ -<Project Sdk="Microsoft.NET.Sdk"> - - <PropertyGroup> - <TargetFramework>netcoreapp3.1</TargetFramework> - </PropertyGroup> - -</Project> diff --git a/Apache.Geode.DotNetCore.Session/Apache.Geode.DotNetCore.Session.csproj b/NetCore.Session/NetCore.Session.csproj similarity index 80% rename from Apache.Geode.DotNetCore.Session/Apache.Geode.DotNetCore.Session.csproj rename to NetCore.Session/NetCore.Session.csproj index 53454e0..8fb2ee7 100644 --- a/Apache.Geode.DotNetCore.Session/Apache.Geode.DotNetCore.Session.csproj +++ b/NetCore.Session/NetCore.Session.csproj @@ -10,7 +10,7 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Apache.Geode.DotNetCore\Apache.Geode.DotNetCore.csproj" /> + <ProjectReference Include="..\NetCore\NetCore.csproj" /> </ItemGroup> </Project> diff --git a/Apache.Geode.DotNetCore.Session/DotNetCoreSessionState.cs b/NetCore.Session/NetCoreSessionState.cs similarity index 99% rename from Apache.Geode.DotNetCore.Session/DotNetCoreSessionState.cs rename to NetCore.Session/NetCoreSessionState.cs index 2ba3581..19f03e9 100644 --- a/Apache.Geode.DotNetCore.Session/DotNetCoreSessionState.cs +++ b/NetCore.Session/NetCoreSessionState.cs @@ -1,4 +1,4 @@ -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Logging; using System; diff --git a/Apache.Geode.DotNetCore.Test/CacheFactoryUnitTest.cs b/NetCore.Test/CacheFactoryUnitTest.cs similarity index 87% rename from Apache.Geode.DotNetCore.Test/CacheFactoryUnitTest.cs rename to NetCore.Test/CacheFactoryUnitTest.cs index 655fe92..20b246a 100644 --- a/Apache.Geode.DotNetCore.Test/CacheFactoryUnitTest.cs +++ b/NetCore.Test/CacheFactoryUnitTest.cs @@ -1,5 +1,5 @@ using System; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using NUnit.Framework; namespace GemfireDotNetTest @@ -14,7 +14,7 @@ namespace GemfireDotNetTest [Test] public void TestCreateFactory() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create()) { @@ -26,7 +26,7 @@ namespace GemfireDotNetTest [Test] public void TestCacheFactoryGetVersion() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create()) { @@ -41,7 +41,7 @@ namespace GemfireDotNetTest [Test] public void TestCacheFactoryGetProductDescription() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create()) { @@ -56,7 +56,7 @@ namespace GemfireDotNetTest [Test] public void TestCacheFactorySetPdxIgnoreUnreadFields() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create()) { @@ -71,7 +71,7 @@ namespace GemfireDotNetTest [Test] public void TestCacheFactorySetPdxReadSerialized() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create()) { @@ -86,7 +86,7 @@ namespace GemfireDotNetTest [Test] public void TestCacheFactoryCreateCache() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create()) { @@ -103,7 +103,7 @@ namespace GemfireDotNetTest [Test] public void TestCacheFactorySetProperty() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create()) { diff --git a/Apache.Geode.DotNetCore.Test/CacheUnitTest.cs b/NetCore.Test/CacheUnitTest.cs similarity index 93% rename from Apache.Geode.DotNetCore.Test/CacheUnitTest.cs rename to NetCore.Test/CacheUnitTest.cs index 7cc6885..20eced5 100644 --- a/Apache.Geode.DotNetCore.Test/CacheUnitTest.cs +++ b/NetCore.Test/CacheUnitTest.cs @@ -1,6 +1,6 @@ using System; using System.Net.Cache; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using NUnit.Framework; namespace GemfireDotNetTest @@ -15,7 +15,7 @@ namespace GemfireDotNetTest [Test] public void TestClientCacheGetPdxReadSerialized() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create() .SetProperty("log-level", "debug") @@ -49,7 +49,7 @@ namespace GemfireDotNetTest [Test] public void TestClientCacheGetPdxIgnoreUnreadFields() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create() .SetProperty("log-level", "none") @@ -75,7 +75,7 @@ namespace GemfireDotNetTest [Test] public void TestClientCacheGetPoolManager() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create() .SetProperty("log-level", "none") @@ -95,7 +95,7 @@ namespace GemfireDotNetTest [Test] public void TestClientCacheCreateRegionFactory() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create() .SetProperty("log-level", "none") @@ -118,7 +118,7 @@ namespace GemfireDotNetTest [Test] public void TestClientCacheGetName() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create() .SetProperty("log-level", "none")) @@ -138,7 +138,7 @@ namespace GemfireDotNetTest [Test] public void TestClientCacheClose() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create() .SetProperty("log-level", "none")) @@ -159,7 +159,7 @@ namespace GemfireDotNetTest [Test] public void TestClientCacheCloseWithKeepalive() { - using (var client = new GemfireClient()) + using (var client = new Client()) { using (var cacheFactory = CacheFactory.Create() .SetProperty("log-level", "none")) diff --git a/Apache.Geode.DotNetCore.Test/Apache.Geode.DotNetCore.Test.csproj b/NetCore.Test/NetCore.Test.csproj similarity index 87% rename from Apache.Geode.DotNetCore.Test/Apache.Geode.DotNetCore.Test.csproj rename to NetCore.Test/NetCore.Test.csproj index 4f7005a..02473bb 100644 --- a/Apache.Geode.DotNetCore.Test/Apache.Geode.DotNetCore.Test.csproj +++ b/NetCore.Test/NetCore.Test.csproj @@ -16,7 +16,7 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Apache.Geode.DotNetCore\Apache.Geode.DotNetCore.csproj" /> + <ProjectReference Include="..\NetCore\NetCore.csproj" /> </ItemGroup> </Project> diff --git a/Apache.Geode.DotNetCore.Test/ObjectLeakUnitTest.cs b/NetCore.Test/ObjectLeakUnitTest.cs similarity index 85% rename from Apache.Geode.DotNetCore.Test/ObjectLeakUnitTest.cs rename to NetCore.Test/ObjectLeakUnitTest.cs index b80ed2c..a266d6e 100644 --- a/Apache.Geode.DotNetCore.Test/ObjectLeakUnitTest.cs +++ b/NetCore.Test/ObjectLeakUnitTest.cs @@ -1,5 +1,5 @@ using System; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using NUnit.Framework; namespace GemfireDotNetTest @@ -14,7 +14,7 @@ namespace GemfireDotNetTest [Test] public void TestLeakCacheFactory() { - var client = new GemfireClient(); + var client = new Client(); using (var cacheFactory = CacheFactory.Create()) { diff --git a/Apache.Geode.DotNetCore.Test/PoolFactoryUnitTest.cs b/NetCore.Test/PoolFactoryUnitTest.cs similarity index 98% rename from Apache.Geode.DotNetCore.Test/PoolFactoryUnitTest.cs rename to NetCore.Test/PoolFactoryUnitTest.cs index 102ebeb..7e9ccb8 100644 --- a/Apache.Geode.DotNetCore.Test/PoolFactoryUnitTest.cs +++ b/NetCore.Test/PoolFactoryUnitTest.cs @@ -1,5 +1,5 @@ using System.Net.Cache; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using NUnit.Framework; namespace GemfireDotNetTest diff --git a/Apache.Geode.DotNetCore.Test/PoolManagerUnitTest.cs b/NetCore.Test/PoolManagerUnitTest.cs similarity index 96% rename from Apache.Geode.DotNetCore.Test/PoolManagerUnitTest.cs rename to NetCore.Test/PoolManagerUnitTest.cs index 59f0179..bd387c8 100644 --- a/Apache.Geode.DotNetCore.Test/PoolManagerUnitTest.cs +++ b/NetCore.Test/PoolManagerUnitTest.cs @@ -1,5 +1,5 @@ using System.Net.Cache; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using NUnit.Framework; namespace GemfireDotNetTest diff --git a/Apache.Geode.DotNetCore.Test/Properties/launchSettings.json b/NetCore.Test/Properties/launchSettings.json similarity index 100% rename from Apache.Geode.DotNetCore.Test/Properties/launchSettings.json rename to NetCore.Test/Properties/launchSettings.json diff --git a/Apache.Geode.DotNetCore.Test/RegionFactoryUnitTest.cs b/NetCore.Test/RegionFactoryUnitTest.cs similarity index 99% rename from Apache.Geode.DotNetCore.Test/RegionFactoryUnitTest.cs rename to NetCore.Test/RegionFactoryUnitTest.cs index c947212..211fde3 100644 --- a/Apache.Geode.DotNetCore.Test/RegionFactoryUnitTest.cs +++ b/NetCore.Test/RegionFactoryUnitTest.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Net.Cache; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using NUnit.Framework; namespace GemfireDotNetTest diff --git a/Apache.Geode.DotNetCore/AuthInitialize.cs b/NetCore/AuthInitialize.cs similarity index 90% rename from Apache.Geode.DotNetCore/AuthInitialize.cs rename to NetCore/AuthInitialize.cs index a29c286..2044362 100644 --- a/Apache.Geode.DotNetCore/AuthInitialize.cs +++ b/NetCore/AuthInitialize.cs @@ -4,7 +4,7 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { public interface IAuthInitialize { diff --git a/Apache.Geode.DotNetCore/Cache.cs b/NetCore/Cache.cs similarity index 98% rename from Apache.Geode.DotNetCore/Cache.cs rename to NetCore/Cache.cs index a19324a..de5cb07 100644 --- a/Apache.Geode.DotNetCore/Cache.cs +++ b/NetCore/Cache.cs @@ -7,9 +7,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class Cache : GemfireNativeObject, IGeodeCache + public class Cache : GeodeNativeObject, IGeodeCache { private string _name = String.Empty; private PoolManager _poolManager = null; diff --git a/Apache.Geode.DotNetCore/CacheFactory.cs b/NetCore/CacheFactory.cs similarity index 97% rename from Apache.Geode.DotNetCore/CacheFactory.cs rename to NetCore/CacheFactory.cs index 6e27f96..4c2fad1 100644 --- a/Apache.Geode.DotNetCore/CacheFactory.cs +++ b/NetCore/CacheFactory.cs @@ -5,9 +5,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class CacheFactory : GemfireNativeObject, ICacheFactory + public class CacheFactory : GeodeNativeObject, ICacheFactory { private string _version = String.Empty; private string _productDescription = String.Empty; diff --git a/Apache.Geode.DotNetCore/GemfireClient.cs b/NetCore/Client.cs similarity index 88% rename from Apache.Geode.DotNetCore/GemfireClient.cs rename to NetCore/Client.cs index df3a2e1..66a2e58 100644 --- a/Apache.Geode.DotNetCore/GemfireClient.cs +++ b/NetCore/Client.cs @@ -5,9 +5,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class GemfireClient : GemfireNativeObject + public class Client : GeodeNativeObject { [DllImport(Constants.libPath, CharSet = CharSet.Auto)] private static extern IntPtr apache_geode_ClientInitialize(); @@ -15,7 +15,7 @@ namespace Apache [DllImport(Constants.libPath, CharSet = CharSet.Auto)] private static extern int apache_geode_ClientUninitialize(IntPtr client); - public GemfireClient() + public Client() { _containedObject = apache_geode_ClientInitialize(); } diff --git a/Apache.Geode.DotNetCore/Constants.cs b/NetCore/Constants.cs similarity index 92% rename from Apache.Geode.DotNetCore/Constants.cs rename to NetCore/Constants.cs index dbc7104..5781a10 100644 --- a/Apache.Geode.DotNetCore/Constants.cs +++ b/NetCore/Constants.cs @@ -2,7 +2,7 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { public class Constants diff --git a/Apache.Geode.DotNetCore/GemfireNativeObject.cs b/NetCore/GeodeNativeObject.cs similarity index 90% rename from Apache.Geode.DotNetCore/GemfireNativeObject.cs rename to NetCore/GeodeNativeObject.cs index b554a1a..293b142 100644 --- a/Apache.Geode.DotNetCore/GemfireNativeObject.cs +++ b/NetCore/GeodeNativeObject.cs @@ -4,9 +4,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public abstract class GemfireNativeObject : IDisposable + public abstract class GeodeNativeObject : IDisposable { private bool _disposed = false; protected IntPtr _containedObject; diff --git a/Apache.Geode.DotNetCore/ICacheFactory.cs b/NetCore/ICacheFactory.cs similarity index 94% rename from Apache.Geode.DotNetCore/ICacheFactory.cs rename to NetCore/ICacheFactory.cs index 5baee7e..5c3af7d 100644 --- a/Apache.Geode.DotNetCore/ICacheFactory.cs +++ b/NetCore/ICacheFactory.cs @@ -4,7 +4,7 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { public interface ICacheFactory : IDisposable { diff --git a/Apache.Geode.DotNetCore/IGeodeCache.cs b/NetCore/IGeodeCache.cs similarity index 96% rename from Apache.Geode.DotNetCore/IGeodeCache.cs rename to NetCore/IGeodeCache.cs index 7425427..5bfba69 100644 --- a/Apache.Geode.DotNetCore/IGeodeCache.cs +++ b/NetCore/IGeodeCache.cs @@ -4,7 +4,7 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { public interface IGeodeCache : IRegionService, IDisposable { diff --git a/Apache.Geode.DotNetCore/IRegionService.cs b/NetCore/IRegionService.cs similarity index 94% rename from Apache.Geode.DotNetCore/IRegionService.cs rename to NetCore/IRegionService.cs index 12ac904..33d79d1 100644 --- a/Apache.Geode.DotNetCore/IRegionService.cs +++ b/NetCore/IRegionService.cs @@ -4,7 +4,7 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { public interface IRegionService { diff --git a/NetCore/NetCore.csproj b/NetCore/NetCore.csproj new file mode 100644 index 0000000..06e4207 --- /dev/null +++ b/NetCore/NetCore.csproj @@ -0,0 +1,9 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>netcoreapp3.1</TargetFramework> + <RootNamespace>Apache.Geode.NetCore</RootNamespace> + <AssemblyName>Apache.Geode.NetCore</AssemblyName> + </PropertyGroup> + +</Project> diff --git a/Apache.Geode.DotNetCore/Pool.cs b/NetCore/Pool.cs similarity index 94% rename from Apache.Geode.DotNetCore/Pool.cs rename to NetCore/Pool.cs index 2544a9d..0fdc2c4 100644 --- a/Apache.Geode.DotNetCore/Pool.cs +++ b/NetCore/Pool.cs @@ -5,9 +5,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class Pool : GemfireNativeObject + public class Pool : GeodeNativeObject { [DllImport(Constants.libPath, CharSet = CharSet.Auto)] diff --git a/Apache.Geode.DotNetCore/PoolFactory.cs b/NetCore/PoolFactory.cs similarity index 95% rename from Apache.Geode.DotNetCore/PoolFactory.cs rename to NetCore/PoolFactory.cs index 771ba18..dc405bd 100644 --- a/Apache.Geode.DotNetCore/PoolFactory.cs +++ b/NetCore/PoolFactory.cs @@ -5,9 +5,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class PoolFactory : GemfireNativeObject + public class PoolFactory : GeodeNativeObject { [DllImport(Constants.libPath, CharSet = CharSet.Auto)] diff --git a/Apache.Geode.DotNetCore/PoolManager.cs b/NetCore/PoolManager.cs similarity index 92% rename from Apache.Geode.DotNetCore/PoolManager.cs rename to NetCore/PoolManager.cs index 91e1d26..6e28325 100644 --- a/Apache.Geode.DotNetCore/PoolManager.cs +++ b/NetCore/PoolManager.cs @@ -5,9 +5,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class PoolManager : GemfireNativeObject + public class PoolManager : GeodeNativeObject { [DllImport(Constants.libPath, CharSet = CharSet.Auto)] diff --git a/Apache.Geode.DotNetCore/Region.cs b/NetCore/Region.cs similarity index 98% rename from Apache.Geode.DotNetCore/Region.cs rename to NetCore/Region.cs index 343efb1..48f477d 100644 --- a/Apache.Geode.DotNetCore/Region.cs +++ b/NetCore/Region.cs @@ -5,9 +5,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class Region : GemfireNativeObject + public class Region : GeodeNativeObject { [DllImport(Constants.libPath, CharSet = CharSet.Auto)] diff --git a/Apache.Geode.DotNetCore/RegionFactory.cs b/NetCore/RegionFactory.cs similarity index 92% rename from Apache.Geode.DotNetCore/RegionFactory.cs rename to NetCore/RegionFactory.cs index 614c1f8..dbe0e26 100644 --- a/Apache.Geode.DotNetCore/RegionFactory.cs +++ b/NetCore/RegionFactory.cs @@ -5,9 +5,9 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { - public class RegionFactory : GemfireNativeObject + public class RegionFactory : GeodeNativeObject { [DllImport(Constants.libPath, CharSet = CharSet.Auto)] diff --git a/Apache.Geode.DotNetCore/RegionShortcut.cs b/NetCore/RegionShortcut.cs similarity index 90% rename from Apache.Geode.DotNetCore/RegionShortcut.cs rename to NetCore/RegionShortcut.cs index 03f62dd..e1cd7ba 100644 --- a/Apache.Geode.DotNetCore/RegionShortcut.cs +++ b/NetCore/RegionShortcut.cs @@ -2,7 +2,7 @@ namespace Apache { namespace Geode { - namespace DotNetCore + namespace NetCore { public enum RegionShortcut { diff --git a/Apache.Geode.Session.IntegrationTests/Apache.Geode.DotNetCore.Session.IntegrationTests.csproj b/Session.IntegrationTests/NetCore.Session.IntegrationTests.csproj similarity index 71% rename from Apache.Geode.Session.IntegrationTests/Apache.Geode.DotNetCore.Session.IntegrationTests.csproj rename to Session.IntegrationTests/NetCore.Session.IntegrationTests.csproj index 12fbce3..c4266eb 100644 --- a/Apache.Geode.Session.IntegrationTests/Apache.Geode.DotNetCore.Session.IntegrationTests.csproj +++ b/Session.IntegrationTests/NetCore.Session.IntegrationTests.csproj @@ -14,8 +14,8 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Apache.Geode.DotNetCore.Session\Apache.Geode.DotNetCore.Session.csproj" /> - <ProjectReference Include="..\Apache.Geode.DotNetCore\Apache.Geode.DotNetCore.csproj" /> + <ProjectReference Include="..\NetCore.Session\NetCore.Session.csproj" /> + <ProjectReference Include="..\NetCore\NetCore.csproj" /> </ItemGroup> </Project> diff --git a/Apache.Geode.Session.IntegrationTests/Properties/launchSettings.json b/Session.IntegrationTests/Properties/launchSettings.json similarity index 100% rename from Apache.Geode.Session.IntegrationTests/Properties/launchSettings.json rename to Session.IntegrationTests/Properties/launchSettings.json diff --git a/Apache.Geode.Session.IntegrationTests/SessionStateIntegrationTests.cs b/Session.IntegrationTests/SessionStateIntegrationTests.cs similarity index 99% rename from Apache.Geode.Session.IntegrationTests/SessionStateIntegrationTests.cs rename to Session.IntegrationTests/SessionStateIntegrationTests.cs index 7a68fbe..42250b7 100644 --- a/Apache.Geode.Session.IntegrationTests/SessionStateIntegrationTests.cs +++ b/Session.IntegrationTests/SessionStateIntegrationTests.cs @@ -1,7 +1,7 @@ using System; using System.Text; using Xunit; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using System.Linq; using Microsoft.Extensions.Caching.Distributed; using System.Threading.Tasks; diff --git a/Apache.Geode.Session.Tests/Apache.Geode.DotNetCore.Session.Tests.csproj b/Session.Tests/NetCore.Session.Tests.csproj similarity index 73% rename from Apache.Geode.Session.Tests/Apache.Geode.DotNetCore.Session.Tests.csproj rename to Session.Tests/NetCore.Session.Tests.csproj index ead06d3..9f66ecf 100644 --- a/Apache.Geode.Session.Tests/Apache.Geode.DotNetCore.Session.Tests.csproj +++ b/Session.Tests/NetCore.Session.Tests.csproj @@ -15,8 +15,8 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Apache.Geode.DotNetCore.Session\Apache.Geode.DotNetCore.Session.csproj" /> - <ProjectReference Include="..\Apache.Geode.DotNetCore\Apache.Geode.DotNetCore.csproj" /> + <ProjectReference Include="..\NetCore.Session\NetCore.Session.csproj" /> + <ProjectReference Include="..\NetCore\NetCore.csproj" /> </ItemGroup> </Project> diff --git a/Apache.Geode.Session.Tests/SessionStateCacheTests.cs b/Session.Tests/SessionStateCacheTests.cs similarity index 97% rename from Apache.Geode.Session.Tests/SessionStateCacheTests.cs rename to Session.Tests/SessionStateCacheTests.cs index 71cd91d..2d49d55 100644 --- a/Apache.Geode.Session.Tests/SessionStateCacheTests.cs +++ b/Session.Tests/SessionStateCacheTests.cs @@ -1,6 +1,6 @@ using System; using Xunit; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using Apache.Geode.Session; using System.IO; diff --git a/SessionSample/Models/BasicAuthInitialize.cs b/SessionSample/Models/BasicAuthInitialize.cs index ff3523d..c1b2a71 100644 --- a/SessionSample/Models/BasicAuthInitialize.cs +++ b/SessionSample/Models/BasicAuthInitialize.cs @@ -1,4 +1,4 @@ -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; using System; using System.Collections.Generic; diff --git a/SessionSample/SessionSample.csproj b/SessionSample/SessionSample.csproj index 238ae1e..b2be8d8 100644 --- a/SessionSample/SessionSample.csproj +++ b/SessionSample/SessionSample.csproj @@ -6,16 +6,15 @@ </PropertyGroup> <ItemGroup> + <PackageReference Include="Steeltoe.Common" Version="3.0.0-m2" /> + <PackageReference Include="Steeltoe.Common.Abstractions" Version="3.0.0-m2" /> <PackageReference Include="Steeltoe.Common.Hosting" Version="3.0.0-m2" /> - <PackageReference Include="Steeltoe.ConnectorCore" Version="3.0.0-gemfire"> - </PackageReference> + <PackageReference Include="Steeltoe.ConnectorCore" Version="3.0.0-gemfire" /> + <PackageReference Include="Steeltoe.Extensions.Configuration.CloudFoundryBase" Version="3.0.0-m2" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Apache.Geode.DotNetCore.Session\Apache.Geode.DotNetCore.Session.csproj" /> - <ProjectReference Include="..\Apache.Geode.DotNetCore\Apache.Geode.DotNetCore.csproj"> - <Private>true</Private> - </ProjectReference> + <ProjectReference Include="..\NetCore.Session\NetCore.Session.csproj" /> </ItemGroup> diff --git a/SessionSample/Startup.cs b/SessionSample/Startup.cs index 40a40c2..7cf7c36 100644 --- a/SessionSample/Startup.cs +++ b/SessionSample/Startup.cs @@ -10,7 +10,7 @@ using Microsoft.Extensions.Hosting; using SessionSample.Middleware; using Microsoft.Extensions.Caching.Distributed; using System; -using Apache.Geode.DotNetCore; +using Apache.Geode.NetCore; namespace SessionSample { diff --git a/SessionSample/statArchive-19444.gfs b/SessionSample/statArchive-19444.gfs new file mode 100644 index 0000000..e772c0e Binary files /dev/null and b/SessionSample/statArchive-19444.gfs differ diff --git a/SessionSample/statArchive-20992.gfs b/SessionSample/statArchive-20992.gfs new file mode 100644 index 0000000..c9a0640 Binary files /dev/null and b/SessionSample/statArchive-20992.gfs differ diff --git a/SessionSample/statArchive-23496.gfs b/SessionSample/statArchive-23496.gfs new file mode 100644 index 0000000..b9f9ba5 Binary files /dev/null and b/SessionSample/statArchive-23496.gfs differ diff --git a/SessionSample/statArchive-23824.gfs b/SessionSample/statArchive-23824.gfs new file mode 100644 index 0000000..5122e73 Binary files /dev/null and b/SessionSample/statArchive-23824.gfs differ diff --git a/SessionSample/statArchive-25408.gfs b/SessionSample/statArchive-25408.gfs new file mode 100644 index 0000000..a3b462c Binary files /dev/null and b/SessionSample/statArchive-25408.gfs differ diff --git a/SessionSample/statArchive-4448.gfs b/SessionSample/statArchive-4448.gfs new file mode 100644 index 0000000..79aeda7 Binary files /dev/null and b/SessionSample/statArchive-4448.gfs differ diff --git a/geode-dotnet-core.sln b/geode-dotnet-core.sln index 1fedaba..0eb7484 100644 --- a/geode-dotnet-core.sln +++ b/geode-dotnet-core.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30001.183 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Geode.DotNetCore", "Apache.Geode.DotNetCore\Apache.Geode.DotNetCore.csproj", "{09ABBCE7-B217-43F1-A51B-CC5BDCD8EE98}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore", "NetCore\NetCore.csproj", "{09ABBCE7-B217-43F1-A51B-CC5BDCD8EE98}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Geode.DotNetCore.Test", "Apache.Geode.DotNetCore.Test\Apache.Geode.DotNetCore.Test.csproj", "{501DEA7E-8985-42A8-8BC9-C073E1B6DFE0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Test", "NetCore.Test\NetCore.Test.csproj", "{501DEA7E-8985-42A8-8BC9-C073E1B6DFE0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Geode.DotNetCore.Session", "Apache.Geode.DotNetCore.Session\Apache.Geode.DotNetCore.Session.csproj", "{CC1FEC64-9AD6-4A69-ADF2-038CF67A8590}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Session", "NetCore.Session\NetCore.Session.csproj", "{CC1FEC64-9AD6-4A69-ADF2-038CF67A8590}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SessionState", "SessionState", "{38D87C7D-D5FE-43B8-80CC-1CE70167FB69}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Geode.DotNetCore.Session.Tests", "Apache.Geode.Session.Tests\Apache.Geode.DotNetCore.Session.Tests.csproj", "{C107D019-3B4F-403D-9040-ECB6E86C44E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Session.Tests", "Session.Tests\NetCore.Session.Tests.csproj", "{C107D019-3B4F-403D-9040-ECB6E86C44E9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Apache.Geode.DotNetCore.Session.IntegrationTests", "Apache.Geode.Session.IntegrationTests\Apache.Geode.DotNetCore.Session.IntegrationTests.csproj", "{742B4109-544E-492E-86AC-DC1E0FCCA596}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Session.IntegrationTests", "Session.IntegrationTests\NetCore.Session.IntegrationTests.csproj", "{742B4109-544E-492E-86AC-DC1E0FCCA596}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SessionSample", "SessionSample\SessionSample.csproj", "{6D0D1D93-917E-48EE-977C-16F65DB982BE}" EndProject