Skip to content

Commit

Permalink
Include built frontend
Browse files Browse the repository at this point in the history
DataDragon dl fixes
Config FileVersion fixes
Fix GoldGraph crash when no data available yet
Fix frontend gold rounding
Fix Window resizing on resolution change
Attempt to fix PickBan enable button hitbox
  • Loading branch information
floh22 committed May 9, 2021
1 parent d10a257 commit 3c5d943
Show file tree
Hide file tree
Showing 57 changed files with 1,658 additions and 143 deletions.
4 changes: 2 additions & 2 deletions LCUSharp/LCUSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyVersion>1.0.16.0</AssemblyVersion>
<FileVersion>1.0.16.21128</FileVersion>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.21128</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions LeagueBroadcast.Common/LeagueBroadcast.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyVersion>1.0.36.0</AssemblyVersion>
<FileVersion>1.0.36.21128</FileVersion>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.21128</FileVersion>
<LangVersion>latest</LangVersion>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions LeagueBroadcast.Farsight/LeagueBroadcast.Farsight.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>latest</LangVersion>
<AssemblyVersion>1.0.93.0</AssemblyVersion>
<FileVersion>1.0.93.21128</FileVersion>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.21128</FileVersion>
<OutputType>Library</OutputType>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions LeagueBroadcast.Trinket/LeagueBroadcast.Trinket.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyVersion>1.0.28.0</AssemblyVersion>
<FileVersion>1.0.28.21128</FileVersion>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.21128</FileVersion>
<OutputType>Library</OutputType>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions LeagueBroadcast.Update/LeagueBroadcast.Update.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyVersion>1.0.37.0</AssemblyVersion>
<FileVersion>1.0.37.21128</FileVersion>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.21128</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions LeagueBroadcast/Common/Controllers/BroadcastController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,15 @@ private async void EarlyInit()
ToTick = new();

_ = new Log(LogLevel.Verbose);

CfgController = ConfigController.Instance;
Log.Info($"League Broadcast (Essence) Version {ConfigController.Component.App.Version}");
if (await AppUpdateController.Update(_startupContext)) {
Startup.Close();
App.Instance.Shutdown();
} else
{
Log.Warn("Could not update");
}

EarlyInitComplete?.Invoke(null, EventArgs.Empty);
Expand Down
4 changes: 4 additions & 0 deletions LeagueBroadcast/Common/Data/Config/JSONConfigProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ public void ReadConfig(JSONConfig config)

public void WriteConfig(JSONConfig config)
{
if(config.FileVersion == null)
{
return;
}
Log.Verbose($"Writing {config.Name} config to file");
using var stream = File.CreateText(Path.Combine(_configPath, $"{config.Name}.json"));
var json = config.GETJson();
Expand Down
Loading

0 comments on commit 3c5d943

Please sign in to comment.