Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Dr/fix imports and flush #7

Merged
merged 2 commits into from
May 25, 2016
Merged

Dr/fix imports and flush #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b17dc
Attempt to fix NewtonSoft json importing and add flush when disposing…
May 24, 2016
10b4b34
Add explicit dependency on Newtonsoft.json
May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/LaunchDarkly.Client/EventProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public void SubmitEvents(object StateInfo)

public void Dispose()
{
Flush();
_queue.CompleteAdding();
_timer.Dispose();
_queue.Dispose();
Expand Down
2 changes: 1 addition & 1 deletion src/LaunchDarkly.Client/LaunchDarkly.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down
3 changes: 3 additions & 0 deletions src/LaunchDarkly.Client/LaunchDarkly.Client.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@
<releaseNotes>Switch to asynchronous HTTP client</releaseNotes>
<copyright>$copyright$</copyright>
<tags>Feature Configuration</tags>
<dependencies>
<dependency id="Newtonsoft.Json" version="8.0.3" />
Copy link
Contributor Author

@drichelson drichelson May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the change that seems to have definitively fixed the problem our customer saw and that I reproduced locally.

Copy link
Contributor

@jkodumal jkodumal May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think what's still lacking for me is an understanding of what this does-- good that it fixed the problem, but did this ever work without this dependency explicitly stated?

Copy link
Contributor Author

@drichelson drichelson May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before this change: Importing the LD client into your app would bring in an unknown version of NewtonSoft- maybe the wrong one if you already had an older one in a local repo.

After this change: We are specifying the specific version to use.

Copy link
Contributor

@jkodumal jkodumal May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah. Makes sense.

</dependencies>
</metadata>
</package>
2 changes: 1 addition & 1 deletion src/LaunchDarkly.Client/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
Copy link
Contributor

@jkodumal jkodumal May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks undesirable-- why does it target a different framework version?

Copy link
Contributor Author

@drichelson drichelson May 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned above this is what we had in the prior versions of the .NET client when there were no reports of the Newtonsoft dependency failing to be brought in correctly.

<package id="NuGet.CommandLine" version="3.4.3" targetFramework="net45" developmentDependency="true" />
</packages>
2 changes: 1 addition & 1 deletion src/LaunchDarkly.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net451" userInstalled="true" />
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net451" userInstalled="true" />
<package id="Moq" version="4.2.1510.2205" targetFramework="net451" userInstalled="true" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" userInstalled="true" />
<package id="NLog" version="4.3.1" targetFramework="net451" userInstalled="true" />
<package id="NLog.Config" version="4.3.1" targetFramework="net451" userInstalled="true" />
<package id="NLog.Schema" version="4.3.0" targetFramework="net451" userInstalled="true" />
Expand Down