Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DYN-7337 Make TuneUp an Built-In package, part II #15536

Merged
merged 19 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,10 @@
<PackageReference Include="DynamoVisualProgramming.LibG_231_0_0" Version="3.4.0.2734"/>
<PackageReference Include="FontAwesome5" Version="2.1.11" />
<PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
<PackageReference Include="Greg" Version="3.0.2.6284" />
<PackageReference Include="Greg" Version="3.0.2.5756" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2478.35" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RestSharp" Version="112.0.0" />
<PackageReference Include="RestSharp" Version="108.0.1" />
<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0">
Expand Down Expand Up @@ -1861,7 +1861,7 @@
<ExternTuneUpManifest Include="$(SolutionDir)..\extern\TuneUp\TuneUp_ViewExtensionDefinition.xml" />
</ItemGroup>
<MakeDir Directories="$(OutputPath)\viewExtensions\" />
<Copy SourceFiles="@(ExternTuneUpDll)" DestinationFolder="$(OutputPath)\Built-In Packages" />
<Copy SourceFiles="@(ExternTuneUpDll)" DestinationFolder="$(OutputPath)\Built-In Packages\packages\TuneUp\bin" />
<Copy SourceFiles="@(ExternTuneUpManifest)" DestinationFolder="$(OutputPath)\viewExtensions" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions src/DynamoUtilities/CLIWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ namespace Dynamo.Utilities
/// </summary>
internal abstract class CLIWrapper : IDisposable
{
protected const string endOfDataToken = @"<<<<<Eod>>>>>";
protected const string startofDataToken = @"<<<<<Sod>>>>>";
protected const string endOfDataToken = @"<<<<<EoD>>>>>";
protected const string startofDataToken = @"<<<<<SoD>>>>>";
protected readonly Process process = new Process();
protected bool started;
internal event Action<string> MessageLogged;
Expand Down
6 changes: 2 additions & 4 deletions src/Tools/DynamoFeatureFlags/FeatureFlagsClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ internal FeatureFlagsClient(string userkey, string mobileKey = null, bool testMo
{
MessageLogged?.Invoke($"LD startup: testmode true, no LD connection. ");
MessageLogged?.Invoke($"LD startup time: {sw.ElapsedMilliseconds} ");
MessageLogged?.Invoke("<<<<<InitDone>>>>>");
AllFlags = LdValue.ObjectFrom(new Dictionary<string,LdValue> { { "TestFlag1",LdValue.Of(true) },
{ "TestFlag2", LdValue.Of("I am a string") },
//in tests we want instancing on so we can test it.
Expand All @@ -96,7 +95,6 @@ internal FeatureFlagsClient(string userkey, string mobileKey = null, bool testMo
Init(mobileKey);
sw.Stop();
MessageLogged?.Invoke($"LD startup time: {sw.ElapsedMilliseconds} ");
MessageLogged?.Invoke("<<<<<InitDone>>>>>");
//gather all the user's flags and create a top level ldvalue object containing all of them.
if (ldClient.Initialized)
{
Expand All @@ -110,11 +108,11 @@ internal void Init(string mobileKey)
ldClient = LaunchDarkly.Sdk.Client.LdClient.Init(mobileKey, LaunchDarkly.Sdk.Client.ConfigurationBuilder.AutoEnvAttributes.Disabled, user, TimeSpan.FromSeconds(5));
if (ldClient.Initialized)
{
MessageLogged?.Invoke($"launch darkly initalized");
MessageLogged?.Invoke($"Launch Darkly initalized");
}
else
{
MessageLogged?.Invoke($"launch darkly failed to initalize");
MessageLogged?.Invoke($"Launch Darkly failed to initalize");
}
}

Expand Down
Loading