From c5f72c2ce53f411525e2f4be8c9d5703288fe77f Mon Sep 17 00:00:00 2001 From: Lennart Kampshoff Date: Sat, 21 Dec 2019 13:49:33 +0100 Subject: [PATCH] Remove warnings --- .../ReallifeGamemode.Client.csproj | 5 ++ .../ReallifeGamemode.DataService.csproj | 1 + ReallifeGamemode.Database/Entities/ATM.cs | 11 ++-- ReallifeGamemode.Database/Entities/Ban.cs | 8 +-- .../Entities/BusRoute.cs | 8 ++- .../Entities/BusinessBankAccount.cs | 13 ++--- .../Entities/BusinessData.cs | 7 +-- .../Entities/Character.cs | 2 +- .../Entities/CharacterCloth.cs | 2 +- .../Entities/ClothCombination.cs | 9 +--- ReallifeGamemode.Database/Entities/Door.cs | 9 ++-- .../Entities/DutyCloth.cs | 7 +-- ReallifeGamemode.Database/Entities/Faction.cs | 7 ++- .../Entities/FactionBankAccount.cs | 8 +-- .../Entities/FactionRank.cs | 7 ++- .../Entities/FactionVehicles.cs | 7 ++- .../Entities/FactionWeapon.cs | 8 +-- .../Entities/GotoPoints.cs | 8 +-- ReallifeGamemode.Database/Entities/Group.cs | 10 ++-- .../Entities/GroupBankAccount.cs | 7 +-- .../Entities/GroupVehicle.cs | 12 ++--- ReallifeGamemode.Database/Entities/House.cs | 10 ++-- .../Entities/HouseRental.cs | 7 +-- .../Entities/Interior.cs | 11 ++-- .../Entities/JobVehicle.cs | 12 +---- .../Entities/Location.cs | 7 +-- .../Logs/BankAccountTransactionHistory.cs | 4 +- .../Entities/Logs/Death.cs | 5 +- ReallifeGamemode.Database/Entities/News.cs | 7 +-- .../Entities/Saves/SavedBlip.cs | 7 +-- .../Entities/Saves/SavedMarker.cs | 7 +-- .../Entities/Saves/SavedPed.cs | 7 +-- .../Entities/Saves/SavedPickup.cs | 7 +-- .../Entities/Saves/SavedTextLabel.cs | 7 +-- .../Entities/Saves/SavedVehicle.cs | 12 +---- .../Entities/SchoolVehicle.cs | 12 +---- .../Entities/ShopVehicles.cs | 9 +--- .../Entities/TuningGarage.cs | 9 ++-- ReallifeGamemode.Database/Entities/Turfs.cs | 9 +--- ReallifeGamemode.Database/Entities/User.cs | 11 ++-- .../Entities/UserBankAccount.cs | 7 ++- .../Entities/UserItem.cs | 7 ++- .../Entities/UserVehicle.cs | 2 +- .../Entities/VehicleInventory.cs | 8 +-- .../Entities/VehicleItem.cs | 8 +-- .../Entities/VehicleMod.cs | 7 +-- .../Entities/Whitelist.cs | 7 +-- .../ReallifeGamemode.Database.csproj | 3 +- .../Managers/VehicleManager.cs | 12 ++--- ReallifeGamemode.Server/Report/Report.cs | 22 ++++---- .../ReallifeGamemode.Services.csproj | 3 +- ReallifeGamemode.sln | 50 +++++++++---------- postbuild.ps1 | 4 +- 53 files changed, 158 insertions(+), 298 deletions(-) diff --git a/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj b/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj index e9b302cb..1d7f8fb4 100644 --- a/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj +++ b/ReallifeGamemode.Client/ReallifeGamemode.Client.csproj @@ -6,12 +6,17 @@ Debug;Release;ServerBuild + AnyCPU;x64 x64 + + x64 + + diff --git a/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj b/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj index a19a9b90..26796e24 100644 --- a/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj +++ b/ReallifeGamemode.DataService/ReallifeGamemode.DataService.csproj @@ -5,6 +5,7 @@ true true true + AnyCPU;x64 diff --git a/ReallifeGamemode.Database/Entities/ATM.cs b/ReallifeGamemode.Database/Entities/ATM.cs index 7b457dcf..7b0bbf14 100644 --- a/ReallifeGamemode.Database/Entities/ATM.cs +++ b/ReallifeGamemode.Database/Entities/ATM.cs @@ -1,12 +1,9 @@ -using GTANetworkAPI; -using ReallifeGamemode.Database.Entities; -using ReallifeGamemode.Database.Models; -using System; -using System.Collections.Generic; +using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; -using System.Text; +using GTANetworkAPI; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Entities ATM (ATM.cs) @@ -16,7 +13,7 @@ using System.Text; namespace ReallifeGamemode.Database.Entities { - public class ATM : IBankAccountOwner, IBankAccount + public partial class ATM : IBankAccountOwner, IBankAccount { [Key] public int Id { get; set; } diff --git a/ReallifeGamemode.Database/Entities/Ban.cs b/ReallifeGamemode.Database/Entities/Ban.cs index 951c5339..4ed2d5a3 100644 --- a/ReallifeGamemode.Database/Entities/Ban.cs +++ b/ReallifeGamemode.Database/Entities/Ban.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Entities Ban (Ban.cs) @@ -13,7 +9,7 @@ using ReallifeGamemode.Database.Entities; namespace ReallifeGamemode.Database.Entities { - public class Ban + public partial class Ban { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/BusRoute.cs b/ReallifeGamemode.Database/Entities/BusRoute.cs index 0cade05f..b92dca39 100644 --- a/ReallifeGamemode.Database/Entities/BusRoute.cs +++ b/ReallifeGamemode.Database/Entities/BusRoute.cs @@ -1,12 +1,10 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class BusRoute + public partial class BusRoute { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] @@ -17,7 +15,7 @@ namespace ReallifeGamemode.Database.Entities public List RoutePoints { get; set; } } - public class BusRoutePoint + public partial class BusRoutePoint { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/BusinessBankAccount.cs b/ReallifeGamemode.Database/Entities/BusinessBankAccount.cs index e3a75f96..e9792e57 100644 --- a/ReallifeGamemode.Database/Entities/BusinessBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/BusinessBankAccount.cs @@ -1,21 +1,14 @@ - -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; -using ReallifeGamemode.Database; namespace ReallifeGamemode.Database.Entities { - public class BusinessBankAccount : IBankAccount + public partial class BusinessBankAccount : IBankAccount { - [NotMapped] - private int _balance; - [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; } + public int Balance { get; set; } public int BusinessId { get; set; } diff --git a/ReallifeGamemode.Database/Entities/BusinessData.cs b/ReallifeGamemode.Database/Entities/BusinessData.cs index b2080a05..1cbe9a26 100644 --- a/ReallifeGamemode.Database/Entities/BusinessData.cs +++ b/ReallifeGamemode.Database/Entities/BusinessData.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class BusinessData + public partial class BusinessData { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Character.cs b/ReallifeGamemode.Database/Entities/Character.cs index 5ac2de3a..1d4ac79e 100644 --- a/ReallifeGamemode.Database/Entities/Character.cs +++ b/ReallifeGamemode.Database/Entities/Character.cs @@ -9,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities { - public class Character + public partial class Character { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/CharacterCloth.cs b/ReallifeGamemode.Database/Entities/CharacterCloth.cs index 679274b9..fd7eee52 100644 --- a/ReallifeGamemode.Database/Entities/CharacterCloth.cs +++ b/ReallifeGamemode.Database/Entities/CharacterCloth.cs @@ -9,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities { - public class CharacterCloth + public partial class CharacterCloth { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/ClothCombination.cs b/ReallifeGamemode.Database/Entities/ClothCombination.cs index 4682b91d..f09edb2d 100644 --- a/ReallifeGamemode.Database/Entities/ClothCombination.cs +++ b/ReallifeGamemode.Database/Entities/ClothCombination.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Numerics; -using System.Text; +using System.ComponentModel.DataAnnotations; /** * @overview Life of German Reallife - Entities MaleCombination (MaleCombination.cs) @@ -13,7 +8,7 @@ using System.Text; namespace ReallifeGamemode.Database.Entities { - public class ClothCombination + public partial class ClothCombination { [Key] public int Id { get; set; } diff --git a/ReallifeGamemode.Database/Entities/Door.cs b/ReallifeGamemode.Database/Entities/Door.cs index 406042f6..19eb04c4 100644 --- a/ReallifeGamemode.Database/Entities/Door.cs +++ b/ReallifeGamemode.Database/Entities/Door.cs @@ -1,9 +1,6 @@ -using GTANetworkAPI; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; +using GTANetworkAPI; /** * @overview Life of German Reallife - Entities Door (Door.cs) @@ -13,7 +10,7 @@ using System.Text; namespace ReallifeGamemode.Database.Entities { - public class Door + public partial class Door { [Key] public int Id { get; set; } diff --git a/ReallifeGamemode.Database/Entities/DutyCloth.cs b/ReallifeGamemode.Database/Entities/DutyCloth.cs index 36ea0c92..d031b867 100644 --- a/ReallifeGamemode.Database/Entities/DutyCloth.cs +++ b/ReallifeGamemode.Database/Entities/DutyCloth.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; /** * @overview Life of German Reallife - Entities DutyCloth DutyCloth.cs @@ -12,7 +9,7 @@ using System.Text; namespace ReallifeGamemode.Database.Entities { - public class DutyCloth + public partial class DutyCloth { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Faction.cs b/ReallifeGamemode.Database/Entities/Faction.cs index feefe621..253f1285 100644 --- a/ReallifeGamemode.Database/Entities/Faction.cs +++ b/ReallifeGamemode.Database/Entities/Faction.cs @@ -1,8 +1,7 @@ -using ReallifeGamemode.Database.Entities; -using ReallifeGamemode.Database.Models; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Entities Faction (Faction.cs) @@ -12,7 +11,7 @@ using System.Linq; namespace ReallifeGamemode.Database.Entities { - public class Faction : IBankAccountOwner + public partial class Faction : IBankAccountOwner { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/FactionBankAccount.cs b/ReallifeGamemode.Database/Entities/FactionBankAccount.cs index b96a1f60..064afb56 100644 --- a/ReallifeGamemode.Database/Entities/FactionBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/FactionBankAccount.cs @@ -1,9 +1,5 @@ -using GTANetworkAPI; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; /** * @overview Life of German Reallife - Entities FactionBankAccount (FactionBankAccount.cs) @@ -12,7 +8,7 @@ using System.Text; */ namespace ReallifeGamemode.Database.Entities { - public class FactionBankAccount : IBankAccount + public partial class FactionBankAccount : IBankAccount { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/FactionRank.cs b/ReallifeGamemode.Database/Entities/FactionRank.cs index 901ed982..5dd714cd 100644 --- a/ReallifeGamemode.Database/Entities/FactionRank.cs +++ b/ReallifeGamemode.Database/Entities/FactionRank.cs @@ -1,11 +1,10 @@ -using ReallifeGamemode.Database.Entities; -using ReallifeGamemode.Database.Models; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.Linq; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Database.Entities { - public class FactionRank + public partial class FactionRank { [Key] public int Id { get; set; } diff --git a/ReallifeGamemode.Database/Entities/FactionVehicles.cs b/ReallifeGamemode.Database/Entities/FactionVehicles.cs index 8014ab0b..45f3d18b 100644 --- a/ReallifeGamemode.Database/Entities/FactionVehicles.cs +++ b/ReallifeGamemode.Database/Entities/FactionVehicles.cs @@ -1,7 +1,6 @@ -using ReallifeGamemode.Database.Entities; -using ReallifeGamemode.Database.Models; -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Entities FactionVehicles (FactionVehicle.cs) @@ -12,7 +11,7 @@ using System.Linq; namespace ReallifeGamemode.Database.Entities { [Table("FactionVehicles")] - public class FactionVehicle : ServerVehicle + public partial class FactionVehicle : ServerVehicle { [ForeignKey("Faction")] public int? FactionId { get; set; } diff --git a/ReallifeGamemode.Database/Entities/FactionWeapon.cs b/ReallifeGamemode.Database/Entities/FactionWeapon.cs index d1d97f22..f27f57b4 100644 --- a/ReallifeGamemode.Database/Entities/FactionWeapon.cs +++ b/ReallifeGamemode.Database/Entities/FactionWeapon.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; -using GTANetworkAPI; namespace ReallifeGamemode.Database.Entities { - public class FactionWeapon + public partial class FactionWeapon { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/GotoPoints.cs b/ReallifeGamemode.Database/Entities/GotoPoints.cs index e70ad210..2a7daa2f 100644 --- a/ReallifeGamemode.Database/Entities/GotoPoints.cs +++ b/ReallifeGamemode.Database/Entities/GotoPoints.cs @@ -1,9 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Entities GotoPoints (GotoPoints.cs) @@ -13,7 +9,7 @@ using ReallifeGamemode.Database.Entities; namespace ReallifeGamemode.Database.Entities { - public class GotoPoint + public partial class GotoPoint { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Group.cs b/ReallifeGamemode.Database/Entities/Group.cs index 8b37b8b1..1c49d4ab 100644 --- a/ReallifeGamemode.Database/Entities/Group.cs +++ b/ReallifeGamemode.Database/Entities/Group.cs @@ -1,16 +1,12 @@ -using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Database; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; -using System.Text; +using Microsoft.EntityFrameworkCore; using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Database.Entities { - public class Group : IBankAccountOwner + public partial class Group : IBankAccountOwner { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/GroupBankAccount.cs b/ReallifeGamemode.Database/Entities/GroupBankAccount.cs index 4c226e3d..57effd5f 100644 --- a/ReallifeGamemode.Database/Entities/GroupBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/GroupBankAccount.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class GroupBankAccount : IBankAccount + public partial class GroupBankAccount : IBankAccount { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/GroupVehicle.cs b/ReallifeGamemode.Database/Entities/GroupVehicle.cs index 45252cf0..023fdc97 100644 --- a/ReallifeGamemode.Database/Entities/GroupVehicle.cs +++ b/ReallifeGamemode.Database/Entities/GroupVehicle.cs @@ -1,15 +1,11 @@ -using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Database.Entities; -using ReallifeGamemode.Database.Models; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; -using System.Text; +using Microsoft.EntityFrameworkCore; +using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Database.Entities { - public class GroupVehicle : ServerVehicle + public partial class GroupVehicle : ServerVehicle { public Group Group { get; set; } diff --git a/ReallifeGamemode.Database/Entities/House.cs b/ReallifeGamemode.Database/Entities/House.cs index faa2208c..66be0e21 100644 --- a/ReallifeGamemode.Database/Entities/House.cs +++ b/ReallifeGamemode.Database/Entities/House.cs @@ -1,14 +1,10 @@ -using GTANetworkAPI; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; +using GTANetworkAPI; namespace ReallifeGamemode.Database.Entities { - public class House + public partial class House { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/HouseRental.cs b/ReallifeGamemode.Database/Entities/HouseRental.cs index ce7315c7..c3c7905e 100644 --- a/ReallifeGamemode.Database/Entities/HouseRental.cs +++ b/ReallifeGamemode.Database/Entities/HouseRental.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class HouseRental + public partial class HouseRental { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Interior.cs b/ReallifeGamemode.Database/Entities/Interior.cs index abc97dde..e9a78ab3 100644 --- a/ReallifeGamemode.Database/Entities/Interior.cs +++ b/ReallifeGamemode.Database/Entities/Interior.cs @@ -1,14 +1,11 @@ -using GTANetworkAPI; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; +using GTANetworkAPI; +using Newtonsoft.Json; namespace ReallifeGamemode.Database.Entities { - public class Interior + public partial class Interior { [NotMapped] private Vector3 _enterPosition; diff --git a/ReallifeGamemode.Database/Entities/JobVehicle.cs b/ReallifeGamemode.Database/Entities/JobVehicle.cs index fecf25d6..8a66bdad 100644 --- a/ReallifeGamemode.Database/Entities/JobVehicle.cs +++ b/ReallifeGamemode.Database/Entities/JobVehicle.cs @@ -1,14 +1,6 @@ -using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Database.Entities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using ReallifeGamemode.Database.Models; - -namespace ReallifeGamemode.Database.Entities +namespace ReallifeGamemode.Database.Entities { - public class JobVehicle : ServerVehicle + public partial class JobVehicle : ServerVehicle { public int JobId { get; set; } } diff --git a/ReallifeGamemode.Database/Entities/Location.cs b/ReallifeGamemode.Database/Entities/Location.cs index e18f5226..52cdcf2f 100644 --- a/ReallifeGamemode.Database/Entities/Location.cs +++ b/ReallifeGamemode.Database/Entities/Location.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; +using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities { - public class Location + public partial class Location { [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public int Id { get; set; } diff --git a/ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs b/ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs index b23ee865..fabb11a0 100644 --- a/ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs +++ b/ReallifeGamemode.Database/Entities/Logs/BankAccountTransactionHistory.cs @@ -1,8 +1,6 @@ using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; /** * @overview Life of German Reallife - Logs BankAccountTransactionHistory (BankAccountTransactionHistory.cs) @@ -12,7 +10,7 @@ using System.Text; namespace ReallifeGamemode.Database.Entities.Logs { - public class BankAccountTransactionHistory + public partial class BankAccountTransactionHistory { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Logs/Death.cs b/ReallifeGamemode.Database/Entities/Logs/Death.cs index f400a765..3128d18e 100644 --- a/ReallifeGamemode.Database/Entities/Logs/Death.cs +++ b/ReallifeGamemode.Database/Entities/Logs/Death.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Text; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ReallifeGamemode.Database.Entities; /** * @overview Life of German Reallife - Logs Death (Death.cs) @@ -13,7 +10,7 @@ using ReallifeGamemode.Database.Entities; namespace ReallifeGamemode.Database.Entities.Logs { - public class Death + public partial class Death { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/News.cs b/ReallifeGamemode.Database/Entities/News.cs index 876f0994..9f8c3f66 100644 --- a/ReallifeGamemode.Database/Entities/News.cs +++ b/ReallifeGamemode.Database/Entities/News.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class News + public partial class News { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs b/ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs index d47746a4..f7af27b9 100644 --- a/ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedBlip.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; /** @@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities.Saves { - public class SavedBlip + public partial class SavedBlip { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs b/ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs index 31a78f0b..983abc5a 100644 --- a/ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedMarker.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; /** @@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities.Saves { - public class SavedMarker + public partial class SavedMarker { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Saves/SavedPed.cs b/ReallifeGamemode.Database/Entities/Saves/SavedPed.cs index 4bb2d6f7..82bcc043 100644 --- a/ReallifeGamemode.Database/Entities/Saves/SavedPed.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedPed.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; /** @@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities.Saves { - public class SavedPed + public partial class SavedPed { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs b/ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs index 6d793fff..1f0f1d90 100644 --- a/ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedPickup.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; /** @@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities.Saves { - public class SavedPickup + public partial class SavedPickup { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs b/ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs index 361b7cdd..9b06a346 100644 --- a/ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedTextLabel.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; /** @@ -12,7 +9,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace ReallifeGamemode.Database.Entities.Saves { - public class SavedTextLabel + public partial class SavedTextLabel { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs b/ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs index 7cd51e06..bff1d2cf 100644 --- a/ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs +++ b/ReallifeGamemode.Database/Entities/Saves/SavedVehicle.cs @@ -1,12 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using GTANetworkAPI; -using ReallifeGamemode.Database.Entities; - -/** +/** * @overview Life of German Reallife - Saves SavedVehicle.cs * @author VegaZ * @copyright (c) 2008 - 2018 Life of German @@ -14,7 +6,7 @@ using ReallifeGamemode.Database.Entities; namespace ReallifeGamemode.Database.Entities.Saves { - public class SavedVehicle : ServerVehicle + public partial class SavedVehicle : ServerVehicle { public override string ToString() { diff --git a/ReallifeGamemode.Database/Entities/SchoolVehicle.cs b/ReallifeGamemode.Database/Entities/SchoolVehicle.cs index 0b5b639b..fde17a40 100644 --- a/ReallifeGamemode.Database/Entities/SchoolVehicle.cs +++ b/ReallifeGamemode.Database/Entities/SchoolVehicle.cs @@ -1,14 +1,6 @@ -using Microsoft.EntityFrameworkCore; -using ReallifeGamemode.Database.Entities; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using ReallifeGamemode.Database.Models; - -namespace ReallifeGamemode.Database.Entities +namespace ReallifeGamemode.Database.Entities { - public class SchoolVehicle : ServerVehicle + public partial class SchoolVehicle : ServerVehicle { public int SchoolId { get; set; } } diff --git a/ReallifeGamemode.Database/Entities/ShopVehicles.cs b/ReallifeGamemode.Database/Entities/ShopVehicles.cs index 7411a7cc..1bb37e18 100644 --- a/ReallifeGamemode.Database/Entities/ShopVehicles.cs +++ b/ReallifeGamemode.Database/Entities/ShopVehicles.cs @@ -1,9 +1,4 @@ -using GTANetworkAPI; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; +using System.ComponentModel.DataAnnotations.Schema; /** * @overview Life of German Reallife - Entities ShopVehicles (ShopVehicles.cs) @@ -14,7 +9,7 @@ using System.Text; namespace ReallifeGamemode.Database.Entities { [Table("ShopVehicles")] - public class ShopVehicle : ServerVehicle + public partial class ShopVehicle : ServerVehicle { public int BusinessId { get; set; } public int Price { get; set; } diff --git a/ReallifeGamemode.Database/Entities/TuningGarage.cs b/ReallifeGamemode.Database/Entities/TuningGarage.cs index 8f2ef1a8..eeb24b49 100644 --- a/ReallifeGamemode.Database/Entities/TuningGarage.cs +++ b/ReallifeGamemode.Database/Entities/TuningGarage.cs @@ -1,13 +1,10 @@ -using GTANetworkAPI; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; +using GTANetworkAPI; namespace ReallifeGamemode.Database.Entities { - public class TuningGarage + public partial class TuningGarage { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Turfs.cs b/ReallifeGamemode.Database/Entities/Turfs.cs index fcfcf87d..99dfc1c2 100644 --- a/ReallifeGamemode.Database/Entities/Turfs.cs +++ b/ReallifeGamemode.Database/Entities/Turfs.cs @@ -1,14 +1,9 @@ -using GTANetworkAPI; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class Turfs + public partial class Turfs { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs index 7b1213b0..ce15c4d5 100644 --- a/ReallifeGamemode.Database/Entities/User.cs +++ b/ReallifeGamemode.Database/Entities/User.cs @@ -1,12 +1,9 @@ -using GTANetworkAPI; -using Newtonsoft.Json; -using ReallifeGamemode.Database; -using ReallifeGamemode.Database.Models; -using System; -using System.Collections.Generic; +using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using GTANetworkAPI; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Entities User (User.cs) @@ -16,7 +13,7 @@ using System.Linq; namespace ReallifeGamemode.Database.Entities { - public class User : IBankAccountOwner + public partial class User : IBankAccountOwner { [NotMapped] private int _wanteds; diff --git a/ReallifeGamemode.Database/Entities/UserBankAccount.cs b/ReallifeGamemode.Database/Entities/UserBankAccount.cs index fe8ff119..7d6c0b8d 100644 --- a/ReallifeGamemode.Database/Entities/UserBankAccount.cs +++ b/ReallifeGamemode.Database/Entities/UserBankAccount.cs @@ -1,8 +1,7 @@ -using ReallifeGamemode.Database.Entities; -using ReallifeGamemode.Database.Models; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using ReallifeGamemode.Database.Models; using ReallifeGamemode.Services; /** @@ -13,7 +12,7 @@ using ReallifeGamemode.Services; namespace ReallifeGamemode.Database.Entities { - public class UserBankAccount : IBankAccount + public partial class UserBankAccount : IBankAccount { [NotMapped] private int _balance; diff --git a/ReallifeGamemode.Database/Entities/UserItem.cs b/ReallifeGamemode.Database/Entities/UserItem.cs index 32c78f34..3cdcf2ce 100644 --- a/ReallifeGamemode.Database/Entities/UserItem.cs +++ b/ReallifeGamemode.Database/Entities/UserItem.cs @@ -1,8 +1,7 @@ -using ReallifeGamemode.Database.Entities; -using ReallifeGamemode.Database.Models; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using ReallifeGamemode.Database.Models; /** * @overview Life of German Reallife - Entities UserItem (UserItem.cs) @@ -12,7 +11,7 @@ using System.Linq; namespace ReallifeGamemode.Database.Entities { - public class UserItem + public partial class UserItem { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/UserVehicle.cs b/ReallifeGamemode.Database/Entities/UserVehicle.cs index 1b6f7ca1..8f23c77e 100644 --- a/ReallifeGamemode.Database/Entities/UserVehicle.cs +++ b/ReallifeGamemode.Database/Entities/UserVehicle.cs @@ -11,7 +11,7 @@ using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Database.Entities { [Table("UserVehicles")] - public class UserVehicle : ServerVehicle + public partial class UserVehicle : ServerVehicle { [ForeignKey("User")] public int UserId { get; set; } diff --git a/ReallifeGamemode.Database/Entities/VehicleInventory.cs b/ReallifeGamemode.Database/Entities/VehicleInventory.cs index 197c47fe..624c6e01 100644 --- a/ReallifeGamemode.Database/Entities/VehicleInventory.cs +++ b/ReallifeGamemode.Database/Entities/VehicleInventory.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace ReallifeGamemode.Database.Entities +namespace ReallifeGamemode.Database.Entities { - public class VehicleInventory + public partial class VehicleInventory { public int ID; public int currentWeight; diff --git a/ReallifeGamemode.Database/Entities/VehicleItem.cs b/ReallifeGamemode.Database/Entities/VehicleItem.cs index 4a0d7152..e7304db8 100644 --- a/ReallifeGamemode.Database/Entities/VehicleItem.cs +++ b/ReallifeGamemode.Database/Entities/VehicleItem.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; -using System.Text; -using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; namespace ReallifeGamemode.Database.Entities { - public class VehicleItem + public partial class VehicleItem { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/VehicleMod.cs b/ReallifeGamemode.Database/Entities/VehicleMod.cs index 933e34df..134638db 100644 --- a/ReallifeGamemode.Database/Entities/VehicleMod.cs +++ b/ReallifeGamemode.Database/Entities/VehicleMod.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class VehicleMod + public partial class VehicleMod { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/Entities/Whitelist.cs b/ReallifeGamemode.Database/Entities/Whitelist.cs index 6090fea6..ac322387 100644 --- a/ReallifeGamemode.Database/Entities/Whitelist.cs +++ b/ReallifeGamemode.Database/Entities/Whitelist.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.Text; namespace ReallifeGamemode.Database.Entities { - public class Whitelist + public partial class Whitelist { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj index 7ad2162b..9cae3fab 100644 --- a/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj +++ b/ReallifeGamemode.Database/ReallifeGamemode.Database.csproj @@ -1,7 +1,8 @@  - netstandard2.0 + netcoreapp2.0 + AnyCPU;x64 diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 0d0a7464..0d6ed658 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -745,11 +745,11 @@ namespace ReallifeGamemode.Server.Managers double distanceDriven; try { - distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D; + distanceDriven = v.HasSharedData("drivenDistance") ? (double)v.GetSharedData("drivenDistance") : 0D; } - catch(Microsoft.CSharp.RuntimeBinder.RuntimeBinderException ex) + catch (Microsoft.CSharp.RuntimeBinder.RuntimeBinderException) { - distanceDriven = (double)0; + distanceDriven = 0; } double distance = lastPosition.DistanceTo(v.Position) / 1000.0; @@ -814,11 +814,11 @@ namespace ReallifeGamemode.Server.Managers public static Vehicle GetVehicleFromId(int id) { - using(var dbcontext = new DatabaseContext()) + using (var dbcontext = new DatabaseContext()) { ServerVehicle sVeh = dbcontext.ServerVehicles.Where(sV => sV.Id == id).FirstOrDefault(); return GetVehicleFromServerVehicle(sVeh); - } + } } public static Vehicle GetVehicleFromServerVehicle(ServerVehicle serverVehicle) @@ -866,7 +866,7 @@ namespace ReallifeGamemode.Server.Managers { ServerVehicle serverVehicle = GetServerVehicleFromVehicle(vehicle); - if(serverVehicle == null) + if (serverVehicle == null) { vehicle.Delete(); return; diff --git a/ReallifeGamemode.Server/Report/Report.cs b/ReallifeGamemode.Server/Report/Report.cs index 1a535c2e..a73b90ad 100644 --- a/ReallifeGamemode.Server/Report/Report.cs +++ b/ReallifeGamemode.Server/Report/Report.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using Newtonsoft.Json; using ReallifeGamemode.Database; using ReallifeGamemode.Services; -using Newtonsoft.Json; namespace ReallifeGamemode.Server.Report { @@ -47,7 +46,7 @@ namespace ReallifeGamemode.Server.Report List listPlayers = new List(); List listTicketnames = new List(); - for (int a=0; a< listReports.Count; a++) + for (int a = 0; a < listReports.Count; a++) { ReportManage temp = listReports[a]; @@ -59,7 +58,7 @@ namespace ReallifeGamemode.Server.Report } //ChatService.SendMessage(client, JsonConvert.SerializeObject(listPlayers)); - if (listPlayers.Count == 0 || listTicketnames.Count == 0) + if (listPlayers.Count == 0 || listTicketnames.Count == 0) { return; } @@ -74,13 +73,14 @@ namespace ReallifeGamemode.Server.Report Client player = ClientService.GetClientByNameOrId(client); if (player == null) return; - + for (int a = 0; a < listReports.Count; a++) { ReportManage temp = listReports[a]; - if (temp.getAdmin().Equals(admin.Name)){ + if (temp.getAdmin().Equals(admin.Name)) + { admin.SendChatMessage("Du hast bereits ein Ticket angenommen"); return; } @@ -154,7 +154,7 @@ namespace ReallifeGamemode.Server.Report { userIsAdmin = true; } - + } //Für User if ((!client.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) || userIsAdmin) @@ -163,14 +163,14 @@ namespace ReallifeGamemode.Server.Report for (int a = 0; a < listReports.Count; a++) { temp = listReports[a]; - if (temp.getUser().Equals(client.Name) && !temp.getAdmin().Equals("N/A")) + if (temp.getUser().Equals(client.Name) && !temp.getAdmin().Equals("N/A")) { cont = true; adminname = listReports[a].getAdmin(); break; } } - if(!cont) + if (!cont) { return; } @@ -218,11 +218,11 @@ namespace ReallifeGamemode.Server.Report Client player = ClientService.GetClientByNameOrId(name); if (player == null) return; - + for (int a = 0; a < listReports.Count; a++) { ReportManage temp = listReports[a]; - + if (temp.getUser().Equals(player.Name)) { ChatService.SendMessage(player, "!{#addc8d} " + user.Name + " hat dein Ticket gelöscht!"); @@ -231,7 +231,7 @@ namespace ReallifeGamemode.Server.Report break; } } - + } } } diff --git a/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj b/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj index d3a71fb7..e031aa22 100644 --- a/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj +++ b/ReallifeGamemode.Services/ReallifeGamemode.Services.csproj @@ -1,9 +1,10 @@  - netstandard2.0 + netcoreapp2.0 Debug;Release;ServerBuild x64 + AnyCPU;x64 diff --git a/ReallifeGamemode.sln b/ReallifeGamemode.sln index c6fddcdd..50da29ef 100644 --- a/ReallifeGamemode.sln +++ b/ReallifeGamemode.sln @@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Database", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.Services", "ReallifeGamemode.Services\ReallifeGamemode.Services.csproj", "{2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReallifeGamemode.DataService", "ReallifeGamemode.DataService\ReallifeGamemode.DataService.csproj", "{61157B05-135C-40C5-B694-5F27CE53B334}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReallifeGamemode.DataService", "ReallifeGamemode.DataService\ReallifeGamemode.DataService.csproj", "{61157B05-135C-40C5-B694-5F27CE53B334}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -48,52 +48,52 @@ Global {6A490613-C8B7-4C45-8562-4455F59BCDD4}.ServerBuild|x64.Build.0 = ServerBuild|x64 {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.Build.0 = Debug|Any CPU + {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.ActiveCfg = Debug|x64 + {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Debug|x64.Build.0 = Debug|x64 {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|Any CPU.Build.0 = Release|Any CPU - {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.ActiveCfg = Release|Any CPU - {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.Build.0 = Release|Any CPU + {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.ActiveCfg = Release|x64 + {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.Release|x64.Build.0 = Release|x64 {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|Any CPU.ActiveCfg = ServerBuild|Any CPU {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|Any CPU.Build.0 = ServerBuild|Any CPU - {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.ActiveCfg = ServerBuild|Any CPU - {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.Build.0 = ServerBuild|Any CPU + {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.ActiveCfg = ServerBuild|x64 + {67472A94-4B6C-46B5-AB57-C2988B55C8C7}.ServerBuild|x64.Build.0 = ServerBuild|x64 {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.ActiveCfg = Debug|Any CPU - {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.Build.0 = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.ActiveCfg = Debug|x64 + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Debug|x64.Build.0 = Debug|x64 {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|Any CPU.ActiveCfg = Release|Any CPU {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|Any CPU.Build.0 = Release|Any CPU - {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.ActiveCfg = Release|Any CPU - {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.Build.0 = Release|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.ActiveCfg = Release|x64 + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.Release|x64.Build.0 = Release|x64 {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU - {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.ActiveCfg = Debug|Any CPU - {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.Build.0 = Debug|Any CPU + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.ActiveCfg = Release|x64 + {9722D6D2-0C02-4F1F-8CAC-A4F1E2748385}.ServerBuild|x64.Build.0 = Release|x64 {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.ActiveCfg = Debug|Any CPU - {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.Build.0 = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.ActiveCfg = Debug|x64 + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Debug|x64.Build.0 = Debug|x64 {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|Any CPU.Build.0 = Release|Any CPU - {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.ActiveCfg = Release|Any CPU - {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.Build.0 = Release|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.ActiveCfg = Release|x64 + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.Release|x64.Build.0 = Release|x64 {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU - {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.ActiveCfg = Debug|Any CPU - {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.Build.0 = Debug|Any CPU + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.ActiveCfg = ServerBuild|x64 + {2EFCB9CA-E9B3-4EA0-BBD8-9F59D2E734D6}.ServerBuild|x64.Build.0 = ServerBuild|x64 {61157B05-135C-40C5-B694-5F27CE53B334}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61157B05-135C-40C5-B694-5F27CE53B334}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.ActiveCfg = Debug|Any CPU - {61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.Build.0 = Debug|Any CPU + {61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.ActiveCfg = Debug|x64 + {61157B05-135C-40C5-B694-5F27CE53B334}.Debug|x64.Build.0 = Debug|x64 {61157B05-135C-40C5-B694-5F27CE53B334}.Release|Any CPU.ActiveCfg = Release|Any CPU {61157B05-135C-40C5-B694-5F27CE53B334}.Release|Any CPU.Build.0 = Release|Any CPU - {61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.ActiveCfg = Release|Any CPU - {61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.Build.0 = Release|Any CPU + {61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.ActiveCfg = Release|x64 + {61157B05-135C-40C5-B694-5F27CE53B334}.Release|x64.Build.0 = Release|x64 {61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|Any CPU.ActiveCfg = Debug|Any CPU {61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|Any CPU.Build.0 = Debug|Any CPU - {61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.ActiveCfg = Debug|Any CPU - {61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.Build.0 = Debug|Any CPU + {61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.ActiveCfg = Release|x64 + {61157B05-135C-40C5-B694-5F27CE53B334}.ServerBuild|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/postbuild.ps1 b/postbuild.ps1 index cca2e937..010fabf7 100644 --- a/postbuild.ps1 +++ b/postbuild.ps1 @@ -7,8 +7,8 @@ # set parameters param ( - [string]$buildDirectory, - [string]$buildFilename + [string]$buildDirectory, + [string]$buildFilename ) # set constant path