From 665b700116cf712eb97c8505d614372875fd69a1 Mon Sep 17 00:00:00 2001 From: Michael Grosse Huelsewiesche Date: Thu, 8 Feb 2024 11:16:45 -0800 Subject: [PATCH 1/7] Create release 2.3.3. (#88) --- Analytics-CSharp/Analytics-CSharp.csproj | 2 +- Analytics-CSharp/Segment/Analytics/Version.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Analytics-CSharp/Analytics-CSharp.csproj b/Analytics-CSharp/Analytics-CSharp.csproj index 604abc8..d48adc7 100644 --- a/Analytics-CSharp/Analytics-CSharp.csproj +++ b/Analytics-CSharp/Analytics-CSharp.csproj @@ -10,7 +10,7 @@ Segment, Inc The hassle-free way to add analytics to your C# app. - 2.3.2 + 2.3.3 MIT https://github.com/segmentio/Analytics-CSharp git diff --git a/Analytics-CSharp/Segment/Analytics/Version.cs b/Analytics-CSharp/Segment/Analytics/Version.cs index c1c498f..9604455 100644 --- a/Analytics-CSharp/Segment/Analytics/Version.cs +++ b/Analytics-CSharp/Segment/Analytics/Version.cs @@ -2,6 +2,6 @@ namespace Segment.Analytics { internal static class Version { - internal const string SegmentVersion = "2.3.2"; + internal const string SegmentVersion = "2.3.3"; } } From d2ca042a2caa7c3f3eb938ea0fdf4ee849d3fddd Mon Sep 17 00:00:00 2001 From: Alan Charles <50601149+alanjcharles@users.noreply.github.com> Date: Tue, 13 Feb 2024 10:22:26 -0700 Subject: [PATCH 2/7] Update README.md (#91) --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 00d1456..2ee4048 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ # Analytics-CSharp + +### ⚠️ Maintenance ⚠️ +This library is in maintenance mode. It will send data as intended, but receive no new feature support and only critical maintenance updates from Segment. + ![Nuget](https://img.shields.io/nuget/v/Segment.Analytics.CSharp) [![openupm](https://img.shields.io/npm/v/com.segment.analytics.csharp?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.segment.analytics.csharp/) [![](https://github.com/segmentio/analytics-csharp/actions/workflows/build.yml/badge.svg)](https://github.com/segmentio/analytics-csharp/actions) From beaf51622060d6447a0c32f2eaba70f018e4aea2 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Tue, 13 Feb 2024 14:20:57 -0600 Subject: [PATCH 3/7] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2ee4048..b04dae4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Analytics-CSharp + ![Nuget](https://img.shields.io/nuget/v/Segment.Analytics.CSharp) [![openupm](https://img.shields.io/npm/v/com.segment.analytics.csharp?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.segment.analytics.csharp/) From d1fce7b650be67d59f6aae3a24e529538ca2844f Mon Sep 17 00:00:00 2001 From: Alan Charles <50601149+alanjcharles@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:29:59 -0700 Subject: [PATCH 4/7] Update README.md (#92) --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b04dae4..8616a67 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ # Analytics-CSharp - +### 🎉 Flagship 🎉 +This library is one of Segment’s most popular Flagship libraries. It is actively maintained by Segment, benefitting from new feature releases and ongoing support. ![Nuget](https://img.shields.io/nuget/v/Segment.Analytics.CSharp) [![openupm](https://img.shields.io/npm/v/com.segment.analytics.csharp?label=openupm®istry_uri=https://package.openupm.com)](https://openupm.com/packages/com.segment.analytics.csharp/) From 47a09fff51346588cbedac16162105d30177af1e Mon Sep 17 00:00:00 2001 From: Michael Grosse Huelsewiesche Date: Fri, 23 Feb 2024 14:31:36 -0800 Subject: [PATCH 5/7] Changing empty setting string log message to info, adding test (#93) * Changing empty setting string log message to info, adding test --- Analytics-CSharp/Segment/Analytics/State.cs | 10 +++++++++- Tests/StateTest.cs | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Analytics-CSharp/Segment/Analytics/State.cs b/Analytics-CSharp/Segment/Analytics/State.cs index 49aa430..c1c755e 100644 --- a/Analytics-CSharp/Segment/Analytics/State.cs +++ b/Analytics-CSharp/Segment/Analytics/State.cs @@ -37,7 +37,15 @@ internal static System DefaultState(Configuration configuration, IStorage storag try { string cache = storage.Read(StorageConstants.Settings) ?? ""; - settings = JsonUtility.FromJson(cache); + if (string.IsNullOrEmpty(cache)) + { + Analytics.Logger.Log(LogLevel.Information, null, "No settings loaded from storage. Switch to default settings provided through configuration."); + settings = configuration.DefaultSettings; + } + else + { + settings = JsonUtility.FromJson(cache); + } } catch (Exception e) { diff --git a/Tests/StateTest.cs b/Tests/StateTest.cs index d85fb91..e70e745 100644 --- a/Tests/StateTest.cs +++ b/Tests/StateTest.cs @@ -55,6 +55,20 @@ public void TestSystemDefaultState() Assert.False(actual._running); } + [Fact] + public void TestSystemDefaultStateEmpty() + { + _storage + .Setup(o => o.Read(It.IsAny())) + .Returns(""); + + var actual = Segment.Analytics.System.DefaultState(_configuration, _storage.Object); + + Assert.Equal(_configuration, actual._configuration); + Assert.Equal(_settings.Integrations.ToString(), actual._settings.Integrations.ToString()); + Assert.False(actual._running); + } + [Fact] public void TestSystemDefaultStateException() { From e92ab7cb35207439d90a4e15a8699154ee1ab86a Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Mon, 4 Mar 2024 15:15:01 -0600 Subject: [PATCH 6/7] fix update method not called with await (#95) Co-authored-by: Wenxi Zeng --- Analytics-CSharp/Segment/Analytics/Settings.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Analytics-CSharp/Segment/Analytics/Settings.cs b/Analytics-CSharp/Segment/Analytics/Settings.cs index 339b748..5a9fe8a 100644 --- a/Analytics-CSharp/Segment/Analytics/Settings.cs +++ b/Analytics-CSharp/Segment/Analytics/Settings.cs @@ -16,7 +16,7 @@ public struct Settings public partial class Analytics { - internal async void Update(Settings settings) { + internal async Task Update(Settings settings) { System systemState = await Store.CurrentState(); HashSet initializedPlugins = new HashSet(); Timeline.Apply(plugin => { @@ -49,7 +49,7 @@ await Scope.WithContext(NetworkIODispatcher, async () => settings = systemState._settings; } - Update(settings.Value); + await Update(settings.Value); await Store.Dispatch(new System.ToggleRunningAction(true)); } } From 3c35b092e354364ac782c1f18385f312359166d6 Mon Sep 17 00:00:00 2001 From: Wenxi Zeng Date: Mon, 4 Mar 2024 15:19:18 -0600 Subject: [PATCH 7/7] prepare release 2.3.4 --- Analytics-CSharp/Analytics-CSharp.csproj | 2 +- Analytics-CSharp/Segment/Analytics/Version.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Analytics-CSharp/Analytics-CSharp.csproj b/Analytics-CSharp/Analytics-CSharp.csproj index d48adc7..2d383d7 100644 --- a/Analytics-CSharp/Analytics-CSharp.csproj +++ b/Analytics-CSharp/Analytics-CSharp.csproj @@ -10,7 +10,7 @@ Segment, Inc The hassle-free way to add analytics to your C# app. - 2.3.3 + 2.3.4 MIT https://github.com/segmentio/Analytics-CSharp git diff --git a/Analytics-CSharp/Segment/Analytics/Version.cs b/Analytics-CSharp/Segment/Analytics/Version.cs index 9604455..7b97d1f 100644 --- a/Analytics-CSharp/Segment/Analytics/Version.cs +++ b/Analytics-CSharp/Segment/Analytics/Version.cs @@ -2,6 +2,6 @@ namespace Segment.Analytics { internal static class Version { - internal const string SegmentVersion = "2.3.3"; + internal const string SegmentVersion = "2.3.4"; } }