This commit is contained in:
@@ -11,6 +11,7 @@ jobs:
|
|||||||
sudo apt-get update -y -qq
|
sudo apt-get update -y -qq
|
||||||
sudo apt-get install zip
|
sudo apt-get install zip
|
||||||
sudo sh -c "echo '192.168.1.253 descartes.local' >> /etc/hosts"
|
sudo sh -c "echo '192.168.1.253 descartes.local' >> /etc/hosts"
|
||||||
|
sudo sh -c "echo '192.168.1.253 build.ladose.net' >> /etc/hosts"
|
||||||
- name: GetDNS
|
- name: GetDNS
|
||||||
run: |
|
run: |
|
||||||
cat /etc/resolv.conf
|
cat /etc/resolv.conf
|
||||||
@@ -35,8 +36,8 @@ jobs:
|
|||||||
dotnet build --configuration Release --os win LaDOSE.DesktopApp.Avalonia
|
dotnet build --configuration Release --os win LaDOSE.DesktopApp.Avalonia
|
||||||
- name: Zip file
|
- name: Zip file
|
||||||
run: |
|
run: |
|
||||||
zip -r build-winx64.zip LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/win-x64/
|
zip -rj build-winx64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/win-x64/
|
||||||
zip -r build-linux64.zip LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/linux-x64/
|
zip -rj build-linux64.zip ./LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/bin/Release/net6.0/linux-x64/
|
||||||
- name: Upload Artifact Windows
|
- name: Upload Artifact Windows
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -23,6 +23,8 @@
|
|||||||
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
||||||
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10"/>
|
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10"/>
|
||||||
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10"/>
|
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.10"/>
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
||||||
@@ -30,4 +32,11 @@
|
|||||||
<ProjectReference Include="..\LaDOSE.DTO\LaDOSE.DTO.csproj" />
|
<ProjectReference Include="..\LaDOSE.DTO\LaDOSE.DTO.csproj" />
|
||||||
<ProjectReference Include="..\LaDOSE.REST\LaDOSE.REST.csproj" />
|
<ProjectReference Include="..\LaDOSE.REST\LaDOSE.REST.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Update="settings.json">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -2,7 +2,9 @@
|
|||||||
using Avalonia.ReactiveUI;
|
using Avalonia.ReactiveUI;
|
||||||
using System;
|
using System;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
using System.IO;
|
||||||
using LaDOSE.REST;
|
using LaDOSE.REST;
|
||||||
|
using Microsoft.Extensions.Configuration;
|
||||||
using Splat;
|
using Splat;
|
||||||
// using Xilium.CefGlue;
|
// using Xilium.CefGlue;
|
||||||
// using Xilium.CefGlue.Common;
|
// using Xilium.CefGlue.Common;
|
||||||
@@ -26,10 +28,15 @@ sealed class Program
|
|||||||
|
|
||||||
private static void RegisterDependencies(IMutableDependencyResolver currentMutable, IReadonlyDependencyResolver current)
|
private static void RegisterDependencies(IMutableDependencyResolver currentMutable, IReadonlyDependencyResolver current)
|
||||||
{
|
{
|
||||||
|
var builder = new ConfigurationBuilder()
|
||||||
|
.AddJsonFile("settings.json", optional: true, reloadOnChange: true).Build();
|
||||||
|
var restUrl = builder["REST:Url"].ToString();
|
||||||
|
var restUser = builder["REST:User"].ToString();
|
||||||
|
var restPassword = builder["REST:Password"].ToString();
|
||||||
currentMutable.RegisterLazySingleton<RestService>(()=>
|
currentMutable.RegisterLazySingleton<RestService>(()=>
|
||||||
{
|
{
|
||||||
var restService = new RestService();
|
var restService = new RestService();
|
||||||
restService.Connect(new Uri("http://localhost:5000"),"dev","dev");
|
restService.Connect(new Uri(restUrl),restUser,restPassword);
|
||||||
return restService;
|
return restService;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
7
LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/settings.json
Normal file
7
LaDOSE.Src/LaDOSE.DesktopApp.Avalonia/settings.json
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"REST": {
|
||||||
|
"Url": "http://localhost:5000",
|
||||||
|
"User": "user",
|
||||||
|
"Password": "password"
|
||||||
|
}
|
||||||
|
}
|
||||||
22
README.md
22
README.md
@@ -2,26 +2,22 @@
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||
# Dependencies
|
|
||||||
|
|
||||||
## Server
|
## Server
|
||||||
|
.Net Core 6
|
||||||
.netcore 2
|
PostgreSQL
|
||||||
AutoMapper
|
|
||||||
Newtonsoft.Json
|
|
||||||
Pomelo.EF
|
|
||||||
|
|
||||||
## Discord
|
|
||||||
|
|
||||||
DSharpPlus
|
|
||||||
|
|
||||||
## Desktop
|
## Desktop
|
||||||
|
|
||||||
.Net Framework 4.6.1
|
.Net Framework 4.6.1
|
||||||
Caliburn Micro
|
Caliburn Micro
|
||||||
[Microsoft Visual Studio Installer Projects](https://marketplace.visualstudio.com/items?itemName=VisualStudioClient.MicrosoftVisualStudio2017InstallerProjects#overview)
|
|
||||||
|
|
||||||
## Challonge
|
## Cross Plateform Desktop Client
|
||||||
|
|
||||||
|
.Net Core 6
|
||||||
|
|
||||||
|
|
||||||
|
## Challonge Provider is a modified version of this
|
||||||
|
|
||||||
[ChallongeCSharpDriver](https://github.com/francoislg/ChallongeCSharpDriver)
|
[ChallongeCSharpDriver](https://github.com/francoislg/ChallongeCSharpDriver)
|
||||||
Modified to work with .net core
|
Modified to work with .net core
|
||||||
|
|||||||
Reference in New Issue
Block a user