diff --git a/src/Artemis.ConsoleUI/Artemis.UI.Console.csproj b/src/Artemis.ConsoleUI/Artemis.UI.Console.csproj
index ec9b660bd..145ff4a6a 100644
--- a/src/Artemis.ConsoleUI/Artemis.UI.Console.csproj
+++ b/src/Artemis.ConsoleUI/Artemis.UI.Console.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/Artemis.ConsoleUI/packages.lock.json b/src/Artemis.ConsoleUI/packages.lock.json
index 2d1c00d1c..bbb02c9a2 100644
--- a/src/Artemis.ConsoleUI/packages.lock.json
+++ b/src/Artemis.ConsoleUI/packages.lock.json
@@ -4,9 +4,9 @@
".NETCoreApp,Version=v5.0": {
"Humanizer.Core": {
"type": "Direct",
- "requested": "[2.8.26, )",
- "resolved": "2.8.26",
- "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A=="
+ "requested": "[2.11.10, )",
+ "resolved": "2.11.10",
+ "contentHash": "4TBsHSXPocdsEB5dewIHeKykTzIz5Ui7ouXw4JsUGI+ax4jjviVJVD7+gsPCNyA+b3de2EjYI+jcEq8I/1ZFSQ=="
},
"Ninject": {
"type": "Direct",
@@ -57,14 +57,6 @@
"resolved": "4.5.0",
"contentHash": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ=="
},
- "Ben.Demystifier": {
- "type": "Transitive",
- "resolved": "0.3.0",
- "contentHash": "7mTSt0PLeXomarrTXdLcdYAg+zaOunw3KEvWKQ0fQaGySwqOzGxKVq8BDgUXWAyBH2hKhXldkG7uKJGkYBhDiw==",
- "dependencies": {
- "System.Reflection.Metadata": "5.0.0"
- }
- },
"Castle.Core": {
"type": "Transitive",
"resolved": "4.2.0",
@@ -102,25 +94,22 @@
},
"McMaster.NETCore.Plugins": {
"type": "Transitive",
- "resolved": "1.3.1",
- "contentHash": "N3Ki6enXiqUB1IN8aunwhkvJ318fbF+nYuqxAFwqEnOau9536nSuD12ux3LCFFhPc4zXughJurB3GRhP10hK2g==",
+ "resolved": "1.4.0",
+ "contentHash": "UKw5Z2/QHhkR7kiAJmqdCwVDMQV0lwsfj10+FG676r8DsJWIpxtachtEjE0qBs9WoK5GUQIqxgyFeYUSwuPszg==",
"dependencies": {
- "Microsoft.DotNet.PlatformAbstractions": "3.1.0",
- "Microsoft.Extensions.DependencyModel": "3.1.0"
+ "Microsoft.DotNet.PlatformAbstractions": "3.1.6",
+ "Microsoft.Extensions.DependencyModel": "5.0.0"
}
},
"Microsoft.DotNet.PlatformAbstractions": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "WidpoE1j3eXAnccZRQjb4W+XQeDg2jJFKVgwD7iPF27wOkPB+t9P4B/ctN5GG+Vrp8k+O+01kLweuE+7+nlf9g=="
+ "resolved": "3.1.6",
+ "contentHash": "jek4XYaQ/PGUwDKKhwR8K47Uh1189PFzMeLqO83mXrXQVIpARZCcfuDedH50YDTepBkfijCZN5U/vZi++erxtg=="
},
"Microsoft.Extensions.DependencyModel": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "8tBjqI1xU3CNjdXMZF7BaY71ChU44x30QtHI2rVmPB3+3PjYi+YGhVTV5+IOlc40F81Bylh4gWwHET3jVKFE4Q==",
- "dependencies": {
- "System.Text.Json": "4.7.0"
- }
+ "resolved": "5.0.0",
+ "contentHash": "umBECCoMC+sOUgm083yFr8SxTobUOcPFH4AXigdO2xJiszCHAnmeDl4qPphJt+oaJ/XIfV1wOjIts2nRnki61Q=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -322,15 +311,6 @@
"resolved": "4.3.0",
"contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg=="
},
- "Serilog.Enrichers.Demystify": {
- "type": "Transitive",
- "resolved": "1.0.0-dev-00019",
- "contentHash": "TM2gqver3Awl/7KHM5oqUh5GmfZ24n8JbepwJFb7ho3NU2COv3eLvGGJvIB0Dptc+x+l4D77lUul8OTrTJUWxw==",
- "dependencies": {
- "Ben.Demystifier": "0.1.4",
- "Serilog": "2.7.1"
- }
- },
"Serilog.Sinks.Console": {
"type": "Transitive",
"resolved": "3.1.1",
@@ -1126,11 +1106,6 @@
"System.Text.Encoding": "4.3.0"
}
},
- "System.Text.Json": {
- "type": "Transitive",
- "resolved": "4.7.0",
- "contentHash": "IPq/x/d5nAcnD3vIyM3AbPOaTgcqrh0AqPSx7U53UFu3M6k1TH1u/eXc9/h4jm/3mpP1WRUpevlPY4PACd7AWw=="
- },
"System.Text.RegularExpressions": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1245,18 +1220,16 @@
"type": "Project",
"dependencies": {
"Artemis.Storage": "1.0.0",
- "Ben.Demystifier": "0.3.0",
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
- "Humanizer.Core": "2.8.26",
+ "Humanizer.Core": "2.11.10",
"LiteDB": "5.0.10",
- "McMaster.NETCore.Plugins": "1.3.1",
+ "McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"Serilog": "2.10.0",
- "Serilog.Enrichers.Demystify": "1.0.0-dev-00019",
"Serilog.Sinks.Console": "3.1.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "4.1.0",
diff --git a/src/Artemis.Core/Artemis.Core.csproj b/src/Artemis.Core/Artemis.Core.csproj
index 17b364307..6e416d8dd 100644
--- a/src/Artemis.Core/Artemis.Core.csproj
+++ b/src/Artemis.Core/Artemis.Core.csproj
@@ -38,18 +38,16 @@
-
-
+
-
+
-
@@ -59,7 +57,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Artemis.Core/Ninject/LoggerProvider.cs b/src/Artemis.Core/Ninject/LoggerProvider.cs
index 8c45d0be6..c39f7bace 100644
--- a/src/Artemis.Core/Ninject/LoggerProvider.cs
+++ b/src/Artemis.Core/Ninject/LoggerProvider.cs
@@ -12,7 +12,6 @@ namespace Artemis.Core.Ninject
private static readonly ILogger Logger = new LoggerConfiguration()
.Enrich.FromLogContext()
- .Enrich.WithDemystifiedStackTraces()
.WriteTo.File(Constants.DataFolder + "logs/Artemis log-.log",
rollingInterval: RollingInterval.Day,
outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}")
diff --git a/src/Artemis.Core/Services/Storage/ProfileService.cs b/src/Artemis.Core/Services/Storage/ProfileService.cs
index f47e4ca62..f7c359390 100644
--- a/src/Artemis.Core/Services/Storage/ProfileService.cs
+++ b/src/Artemis.Core/Services/Storage/ProfileService.cs
@@ -532,8 +532,10 @@ namespace Artemis.Core.Services
if (markAsFreshImport)
profileEntity.IsFreshImport = true;
- if (!makeUnique && _profileRepository.Get(profileEntity.Id) == null)
+ if (_profileRepository.Get(profileEntity.Id) != null)
_profileRepository.Add(profileEntity);
+ else
+ throw new ArtemisCoreException($"Cannot import this profile without {nameof(makeUnique)} being true");
ProfileConfiguration profileConfiguration;
if (exportModel.ProfileConfigurationEntity != null)
diff --git a/src/Artemis.Core/packages.lock.json b/src/Artemis.Core/packages.lock.json
index c114530b8..3f8b70e19 100644
--- a/src/Artemis.Core/packages.lock.json
+++ b/src/Artemis.Core/packages.lock.json
@@ -2,15 +2,6 @@
"version": 1,
"dependencies": {
".NETCoreApp,Version=v5.0": {
- "Ben.Demystifier": {
- "type": "Direct",
- "requested": "[0.3.0, )",
- "resolved": "0.3.0",
- "contentHash": "7mTSt0PLeXomarrTXdLcdYAg+zaOunw3KEvWKQ0fQaGySwqOzGxKVq8BDgUXWAyBH2hKhXldkG7uKJGkYBhDiw==",
- "dependencies": {
- "System.Reflection.Metadata": "5.0.0"
- }
- },
"EmbedIO": {
"type": "Direct",
"requested": "[3.4.3, )",
@@ -28,9 +19,9 @@
},
"Humanizer.Core": {
"type": "Direct",
- "requested": "[2.8.26, )",
- "resolved": "2.8.26",
- "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A=="
+ "requested": "[2.11.10, )",
+ "resolved": "2.11.10",
+ "contentHash": "4TBsHSXPocdsEB5dewIHeKykTzIz5Ui7ouXw4JsUGI+ax4jjviVJVD7+gsPCNyA+b3de2EjYI+jcEq8I/1ZFSQ=="
},
"LiteDB": {
"type": "Direct",
@@ -40,12 +31,12 @@
},
"McMaster.NETCore.Plugins": {
"type": "Direct",
- "requested": "[1.3.1, )",
- "resolved": "1.3.1",
- "contentHash": "N3Ki6enXiqUB1IN8aunwhkvJ318fbF+nYuqxAFwqEnOau9536nSuD12ux3LCFFhPc4zXughJurB3GRhP10hK2g==",
+ "requested": "[1.4.0, )",
+ "resolved": "1.4.0",
+ "contentHash": "UKw5Z2/QHhkR7kiAJmqdCwVDMQV0lwsfj10+FG676r8DsJWIpxtachtEjE0qBs9WoK5GUQIqxgyFeYUSwuPszg==",
"dependencies": {
- "Microsoft.DotNet.PlatformAbstractions": "3.1.0",
- "Microsoft.Extensions.DependencyModel": "3.1.0"
+ "Microsoft.DotNet.PlatformAbstractions": "3.1.6",
+ "Microsoft.Extensions.DependencyModel": "5.0.0"
}
},
"Newtonsoft.Json": {
@@ -88,16 +79,6 @@
"resolved": "2.10.0",
"contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
},
- "Serilog.Enrichers.Demystify": {
- "type": "Direct",
- "requested": "[1.0.0-dev-00019, )",
- "resolved": "1.0.0-dev-00019",
- "contentHash": "TM2gqver3Awl/7KHM5oqUh5GmfZ24n8JbepwJFb7ho3NU2COv3eLvGGJvIB0Dptc+x+l4D77lUul8OTrTJUWxw==",
- "dependencies": {
- "Ben.Demystifier": "0.1.4",
- "Serilog": "2.7.1"
- }
- },
"Serilog.Sinks.Console": {
"type": "Direct",
"requested": "[3.1.1, )",
@@ -176,9 +157,9 @@
},
"Unclassified.NetRevisionTask": {
"type": "Direct",
- "requested": "[0.4.0, )",
- "resolved": "0.4.0",
- "contentHash": "2Tzz6qoQNciyO4uT6wxByMiyvbve+u4eFIiDewDUbeHuxr/rKuba3/EhhXDsEH9WoKzYlpzqxDfQGPE/bIe5Rw=="
+ "requested": "[0.4.1, )",
+ "resolved": "0.4.1",
+ "contentHash": "N1B8XmgW7G75Z+1PhJ6kZ42DNCNzLFHSwrNWGdhczg9+ShJwq2tovvbjk8DYVhtI9tQHaPgOIbwEE8TrHBNGIw=="
},
"Castle.Core": {
"type": "Transitive",
@@ -199,16 +180,13 @@
},
"Microsoft.DotNet.PlatformAbstractions": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "WidpoE1j3eXAnccZRQjb4W+XQeDg2jJFKVgwD7iPF27wOkPB+t9P4B/ctN5GG+Vrp8k+O+01kLweuE+7+nlf9g=="
+ "resolved": "3.1.6",
+ "contentHash": "jek4XYaQ/PGUwDKKhwR8K47Uh1189PFzMeLqO83mXrXQVIpARZCcfuDedH50YDTepBkfijCZN5U/vZi++erxtg=="
},
"Microsoft.Extensions.DependencyModel": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "8tBjqI1xU3CNjdXMZF7BaY71ChU44x30QtHI2rVmPB3+3PjYi+YGhVTV5+IOlc40F81Bylh4gWwHET3jVKFE4Q==",
- "dependencies": {
- "System.Text.Json": "4.7.0"
- }
+ "resolved": "5.0.0",
+ "contentHash": "umBECCoMC+sOUgm083yFr8SxTobUOcPFH4AXigdO2xJiszCHAnmeDl4qPphJt+oaJ/XIfV1wOjIts2nRnki61Q=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -1140,11 +1118,6 @@
"System.Text.Encoding": "4.3.0"
}
},
- "System.Text.Json": {
- "type": "Transitive",
- "resolved": "4.7.0",
- "contentHash": "IPq/x/d5nAcnD3vIyM3AbPOaTgcqrh0AqPSx7U53UFu3M6k1TH1u/eXc9/h4jm/3mpP1WRUpevlPY4PACd7AWw=="
- },
"System.Text.RegularExpressions": {
"type": "Transitive",
"resolved": "4.3.0",
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index f97176885..33e955e6c 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -33,20 +33,19 @@
bin\Artemis.UI.Shared.xml
-
-
+
-
+
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Artemis.UI.Shared/Screens/Exceptions/ExceptionViewModel.cs b/src/Artemis.UI.Shared/Screens/Exceptions/ExceptionViewModel.cs
index b314b925e..9750c9eb7 100644
--- a/src/Artemis.UI.Shared/Screens/Exceptions/ExceptionViewModel.cs
+++ b/src/Artemis.UI.Shared/Screens/Exceptions/ExceptionViewModel.cs
@@ -1,5 +1,4 @@
using System;
-using System.Diagnostics;
using System.Windows;
using MaterialDesignThemes.Wpf;
using Stylet;
@@ -11,7 +10,7 @@ namespace Artemis.UI.Shared.Screens.Exceptions
public ExceptionViewModel(string message, Exception exception)
{
Header = message;
- Exception = exception.ToStringDemystified();
+ Exception = exception.ToString();
MessageQueue = new SnackbarMessageQueue(TimeSpan.FromSeconds(2));
}
diff --git a/src/Artemis.UI.Shared/packages.lock.json b/src/Artemis.UI.Shared/packages.lock.json
index 47a7a3e92..f83560583 100644
--- a/src/Artemis.UI.Shared/packages.lock.json
+++ b/src/Artemis.UI.Shared/packages.lock.json
@@ -2,20 +2,11 @@
"version": 1,
"dependencies": {
".NETCoreApp,Version=v5.0": {
- "Ben.Demystifier": {
- "type": "Direct",
- "requested": "[0.3.0, )",
- "resolved": "0.3.0",
- "contentHash": "7mTSt0PLeXomarrTXdLcdYAg+zaOunw3KEvWKQ0fQaGySwqOzGxKVq8BDgUXWAyBH2hKhXldkG7uKJGkYBhDiw==",
- "dependencies": {
- "System.Reflection.Metadata": "5.0.0"
- }
- },
"Humanizer.Core": {
"type": "Direct",
- "requested": "[2.8.26, )",
- "resolved": "2.8.26",
- "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A=="
+ "requested": "[2.11.10, )",
+ "resolved": "2.11.10",
+ "contentHash": "4TBsHSXPocdsEB5dewIHeKykTzIz5Ui7ouXw4JsUGI+ax4jjviVJVD7+gsPCNyA+b3de2EjYI+jcEq8I/1ZFSQ=="
},
"MaterialDesignExtensions": {
"type": "Direct",
@@ -63,9 +54,9 @@
},
"SharpVectors.Reloaded": {
"type": "Direct",
- "requested": "[1.7.1, )",
- "resolved": "1.7.1",
- "contentHash": "ljl9iVpmGOjgmxXxyulMBfl7jCLEMmTOSIrQwJJQLIm5PFhtaxRRgdQPY5ElXz+vfPKqX7Aj3RGnAN+SUN7V3w=="
+ "requested": "[1.7.5, )",
+ "resolved": "1.7.5",
+ "contentHash": "v9U5sSMGFE2zCMbh42BYHkaRYkmwwhsKMGcNRdHAKqD1ryOf4mhqnJR0o07hwg5KIEmCI9bDdrgYSmiZWlL+eA=="
},
"SkiaSharp": {
"type": "Direct",
@@ -109,9 +100,9 @@
},
"Unclassified.NetRevisionTask": {
"type": "Direct",
- "requested": "[0.4.0, )",
- "resolved": "0.4.0",
- "contentHash": "2Tzz6qoQNciyO4uT6wxByMiyvbve+u4eFIiDewDUbeHuxr/rKuba3/EhhXDsEH9WoKzYlpzqxDfQGPE/bIe5Rw=="
+ "requested": "[0.4.1, )",
+ "resolved": "0.4.1",
+ "contentHash": "N1B8XmgW7G75Z+1PhJ6kZ42DNCNzLFHSwrNWGdhczg9+ShJwq2tovvbjk8DYVhtI9tQHaPgOIbwEE8TrHBNGIw=="
},
"Castle.Core": {
"type": "Transitive",
@@ -155,25 +146,22 @@
},
"McMaster.NETCore.Plugins": {
"type": "Transitive",
- "resolved": "1.3.1",
- "contentHash": "N3Ki6enXiqUB1IN8aunwhkvJ318fbF+nYuqxAFwqEnOau9536nSuD12ux3LCFFhPc4zXughJurB3GRhP10hK2g==",
+ "resolved": "1.4.0",
+ "contentHash": "UKw5Z2/QHhkR7kiAJmqdCwVDMQV0lwsfj10+FG676r8DsJWIpxtachtEjE0qBs9WoK5GUQIqxgyFeYUSwuPszg==",
"dependencies": {
- "Microsoft.DotNet.PlatformAbstractions": "3.1.0",
- "Microsoft.Extensions.DependencyModel": "3.1.0"
+ "Microsoft.DotNet.PlatformAbstractions": "3.1.6",
+ "Microsoft.Extensions.DependencyModel": "5.0.0"
}
},
"Microsoft.DotNet.PlatformAbstractions": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "WidpoE1j3eXAnccZRQjb4W+XQeDg2jJFKVgwD7iPF27wOkPB+t9P4B/ctN5GG+Vrp8k+O+01kLweuE+7+nlf9g=="
+ "resolved": "3.1.6",
+ "contentHash": "jek4XYaQ/PGUwDKKhwR8K47Uh1189PFzMeLqO83mXrXQVIpARZCcfuDedH50YDTepBkfijCZN5U/vZi++erxtg=="
},
"Microsoft.Extensions.DependencyModel": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "8tBjqI1xU3CNjdXMZF7BaY71ChU44x30QtHI2rVmPB3+3PjYi+YGhVTV5+IOlc40F81Bylh4gWwHET3jVKFE4Q==",
- "dependencies": {
- "System.Text.Json": "4.7.0"
- }
+ "resolved": "5.0.0",
+ "contentHash": "umBECCoMC+sOUgm083yFr8SxTobUOcPFH4AXigdO2xJiszCHAnmeDl4qPphJt+oaJ/XIfV1wOjIts2nRnki61Q=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -388,15 +376,6 @@
"resolved": "2.10.0",
"contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
},
- "Serilog.Enrichers.Demystify": {
- "type": "Transitive",
- "resolved": "1.0.0-dev-00019",
- "contentHash": "TM2gqver3Awl/7KHM5oqUh5GmfZ24n8JbepwJFb7ho3NU2COv3eLvGGJvIB0Dptc+x+l4D77lUul8OTrTJUWxw==",
- "dependencies": {
- "Ben.Demystifier": "0.1.4",
- "Serilog": "2.7.1"
- }
- },
"Serilog.Sinks.Console": {
"type": "Transitive",
"resolved": "3.1.1",
@@ -1201,11 +1180,6 @@
"System.Text.Encoding": "4.3.0"
}
},
- "System.Text.Json": {
- "type": "Transitive",
- "resolved": "4.7.0",
- "contentHash": "IPq/x/d5nAcnD3vIyM3AbPOaTgcqrh0AqPSx7U53UFu3M6k1TH1u/eXc9/h4jm/3mpP1WRUpevlPY4PACd7AWw=="
- },
"System.Text.RegularExpressions": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1325,18 +1299,16 @@
"type": "Project",
"dependencies": {
"Artemis.Storage": "1.0.0",
- "Ben.Demystifier": "0.3.0",
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
- "Humanizer.Core": "2.8.26",
+ "Humanizer.Core": "2.11.10",
"LiteDB": "5.0.10",
- "McMaster.NETCore.Plugins": "1.3.1",
+ "McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"Serilog": "2.10.0",
- "Serilog.Enrichers.Demystify": "1.0.0-dev-00019",
"Serilog.Sinks.Console": "3.1.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "4.1.0",
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 55d1382ad..372979bc4 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -137,11 +137,11 @@
-
-
+
+
-
+
@@ -150,7 +150,7 @@
-
+
@@ -161,7 +161,7 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Artemis.UI/Providers/NativeWindowInputProvider.cs b/src/Artemis.UI/Providers/NativeWindowInputProvider.cs
index 0e513555e..a6aa38e96 100644
--- a/src/Artemis.UI/Providers/NativeWindowInputProvider.cs
+++ b/src/Artemis.UI/Providers/NativeWindowInputProvider.cs
@@ -128,7 +128,7 @@ namespace Artemis.UI.Providers
}
// Duplicate keys with different positions can be identified by the LeftKey flag (even though its set of the key that's physically on the right)
- if (keyboardData.Keyboard.Flags == RawKeyboardFlags.LeftKey || keyboardData.Keyboard.Flags == (RawKeyboardFlags.LeftKey | RawKeyboardFlags.Up))
+ if (keyboardData.Keyboard.Flags == RawKeyboardFlags.KeyE0 || keyboardData.Keyboard.Flags == (RawKeyboardFlags.KeyE0 | RawKeyboardFlags.Up))
{
if (key == KeyboardKey.Enter)
key = KeyboardKey.NumPadEnter;
@@ -142,8 +142,8 @@ namespace Artemis.UI.Providers
key = KeyboardKey.RightShift;
bool isDown = keyboardData.Keyboard.Flags != RawKeyboardFlags.Up &&
- keyboardData.Keyboard.Flags != (RawKeyboardFlags.Up | RawKeyboardFlags.LeftKey) &&
- keyboardData.Keyboard.Flags != (RawKeyboardFlags.Up | RawKeyboardFlags.RightKey);
+ keyboardData.Keyboard.Flags != (RawKeyboardFlags.Up | RawKeyboardFlags.KeyE0) &&
+ keyboardData.Keyboard.Flags != (RawKeyboardFlags.Up | RawKeyboardFlags.KeyE1);
OnKeyboardDataReceived(device, key, isDown);
UpdateToggleStatus();
diff --git a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
index 092253ddc..1b781e6dc 100644
--- a/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
+++ b/src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
@@ -12,6 +12,7 @@ using Artemis.UI.Screens.ProfileEditor.LayerProperties;
using Artemis.UI.Screens.ProfileEditor.ProfileTree;
using Artemis.UI.Screens.ProfileEditor.Visualization;
using Artemis.UI.Screens.Sidebar.Dialogs;
+using Artemis.UI.Services;
using Artemis.UI.Shared;
using Artemis.UI.Shared.Services;
using Stylet;
@@ -22,6 +23,7 @@ namespace Artemis.UI.Screens.ProfileEditor
public class ProfileEditorViewModel : MainScreenViewModel
{
private readonly IMessageService _messageService;
+ private readonly IDebugService _debugService;
private readonly ISidebarVmFactory _sidebarVmFactory;
private readonly IEventAggregator _eventAggregator;
private readonly IProfileEditorService _profileEditorService;
@@ -45,12 +47,14 @@ namespace Artemis.UI.Screens.ProfileEditor
IDialogService dialogService,
ISettingsService settingsService,
IMessageService messageService,
+ IDebugService debugService,
ISidebarVmFactory sidebarVmFactory)
{
_profileEditorService = profileEditorService;
_profileService = profileService;
_settingsService = settingsService;
_messageService = messageService;
+ _debugService = debugService;
_sidebarVmFactory = sidebarVmFactory;
DisplayName = "Profile Editor";
@@ -237,6 +241,11 @@ namespace Artemis.UI.Screens.ProfileEditor
}
}
+ public void OpenDebugger()
+ {
+ _debugService.ShowDebugger();
+ }
+
public void OpenUrl(string url)
{
Core.Utilities.OpenUrl(url);
diff --git a/src/Artemis.UI/packages.lock.json b/src/Artemis.UI/packages.lock.json
index 8bd3b3f5d..ef2b15f3e 100644
--- a/src/Artemis.UI/packages.lock.json
+++ b/src/Artemis.UI/packages.lock.json
@@ -4,17 +4,17 @@
".NETCoreApp,Version=v5.0": {
"FluentValidation": {
"type": "Direct",
- "requested": "[10.1.0, )",
- "resolved": "10.1.0",
- "contentHash": "RxhhfY9IcEY2qUMYjoUxegInbuE5Bwll7dVLsXpiJf25g0ztmzUK+HHqtPcub1caPemhMJsC+NwjHei+NgAkvA=="
+ "requested": "[10.2.3, )",
+ "resolved": "10.2.3",
+ "contentHash": "R2w/E6jgg9RPSlg7JQSTHg6AWDwlOXARaV4ZUKrPJ1gi1e+oaBEcomxmo29j9BLZivkyQhOpAboJ9nKZS4/xYA=="
},
"Flurl.Http": {
"type": "Direct",
- "requested": "[3.0.1, )",
- "resolved": "3.0.1",
- "contentHash": "wt4RrmYOPWu8v0sjuuSfhYBFzjfrCz4nJP48Kw2HFGssq0U6pMBPFHcL3zbsBFALJipAjgRET5mf+0Xz4ZnZpQ==",
+ "requested": "[3.2.0, )",
+ "resolved": "3.2.0",
+ "contentHash": "5S8YiJm5CyRFO418GG9PDrsgmGEaZJtZLUqk3xqBKrfx7W9eKtOSpeji/GwAL+tSgNTALKBPvBKTaT4S83Oo+w==",
"dependencies": {
- "Flurl": "3.0.1",
+ "Flurl": "3.0.2",
"Newtonsoft.Json": "12.0.2",
"System.Text.Encoding.CodePages": "4.5.1"
}
@@ -37,9 +37,9 @@
},
"Humanizer.Core": {
"type": "Direct",
- "requested": "[2.8.26, )",
- "resolved": "2.8.26",
- "contentHash": "OiKusGL20vby4uDEswj2IgkdchC1yQ6rwbIkZDVBPIR6al2b7n3pC91elBul9q33KaBgRKhbZH3+2Ur4fnWx2A=="
+ "requested": "[2.11.10, )",
+ "resolved": "2.11.10",
+ "contentHash": "4TBsHSXPocdsEB5dewIHeKykTzIz5Ui7ouXw4JsUGI+ax4jjviVJVD7+gsPCNyA+b3de2EjYI+jcEq8I/1ZFSQ=="
},
"MaterialDesignExtensions": {
"type": "Direct",
@@ -115,9 +115,9 @@
},
"RawInput.Sharp": {
"type": "Direct",
- "requested": "[0.0.3, )",
- "resolved": "0.0.3",
- "contentHash": "X5EuJYuU0RWzOnA68cHmLEJ4czhgu0EsQj3o5RtYSdTNnTnXo/zVNAXQWPWbBXgoLsws1WTsT567yX0HKjS4aA==",
+ "requested": "[0.0.4, )",
+ "resolved": "0.0.4",
+ "contentHash": "JAHC4oBBzvwvehjiWTUW0UAjptprQuX+21d/7LrsMAjBSrT9GB6q6JiEm0bQi69uTkBPohHNF7O8Wgcz3oVXkA==",
"dependencies": {
"NETStandard.Library": "1.6.1"
}
@@ -203,17 +203,9 @@
},
"Unclassified.NetRevisionTask": {
"type": "Direct",
- "requested": "[0.4.0, )",
- "resolved": "0.4.0",
- "contentHash": "2Tzz6qoQNciyO4uT6wxByMiyvbve+u4eFIiDewDUbeHuxr/rKuba3/EhhXDsEH9WoKzYlpzqxDfQGPE/bIe5Rw=="
- },
- "Ben.Demystifier": {
- "type": "Transitive",
- "resolved": "0.3.0",
- "contentHash": "7mTSt0PLeXomarrTXdLcdYAg+zaOunw3KEvWKQ0fQaGySwqOzGxKVq8BDgUXWAyBH2hKhXldkG7uKJGkYBhDiw==",
- "dependencies": {
- "System.Reflection.Metadata": "5.0.0"
- }
+ "requested": "[0.4.1, )",
+ "resolved": "0.4.1",
+ "contentHash": "N1B8XmgW7G75Z+1PhJ6kZ42DNCNzLFHSwrNWGdhczg9+ShJwq2tovvbjk8DYVhtI9tQHaPgOIbwEE8TrHBNGIw=="
},
"Castle.Core": {
"type": "Transitive",
@@ -242,8 +234,8 @@
},
"Flurl": {
"type": "Transitive",
- "resolved": "3.0.1",
- "contentHash": "i7CuPSikVroBaWG8sPvO707Ex9C6BP5+r4JufKNU1FGMmiFgLJvNo1ttUg6ZiXIzUNknvIb1VUTIO9iEDucibg=="
+ "resolved": "3.0.2",
+ "contentHash": "1/6mqdzGCTdAekbWkVZBTylCV+8g3JUSTXRBngRVR274S+RsAYNRF79GbDoDsPfMKu8VPc9HkQWdBEAncK1PQQ=="
},
"H.NotifyIcon": {
"type": "Transitive",
@@ -267,25 +259,22 @@
},
"McMaster.NETCore.Plugins": {
"type": "Transitive",
- "resolved": "1.3.1",
- "contentHash": "N3Ki6enXiqUB1IN8aunwhkvJ318fbF+nYuqxAFwqEnOau9536nSuD12ux3LCFFhPc4zXughJurB3GRhP10hK2g==",
+ "resolved": "1.4.0",
+ "contentHash": "UKw5Z2/QHhkR7kiAJmqdCwVDMQV0lwsfj10+FG676r8DsJWIpxtachtEjE0qBs9WoK5GUQIqxgyFeYUSwuPszg==",
"dependencies": {
- "Microsoft.DotNet.PlatformAbstractions": "3.1.0",
- "Microsoft.Extensions.DependencyModel": "3.1.0"
+ "Microsoft.DotNet.PlatformAbstractions": "3.1.6",
+ "Microsoft.Extensions.DependencyModel": "5.0.0"
}
},
"Microsoft.DotNet.PlatformAbstractions": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "WidpoE1j3eXAnccZRQjb4W+XQeDg2jJFKVgwD7iPF27wOkPB+t9P4B/ctN5GG+Vrp8k+O+01kLweuE+7+nlf9g=="
+ "resolved": "3.1.6",
+ "contentHash": "jek4XYaQ/PGUwDKKhwR8K47Uh1189PFzMeLqO83mXrXQVIpARZCcfuDedH50YDTepBkfijCZN5U/vZi++erxtg=="
},
"Microsoft.Extensions.DependencyModel": {
"type": "Transitive",
- "resolved": "3.1.0",
- "contentHash": "8tBjqI1xU3CNjdXMZF7BaY71ChU44x30QtHI2rVmPB3+3PjYi+YGhVTV5+IOlc40F81Bylh4gWwHET3jVKFE4Q==",
- "dependencies": {
- "System.Text.Json": "4.7.0"
- }
+ "resolved": "5.0.0",
+ "contentHash": "umBECCoMC+sOUgm083yFr8SxTobUOcPFH4AXigdO2xJiszCHAnmeDl4qPphJt+oaJ/XIfV1wOjIts2nRnki61Q=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -495,15 +484,6 @@
"resolved": "4.3.0",
"contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg=="
},
- "Serilog.Enrichers.Demystify": {
- "type": "Transitive",
- "resolved": "1.0.0-dev-00019",
- "contentHash": "TM2gqver3Awl/7KHM5oqUh5GmfZ24n8JbepwJFb7ho3NU2COv3eLvGGJvIB0Dptc+x+l4D77lUul8OTrTJUWxw==",
- "dependencies": {
- "Ben.Demystifier": "0.1.4",
- "Serilog": "2.7.1"
- }
- },
"Serilog.Sinks.Console": {
"type": "Transitive",
"resolved": "3.1.1",
@@ -536,8 +516,8 @@
},
"SharpVectors.Reloaded": {
"type": "Transitive",
- "resolved": "1.7.1",
- "contentHash": "ljl9iVpmGOjgmxXxyulMBfl7jCLEMmTOSIrQwJJQLIm5PFhtaxRRgdQPY5ElXz+vfPKqX7Aj3RGnAN+SUN7V3w=="
+ "resolved": "1.7.5",
+ "contentHash": "v9U5sSMGFE2zCMbh42BYHkaRYkmwwhsKMGcNRdHAKqD1ryOf4mhqnJR0o07hwg5KIEmCI9bDdrgYSmiZWlL+eA=="
},
"SharpVk": {
"type": "Transitive",
@@ -1333,11 +1313,6 @@
"System.Text.Encoding": "4.3.0"
}
},
- "System.Text.Json": {
- "type": "Transitive",
- "resolved": "4.7.0",
- "contentHash": "IPq/x/d5nAcnD3vIyM3AbPOaTgcqrh0AqPSx7U53UFu3M6k1TH1u/eXc9/h4jm/3mpP1WRUpevlPY4PACd7AWw=="
- },
"System.Text.RegularExpressions": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1452,18 +1427,16 @@
"type": "Project",
"dependencies": {
"Artemis.Storage": "1.0.0",
- "Ben.Demystifier": "0.3.0",
"EmbedIO": "3.4.3",
"HidSharp": "2.1.0",
- "Humanizer.Core": "2.8.26",
+ "Humanizer.Core": "2.11.10",
"LiteDB": "5.0.10",
- "McMaster.NETCore.Plugins": "1.3.1",
+ "McMaster.NETCore.Plugins": "1.4.0",
"Newtonsoft.Json": "13.0.1",
"Ninject": "3.3.4",
"Ninject.Extensions.ChildKernel": "3.3.0",
"Ninject.Extensions.Conventions": "3.3.0",
"Serilog": "2.10.0",
- "Serilog.Enrichers.Demystify": "1.0.0-dev-00019",
"Serilog.Sinks.Console": "3.1.1",
"Serilog.Sinks.Debug": "2.0.0",
"Serilog.Sinks.File": "4.1.0",
@@ -1486,14 +1459,13 @@
"type": "Project",
"dependencies": {
"Artemis.Core": "1.0.0",
- "Ben.Demystifier": "0.3.0",
- "Humanizer.Core": "2.8.26",
+ "Humanizer.Core": "2.11.10",
"MaterialDesignExtensions": "3.3.0",
"MaterialDesignThemes": "4.1.0",
"Microsoft.Xaml.Behaviors.Wpf": "1.1.31",
"Ninject": "3.3.4",
"Ninject.Extensions.Conventions": "3.3.0",
- "SharpVectors.Reloaded": "1.7.1",
+ "SharpVectors.Reloaded": "1.7.5",
"SkiaSharp": "2.80.2",
"SkiaSharp.Views.WPF": "2.80.2",
"Stylet": "1.3.6",