From 34c94c140537217c7f91e3b99409e56093749712 Mon Sep 17 00:00:00 2001 From: MyAngelKamikaze Date: Wed, 15 Nov 2023 13:35:48 +0900 Subject: [PATCH 1/7] add exception overload to logger --- ElectronicObserver/Observer/APIObserver.cs | 3 +-- ElectronicObserver/Utility/Logger.cs | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ElectronicObserver/Observer/APIObserver.cs b/ElectronicObserver/Observer/APIObserver.cs index de5476fff..77622ac87 100644 --- a/ElectronicObserver/Observer/APIObserver.cs +++ b/ElectronicObserver/Observer/APIObserver.cs @@ -788,8 +788,7 @@ public int Start(int portID, Control uiControl) } catch (Exception ex) { - - Utility.Logger.Add(3, ObserverRes.APIObserverFailed + ex.Message); + Logger.Add(3, ObserverRes.APIObserverFailed, ex); ProxyPort = 0; } diff --git a/ElectronicObserver/Utility/Logger.cs b/ElectronicObserver/Utility/Logger.cs index ced2cee4a..c999162ed 100644 --- a/ElectronicObserver/Utility/Logger.cs +++ b/ElectronicObserver/Utility/Logger.cs @@ -126,6 +126,11 @@ public static void Add(int priority, string message) } } + public static void Add(int priority, string message, Exception exception) + { + Add(priority, $"{message} {exception.GetBaseException().Message} {exception.StackTrace}"); + } + /// /// ログをすべて消去します。 /// From 7cbb0a12ed57b7d0e2289636e1b750adf28e7b18 Mon Sep 17 00:00:00 2001 From: MyAngelKamikaze Date: Wed, 15 Nov 2023 13:36:06 +0900 Subject: [PATCH 2/7] code cleanup --- ElectronicObserver/Observer/APIObserver.cs | 33 +++++++++++----------- ElectronicObserver/Utility/Logger.cs | 24 ++++++++-------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/ElectronicObserver/Observer/APIObserver.cs b/ElectronicObserver/Observer/APIObserver.cs index 77622ac87..291831baa 100644 --- a/ElectronicObserver/Observer/APIObserver.cs +++ b/ElectronicObserver/Observer/APIObserver.cs @@ -755,7 +755,7 @@ private async Task ProcessApiDataAsync() /// 実際に使用されるポート番号。 public int Start(int portID, Control uiControl) { - Utility.Configuration.ConfigurationData.ConfigConnection c = Utility.Configuration.Config.Connection; + Configuration.ConfigurationData.ConfigConnection c = Configuration.Config.Connection; UIControl = uiControl; @@ -783,7 +783,7 @@ public int Start(int portID, Control uiControl) ProxyStarted(); - Utility.Logger.Add(1, string.Format(LoggerRes.APIObserverStarted, portID)); + Logger.Add(1, string.Format(LoggerRes.APIObserverStarted, portID)); } catch (Exception ex) @@ -792,7 +792,6 @@ public int Start(int portID, Control uiControl) ProxyPort = 0; } - return ProxyPort; } @@ -803,7 +802,7 @@ public void Stop() { Proxy.Stop(); - Utility.Logger.Add(1, LoggerRes.APIObserverStopped); + Logger.Add(1, LoggerRes.APIObserverStopped); } private async Task ProxyOnBeforeRequest(object sender, SessionEventArgs e) @@ -898,7 +897,7 @@ private async Task ProxyOnBeforeResponse(object sender, SessionEventArgs e) int index = tpath.IndexOf("?"); if (index != -1) { - if (Utility.Configuration.Config.Connection.ApplyVersion) + if (Configuration.Config.Connection.ApplyVersion) { string over = tpath.Substring(index + 1); int vindex = over.LastIndexOf("VERSION=", StringComparison.CurrentCultureIgnoreCase); @@ -935,13 +934,13 @@ private async Task ProxyOnBeforeResponse(object sender, SessionEventArgs e) File.WriteAllBytesAsync(tpath, responseCopy); } - Utility.Logger.Add(1, string.Format(LoggerRes.SavedAPI, tpath.Remove(0, saveDataPath.Length + 1))); + Logger.Add(1, string.Format(LoggerRes.SavedAPI, tpath.Remove(0, saveDataPath.Length + 1))); } catch (IOException ex) { //ファイルがロックされている; 頻繁に出るのでエラーレポートを残さない - Utility.Logger.Add(3, LoggerRes.FailedSaveAPI + ex.Message); + Logger.Add(3, LoggerRes.FailedSaveAPI + ex.Message); } })); @@ -951,7 +950,7 @@ private async Task ProxyOnBeforeResponse(object sender, SessionEventArgs e) catch (Exception ex) { - Utility.ErrorReporter.SendErrorReport(ex, LoggerRes.FailedSaveAPI); + ErrorReporter.SendErrorReport(ex, LoggerRes.FailedSaveAPI); } } @@ -981,7 +980,7 @@ public void LoadRequest(string path, string data) try { - Utility.Logger.Add(1, LoggerRes.RecievedRequest + shortpath); + Logger.Add(1, LoggerRes.RecievedRequest + shortpath); SystemEvents.UpdateTimerEnabled = false; @@ -1023,7 +1022,7 @@ public void LoadResponse(string path, string data) try { - Utility.Logger.Add(1, ObserverRes.ResponseRecieved + shortpath); + Logger.Add(1, ObserverRes.ResponseRecieved + shortpath); SystemEvents.UpdateTimerEnabled = false; @@ -1035,7 +1034,7 @@ public void LoadResponse(string path, string data) { if (result == 201) { - Utility.Logger.Add(3, + Logger.Add(3, ObserverRes.Error201); } else @@ -1093,9 +1092,9 @@ private void SaveRequest(string url, string body) try { - string tpath = string.Format("{0}\\{1}Q@{2}.json", Utility.Configuration.Config.Connection.SaveDataPath, DateTimeHelper.GetTimeStamp(), url.Substring(url.LastIndexOf("/kcsapi/") + 8).Replace("/", "@")); + string tpath = string.Format("{0}\\{1}Q@{2}.json", Configuration.Config.Connection.SaveDataPath, DateTimeHelper.GetTimeStamp(), url.Substring(url.LastIndexOf("/kcsapi/") + 8).Replace("/", "@")); - using (var sw = new System.IO.StreamWriter(tpath, false, Encoding.UTF8)) + using (var sw = new StreamWriter(tpath, false, Encoding.UTF8)) { sw.Write(body); } @@ -1105,7 +1104,7 @@ private void SaveRequest(string url, string body) catch (Exception ex) { - Utility.ErrorReporter.SendErrorReport(ex, LoggerRes.FailedSaveAPI); + ErrorReporter.SendErrorReport(ex, LoggerRes.FailedSaveAPI); } } @@ -1117,9 +1116,9 @@ private void SaveResponse(string url, string body) try { - string tpath = string.Format("{0}\\{1}S@{2}.json", Utility.Configuration.Config.Connection.SaveDataPath, DateTimeHelper.GetTimeStamp(), url.Substring(url.LastIndexOf("/kcsapi/") + 8).Replace("/", "@")); + string tpath = string.Format("{0}\\{1}S@{2}.json", Configuration.Config.Connection.SaveDataPath, DateTimeHelper.GetTimeStamp(), url.Substring(url.LastIndexOf("/kcsapi/") + 8).Replace("/", "@")); - using (var sw = new System.IO.StreamWriter(tpath, false, Encoding.UTF8)) + using (var sw = new StreamWriter(tpath, false, Encoding.UTF8)) { sw.Write(body); } @@ -1128,7 +1127,7 @@ private void SaveResponse(string url, string body) catch (Exception ex) { - Utility.ErrorReporter.SendErrorReport(ex, LoggerRes.FailedSaveAPI); + ErrorReporter.SendErrorReport(ex, LoggerRes.FailedSaveAPI); } diff --git a/ElectronicObserver/Utility/Logger.cs b/ElectronicObserver/Utility/Logger.cs index c999162ed..7f7255452 100644 --- a/ElectronicObserver/Utility/Logger.cs +++ b/ElectronicObserver/Utility/Logger.cs @@ -78,9 +78,9 @@ public static IReadOnlyList Log { get { - lock (Logger.Instance) + lock (Instance) { - return Logger.Instance.log.AsReadOnly(); + return Instance.log.AsReadOnly(); } } } @@ -96,9 +96,9 @@ public static void Add(int priority, string message) LogData data = new LogData(DateTime.Now, priority, message); - lock (Logger.Instance) + lock (Instance) { - Logger.Instance.log.Add(data); + Instance.log.Add(data); } if (Configuration.Config.Log.SaveLogFlag && Configuration.Config.Log.SaveLogImmediately) @@ -107,7 +107,7 @@ public static void Add(int priority, string message) if (Configuration.Config.Log.LogLevel <= priority) { - if (Logger.Instance.toDebugConsole) + if (Instance.toDebugConsole) { System.Diagnostics.Debug.WriteLine(data.ToString()); } @@ -115,7 +115,7 @@ public static void Add(int priority, string message) try { - Logger.Instance.LogAdded(data); + Instance.LogAdded(data); } catch (Exception ex) @@ -136,10 +136,10 @@ public static void Add(int priority, string message, Exception exception) /// public static void Clear() { - lock (Logger.Instance) + lock (Instance) { - Logger.instance.log.Clear(); - Logger.instance.lastSavedCount = 0; + instance.log.Clear(); + instance.lastSavedCount = 0; } } @@ -162,12 +162,12 @@ public static void Save(string path) try { - lock (Logger.Instance) + lock (Instance) { - var log = Logger.instance; + var log = instance; - using (StreamWriter sw = new StreamWriter(path, true, Utility.Configuration.Config.Log.FileEncoding)) + using (StreamWriter sw = new StreamWriter(path, true, Configuration.Config.Log.FileEncoding)) { int priority = Configuration.Config.Log.LogLevel; From bdfd0287992a569fc4dca5fea77890ef6b849593 Mon Sep 17 00:00:00 2001 From: MyAngelKamikaze Date: Wed, 15 Nov 2023 14:38:24 +0900 Subject: [PATCH 3/7] add expedition summary --- .../ExpeditionRecordViewer/ExpeditionItem.cs | 9 ++++ .../ExpeditionRecordViewer.xaml | 54 +++++++++++++++++++ .../ExpeditionRecordViewerViewModel.cs | 6 +++ .../ExpeditionSummary.cs | 47 ++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionItem.cs create mode 100644 ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionSummary.cs diff --git a/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionItem.cs b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionItem.cs new file mode 100644 index 000000000..e826d1452 --- /dev/null +++ b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionItem.cs @@ -0,0 +1,9 @@ +using ElectronicObserverTypes; + +namespace ElectronicObserver.Window.Tools.ExpeditionRecordViewer; + +public class ExpeditionItem(UseItemId id, int count) +{ + public UseItemId UseItemId { get; } = id; + public int Count { get; set; } = count; +} diff --git a/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewer.xaml b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewer.xaml index de968aec8..5ee3a4950 100644 --- a/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewer.xaml +++ b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewer.xaml @@ -23,6 +23,14 @@ > + + + + + + + + @@ -323,6 +331,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewerViewModel.cs b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewerViewModel.cs index 0d879ceed..68ab43bb0 100644 --- a/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewerViewModel.cs +++ b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionRecordViewerViewModel.cs @@ -54,6 +54,7 @@ public partial class ExpeditionRecordViewerViewModel : WindowViewModelBase public ObservableCollection Expeditions { get; } = new(); public ExpeditionRecordViewModel? SelectedExpedition { get; set; } public ObservableCollection SelectedExpeditions { get; } = new(); + public ExpeditionSummary? ExpeditionSummary { get; private set; } public DataGridViewModel DataGridViewModel { get; } @@ -110,6 +111,11 @@ public ExpeditionRecordViewerViewModel() SelectedExpeditions.CollectionChanged += (_, _) => { StatusBarText = string.Format(SortieRecordViewerResources.SelectedItems, SelectedExpeditions.Count, Expeditions.Count); + ExpeditionSummary = SelectedExpeditions.Count switch + { + 0 => null, + _ => new(SelectedExpeditions), + }; }; // generate missions diff --git a/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionSummary.cs b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionSummary.cs new file mode 100644 index 000000000..b9ded5e21 --- /dev/null +++ b/ElectronicObserver/Window/Tools/ExpeditionRecordViewer/ExpeditionSummary.cs @@ -0,0 +1,47 @@ +using System.Collections.Generic; +using System.Collections.ObjectModel; +using ElectronicObserverTypes; + +namespace ElectronicObserver.Window.Tools.ExpeditionRecordViewer; + +public class ExpeditionSummary +{ + public int Fuel { get; } + public int Ammo { get; } + public int Steel { get; } + public int Bauxite { get; } + public Dictionary ExpeditionItems { get; } = new(); + + public ExpeditionSummary(ObservableCollection expeditions) + { + foreach (ExpeditionRecordViewModel expedition in expeditions) + { + Fuel += expedition.Fuel; + Ammo += expedition.Ammo; + Steel += expedition.Steel; + Bauxite += expedition.Bauxite; + + if (expedition.ItemOneId is not UseItemId.Unknown && expedition.ItemOneCount is int itemOneCount) + { + AddOrUpdateItem(expedition.ItemOneId, itemOneCount); + } + + if (expedition.ItemTwoId is not UseItemId.Unknown && expedition.ItemTwoCount is int itemTwoCount) + { + AddOrUpdateItem(expedition.ItemTwoId, itemTwoCount); + } + } + } + + private void AddOrUpdateItem(UseItemId id, int count) + { + if (ExpeditionItems.TryGetValue(id, out ExpeditionItem? value)) + { + value.Count += count; + } + else + { + ExpeditionItems.Add(id, new ExpeditionItem(id, count)); + } + } +} From de181932d5e20764af4edb8fc1537a30ab34c09d Mon Sep 17 00:00:00 2001 From: MyAngelKamikaze Date: Wed, 15 Nov 2023 18:09:53 +0900 Subject: [PATCH 4/7] wrap the cookie script in try catch --- Browser/CefSharpBrowser/CefSharpViewModel.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Browser/CefSharpBrowser/CefSharpViewModel.cs b/Browser/CefSharpBrowser/CefSharpViewModel.cs index 9ff384bf4..e051bb777 100644 --- a/Browser/CefSharpBrowser/CefSharpViewModel.cs +++ b/Browser/CefSharpBrowser/CefSharpViewModel.cs @@ -182,8 +182,15 @@ private void Browser_LoadingStateChanged(object? sender, LoadingStateChangedEven private void SetCookie() { - string cookieScript = $""" - document.cookie="ckcy=1;expires={DateTime.Now.AddYears(6):ddd, dd MMM yyyy HH:mm:ss 'GMT'};path=/netgame;domain=.dmm.com"; + string cookieScript = $$""" + try + { + document.cookie="ckcy=1;expires={{DateTime.Now.AddYears(6):ddd, dd MMM yyyy HH:mm:ss 'GMT'}};path=/netgame;domain=.dmm.com"; + } + catch + { + console.log("Setting the cookie failed."); + } """; CefSharp.ExecuteScriptAsync(cookieScript); From 3b39600dc5ba57835245fd76a8a989d473214648 Mon Sep 17 00:00:00 2001 From: MyAngelKamikaze Date: Wed, 15 Nov 2023 18:10:34 +0900 Subject: [PATCH 5/7] fix int overflow #411 --- .../Window/Wpf/ShipGroupWinforms/FormShipGroup.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElectronicObserver/Window/Wpf/ShipGroupWinforms/FormShipGroup.cs b/ElectronicObserver/Window/Wpf/ShipGroupWinforms/FormShipGroup.cs index 268952fd6..f675fde4b 100644 --- a/ElectronicObserver/Window/Wpf/ShipGroupWinforms/FormShipGroup.cs +++ b/ElectronicObserver/Window/Wpf/ShipGroupWinforms/FormShipGroup.cs @@ -601,7 +601,7 @@ private void BuildShipView(ShipGroupData group) int membersCount = group.MembersInstance.Count(s => s != null); int levelsum = group.MembersInstance.Sum(s => s?.Level ?? 0); double levelAverage = levelsum / Math.Max(membersCount, 1.0); - int expsum = group.MembersInstance.Sum(s => s?.ExpTotal ?? 0); + long expsum = group.MembersInstance.Sum(s => (long?)s?.ExpTotal ?? 0); double expAverage = expsum / Math.Max(membersCount, 1.0); ViewModel.ShipCountText = string.Format(ShipGroupResources.ShipCount, group.Members.Count); @@ -736,7 +736,7 @@ private void ShipView_SelectionChanged(object sender, EventArgs e) int membersCount = group.MembersInstance.Count(s => s != null); int levelsum = group.MembersInstance.Sum(s => s?.Level ?? 0); double levelAverage = levelsum / Math.Max(membersCount, 1.0); - int expsum = group.MembersInstance.Sum(s => s?.ExpTotal ?? 0); + long expsum = group.MembersInstance.Sum(s => (long?)s?.ExpTotal ?? 0); double expAverage = expsum / Math.Max(membersCount, 1.0); ViewModel.ShipCountText = string.Format(ShipGroupResources.ShipCount, group.Members.Count); From 9055c4f62cf5796039927a00ef491b007f579d38 Mon Sep 17 00:00:00 2001 From: MyAngelKamikaze Date: Wed, 15 Nov 2023 18:11:36 +0900 Subject: [PATCH 6/7] 5.2.11.2 --- ElectronicObserver/ElectronicObserver.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ElectronicObserver/ElectronicObserver.csproj b/ElectronicObserver/ElectronicObserver.csproj index 1a2ff426f..6f8188b6f 100644 --- a/ElectronicObserver/ElectronicObserver.csproj +++ b/ElectronicObserver/ElectronicObserver.csproj @@ -28,9 +28,9 @@ Copyright © 2014 Andante - 5.2.11.1 - 5.2.11.1 - 5.2.11.1 + 5.2.11.2 + 5.2.11.2 + 5.2.11.2 preview True ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset From fcbe4a10106d4d655c7f46d15767e78d20d10be9 Mon Sep 17 00:00:00 2001 From: MyAngelKamikaze Date: Thu, 16 Nov 2023 02:03:25 +0900 Subject: [PATCH 7/7] remove obsolete files --- .sonarlint/ElectronicObserver.slconfig | 15 - .../CSharp/SonarLint.xml | 89 ----- ...bserveren_electronicobservercsharp.ruleset | 377 ------------------ .sonarlint/sonar.settings.json | 1 - Browser/Browser.csproj | 6 +- BrowserLibCore/BrowserLibCore.csproj | 7 +- ...lectronicObserver.KancolleApi.Types.csproj | 7 +- ...ElectronicObserver.SourceGenerators.csproj | 5 - ElectronicObserver/ElectronicObserver.csproj | 6 +- .../ElectronicObserverTypes.csproj | 7 +- KancolleProgress/KancolleProgress.csproj | 6 +- 11 files changed, 6 insertions(+), 520 deletions(-) delete mode 100644 .sonarlint/ElectronicObserver.slconfig delete mode 100644 .sonarlint/electronicobserveren_electronicobserver/CSharp/SonarLint.xml delete mode 100644 .sonarlint/electronicobserveren_electronicobservercsharp.ruleset delete mode 100644 .sonarlint/sonar.settings.json diff --git a/.sonarlint/ElectronicObserver.slconfig b/.sonarlint/ElectronicObserver.slconfig deleted file mode 100644 index bab45452b..000000000 --- a/.sonarlint/ElectronicObserver.slconfig +++ /dev/null @@ -1,15 +0,0 @@ -{ - "ServerUri": "https://sonarcloud.io/", - "Organization": { - "Key": "electronicobserveren", - "Name": "ElectronicObserverEN" - }, - "ProjectKey": "ElectronicObserverEN_ElectronicObserver", - "ProjectName": "ElectronicObserver", - "Profiles": { - "CSharp": { - "ProfileKey": "AYWK9ifaCmkkHrn7N7ai", - "ProfileTimestamp": "2023-02-04T11:11:07Z" - } - } -} \ No newline at end of file diff --git a/.sonarlint/electronicobserveren_electronicobserver/CSharp/SonarLint.xml b/.sonarlint/electronicobserveren_electronicobserver/CSharp/SonarLint.xml deleted file mode 100644 index 90bc98dff..000000000 --- a/.sonarlint/electronicobserveren_electronicobserver/CSharp/SonarLint.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - sonar.cs.analyzeGeneratedCode - false - - - sonar.cs.file.suffixes - .cs - - - sonar.cs.ignoreHeaderComments - true - - - sonar.cs.roslyn.ignoreIssues - false - - - - - S107 - - - max - 7 - - - - - S110 - - - max - 5 - - - - - S1479 - - - maximum - 30 - - - - - S2342 - - - flagsAttributeFormat - ^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?s$ - - - format - ^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?$ - - - - - S2436 - - - max - 2 - - - maxMethod - 3 - - - - - S3776 - - - propertyThreshold - 3 - - - threshold - 15 - - - - - \ No newline at end of file diff --git a/.sonarlint/electronicobserveren_electronicobservercsharp.ruleset b/.sonarlint/electronicobserveren_electronicobservercsharp.ruleset deleted file mode 100644 index d14a796c5..000000000 --- a/.sonarlint/electronicobserveren_electronicobservercsharp.ruleset +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.sonarlint/sonar.settings.json b/.sonarlint/sonar.settings.json deleted file mode 100644 index 10d827d5c..000000000 --- a/.sonarlint/sonar.settings.json +++ /dev/null @@ -1 +0,0 @@ -{"sonar.exclusions":[],"sonar.global.exclusions":["**/build-wrapper-dump.json"],"sonar.inclusions":[]} \ No newline at end of file diff --git a/Browser/Browser.csproj b/Browser/Browser.csproj index 8aa0db34c..14a8a3c53 100644 --- a/Browser/Browser.csproj +++ b/Browser/Browser.csproj @@ -1,4 +1,4 @@ - + net6.0-windows7 preview @@ -33,11 +33,7 @@ 5.2.11.0 5.2.11.0 5.2.11.0 - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset - - - diff --git a/BrowserLibCore/BrowserLibCore.csproj b/BrowserLibCore/BrowserLibCore.csproj index af0f3afb4..d120a210a 100644 --- a/BrowserLibCore/BrowserLibCore.csproj +++ b/BrowserLibCore/BrowserLibCore.csproj @@ -1,11 +1,10 @@ - + netcoreapp6.0 x64 enable preview - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset @@ -16,10 +15,6 @@ embedded - - - - diff --git a/ElectronicObserver.KancolleApi.Types/ElectronicObserver.KancolleApi.Types.csproj b/ElectronicObserver.KancolleApi.Types/ElectronicObserver.KancolleApi.Types.csproj index 5ad3d073c..00bcc5b92 100644 --- a/ElectronicObserver.KancolleApi.Types/ElectronicObserver.KancolleApi.Types.csproj +++ b/ElectronicObserver.KancolleApi.Types/ElectronicObserver.KancolleApi.Types.csproj @@ -1,17 +1,12 @@ - + net6.0 enable enable true - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset - - - - diff --git a/ElectronicObserver.SourceGenerators/ElectronicObserver.SourceGenerators.csproj b/ElectronicObserver.SourceGenerators/ElectronicObserver.SourceGenerators.csproj index f9d93822b..7150ae9f6 100644 --- a/ElectronicObserver.SourceGenerators/ElectronicObserver.SourceGenerators.csproj +++ b/ElectronicObserver.SourceGenerators/ElectronicObserver.SourceGenerators.csproj @@ -3,13 +3,8 @@ netstandard2.0 preview - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset - - - - diff --git a/ElectronicObserver/ElectronicObserver.csproj b/ElectronicObserver/ElectronicObserver.csproj index 6f8188b6f..0d3f401c3 100644 --- a/ElectronicObserver/ElectronicObserver.csproj +++ b/ElectronicObserver/ElectronicObserver.csproj @@ -1,4 +1,4 @@ - + net6.0-windows7 6.0.5 @@ -33,17 +33,14 @@ 5.2.11.2 preview True - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset bin\x64\Debug\ - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset bin\x64\Release\ - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset @@ -81,7 +78,6 @@ - diff --git a/ElectronicObserverTypes/ElectronicObserverTypes.csproj b/ElectronicObserverTypes/ElectronicObserverTypes.csproj index eab94eb8f..dc0451f56 100644 --- a/ElectronicObserverTypes/ElectronicObserverTypes.csproj +++ b/ElectronicObserverTypes/ElectronicObserverTypes.csproj @@ -1,17 +1,12 @@ - + net6.0 latest Enable preview - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset embedded - - - - all diff --git a/KancolleProgress/KancolleProgress.csproj b/KancolleProgress/KancolleProgress.csproj index 02faad1a7..71166d807 100644 --- a/KancolleProgress/KancolleProgress.csproj +++ b/KancolleProgress/KancolleProgress.csproj @@ -1,11 +1,10 @@ - + net6.0-windows true enable x64 Preview - ..\.sonarlint\electronicobserveren_electronicobservercsharp.ruleset embedded @@ -13,9 +12,6 @@ embedded - - -