Skip to content
Snippets Groups Projects
Commit 360c0f72 authored by Boris Cazic's avatar Boris Cazic Committed by Pierre Roussel
Browse files

Fix build

parent a82ef8d1
No related branches found
No related tags found
4 merge requests!50Daroldju/fix/method signature in interfaces,!43Daroldju/fix/method signature in interfaces,!39Sylvain/feature/correction type,!36Data
......@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Client"
StartupUri="MainWindow.xaml">
Startup="App_Startup">
<Application.Resources>
</Application.Resources>
......
using System;
using Client.data;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
......@@ -13,5 +14,11 @@ namespace Client
/// </summary>
public partial class App : Application
{
private DataCore dataCore;
private void App_Startup(object sender, StartupEventArgs e)
{
dataCore = new DataCore();
}
}
}
......@@ -65,9 +65,10 @@
</Compile>
<Compile Include="comm\Class1.cs" />
<Compile Include="data\Class1.cs" />
<Compile Include="data\Data_Client_ctrl.cs" />
<Compile Include="data\DataCore.cs" />
<Compile Include="data\Comm_calls_Data_Client_Impl.cs" />
<Compile Include="data\Data_Client_ctrl.cs" />
<Compile Include="data\2.cs" />
<Compile Include="data\IHM_Main_calls_Data_Client_Impl.cs" />
<Compile Include="data\Programtest.cs" />
<Compile Include="ihm-game\Class1.cs" />
......@@ -95,6 +96,7 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="bin\Debug\Client.exe.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......@@ -103,15 +105,18 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Content Include="bin\Debug\Shared.dll" />
<Content Include="bin\Debug\Shared.pdb" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Shared\Shared.csproj">
<Project>{deedb05f-755c-4573-a317-e84f11529284}</Project>
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="bin\Debug\Client.exe" />
<Content Include="bin\Debug\Client.pdb" />
<Content Include="bin\Debug\Shared.dll" />
<Content Include="bin\Debug\Shared.pdb" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
using System;
namespace Client.Data
{
public class Data_Client
{
private Comm_calls_Data_Client_impl implInterfaceForComm;
public Data_Client()
{
this.implInterfaceForComm = new Comm_calls_Data_Client_impl();
}
public Comm_calls_Data_Client_impl getImplInterfaceForComm()
{
return implInterfaceForComm;
}
}
}
......@@ -23,7 +23,7 @@ namespace Client.data
{
//Association des vues et de leur view model
mainWindow.Show();
Console.WriteLine("hello bor");
}
}
......
using Client.Data;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Client.Data
namespace Client.data
{
public class Data_Client
public class Data_Client_ctrl
{
private Comm_calls_Data_Client_impl implInterfaceForComm;
public Data_Client()
public Data_Client_ctrl()
{
this.implInterfaceForComm = new Comm_calls_Data_Client_impl();
}
public Comm_calls_Data_Client_impl getImplInterfaceForComm()
{
return implInterfaceForComm;
......
using System;
using Client.data;
//using user1;
public class IHM_Main_calls_Data_Client_Impl : Data_Client_ctrl
......@@ -8,7 +9,7 @@ public class IHM_Main_calls_Data_Client_Impl : Data_Client_ctrl
}
/*
Boolean authenticate(logint string, passwordt string)
{
int i = 0;
......@@ -25,6 +26,6 @@ public class IHM_Main_calls_Data_Client_Impl : Data_Client_ctrl
user = getLigthUserdeUser(login);
}
*/
}
......@@ -3,7 +3,7 @@
namespace network_test
{
class Program
{
{/*
static void Main(string[] args)
{
......@@ -20,7 +20,7 @@ namespace network_test
Console.WriteLine("hello nina ");
}
s
}
}*/
}
}
using System;
using Card;
using static Card;
public class Deck
{
......
......@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace Shared.data
{
enum GameStatus : ushort
public enum GameStatus : ushort
{
lobby = 0,
running = 1,
......@@ -14,7 +14,7 @@ namespace Shared.data
finished = 3
}
class LightGame
public class LightGame
{
int id { get; set; }
GameStatus status { get; set; }
......
using System;
using Card;
using static Card;
enum PlayerRole : ushort {
smallBlind = 1,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment