Skip to content

Commit

Permalink
chg - Fixed backport
Browse files Browse the repository at this point in the history
---

Type: chg
Breaking: False
Doc Required: False
Backport Required: False
Part: 1/1
  • Loading branch information
AptiviCEO committed Sep 6, 2024
1 parent 8897c1f commit 1e6d906
Show file tree
Hide file tree
Showing 70 changed files with 134 additions and 437 deletions.
1 change: 1 addition & 0 deletions private/Nitrocid.Tests/Nitrocid.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
<ItemGroup>
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="Terminaux" Version="5.0.2" />
<PackageReference Include="Textify.Offline.Json" Version="1.11.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,8 @@
<!-- Extras.Amusements addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="Textify.Offline.Data.Analysis" Version="1.11.2" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
<!-- Extras.Caffeine addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@
<!-- Extras.Calendar addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<!-- Extras.ColorConvert addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<!-- Extras.Dictionary addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class DockCommand : BaseCommand, ICommand
public override int Execute(CommandParameters parameters, ref string variableValue)
{
// Check the dock screen for existence
if (!DockTools.DoesDockScreenExist(parameters.ArgumentsList[0], out BaseWidget? dock))
if (!DockTools.DoesDockScreenExist(parameters.ArgumentsList[0], out IDock? dock))
{
TextWriters.Write(Translate.DoTranslation("There is no dock screen by this name."), KernelColorType.Error);
return 34;
Expand Down
10 changes: 5 additions & 5 deletions public/Nitrocid.Addons/Nitrocid.Extras.Docking/Dock/DockTools.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static class DockTools
public static void DockScreen(string dockName)
{
// Check to see if there is a dock by this name
if (!DoesDockScreenExist(dockName, out BaseWidget? dock))
if (!DoesDockScreenExist(dockName, out IDock? dock))
throw new KernelException(KernelExceptionType.Docking, Translate.DoTranslation("There is no screen dock by this name."));

// Now, dock the screen
Expand All @@ -62,7 +62,7 @@ public static void DockScreen(string dockName)
/// </summary>
/// <param name="dockInstance">Screen dock instance</param>
/// <exception cref="KernelException"></exception>
public static void DockScreen(BaseWidget? dockInstance)
public static void DockScreen(IDock? dockInstance)
{
// Check to see if there is a dock
if (dockInstance is null)
Expand Down Expand Up @@ -99,12 +99,12 @@ public static void DockScreen(BaseWidget? dockInstance)
/// <param name="dockName">Screen dock class name</param>
/// <param name="dockInstance">Screen dock instance output</param>
/// <returns>True if found; false otherwise.</returns>
public static bool DoesDockScreenExist(string dockName, out BaseWidget? dockInstance)
public static bool DoesDockScreenExist(string dockName, out IDock? dockInstance)
{
bool result = docks.TryGetValue(dockName, out BaseWidget? dock);
bool result = docks.TryGetValue(dockName, out IDock? dock);
DebugWriter.WriteDebug(DebugLevel.I, $"Result: {dockName}, {result}");
if (result)
DebugWriter.WriteDebug(DebugLevel.I, $"Got dock: {dock?.GetType().Name ?? "null"}");
DebugWriter.WriteDebug(DebugLevel.I, $"Got dock: {dock?.DockName ?? "null"}");
dockInstance = dock;
return result;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<!-- Extras.Docking addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ public static void PrintWeatherInfo(string CityID, string APIKey)
string WeatherSpecifier = "°";
string WindSpeedSpecifier = "m.s";
if (TextTools.IsStringNumeric(CityID))
WeatherInfo = GetWeatherInfoOwm(Convert.ToInt64(CityID), APIKey);
WeatherInfo = GetWeatherInfo(Convert.ToInt64(CityID), APIKey);
else
WeatherInfo = GetWeatherInfoOwm(CityID, APIKey);
WeatherInfo = GetWeatherInfo(CityID, APIKey);
string name = (string?)WeatherInfo.WeatherToken["name"] ?? "";
double feelsLike = (double?)WeatherInfo.WeatherToken?["main"]?["feels_like"] ?? 0d;
double pressure = (double?)WeatherInfo.WeatherToken?["main"]?["pressure"] ?? 0d;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@
<!-- Extras.HttpShell addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using Nitrocid.Languages;
using Nitrocid.Misc.Text;
using Nitrocid.Shell.ShellBase.Commands;
using Textify.Json;

namespace Nitrocid.Extras.JsonShell.Commands
{
Expand All @@ -48,7 +49,7 @@ public override int Execute(CommandParameters parameters, ref string variableVal
if (Checking.FileExists(JsonFile))
{
// Beautify the JSON and display it on screen
BeautifiedJson = JsonTextTools.BeautifyJson(JsonFile);
BeautifiedJson = JsonTools.BeautifyJson(JsonFile);
TextWriterColor.Write(BeautifiedJson);

// Beautify it to an output file specified (optional)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using Nitrocid.Files.Operations;
using Nitrocid.Misc.Text;
using Nitrocid.Shell.ShellBase.Commands;
using Textify.Json;

namespace Nitrocid.Extras.JsonShell.Commands
{
Expand All @@ -37,7 +38,7 @@ public override int Execute(CommandParameters parameters, ref string variableVal
{
var source = JToken.Parse(Reading.ReadContentsText(parameters.ArgumentsList[0]));
var target = JToken.Parse(Reading.ReadContentsText(parameters.ArgumentsList[1]));
var diff = JsonTextTools.FindDifferences(source, target);
var diff = JsonTools.FindDifferences(source, target);
TextWriters.Write(diff.ToString(Formatting.Indented), KernelColorType.NeutralText);
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using Nitrocid.Languages;
using Nitrocid.Misc.Text;
using Nitrocid.Shell.ShellBase.Commands;
using Textify.Json;

namespace Nitrocid.Extras.JsonShell.Commands
{
Expand All @@ -48,7 +49,7 @@ public override int Execute(CommandParameters parameters, ref string variableVal
if (Checking.FileExists(JsonFile))
{
// Minify the JSON and display it on screen
MinifiedJson = JsonTextTools.MinifyJson(JsonFile);
MinifiedJson = JsonTools.MinifyJson(JsonFile);
TextWriterColor.Write(MinifiedJson);

// Minify it to an output file specified (optional)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@
<!-- Extras.JsonShell addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
<!-- Extras.LanguageStudio addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
<!-- Extras.Md5 addon Platform Information End -->

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="Textify.Offline.Data.Analysis" Version="1.11.2" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
</ItemGroup>
<PropertyGroup>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

</Project>
Loading

0 comments on commit 1e6d906

Please sign in to comment.