This commit is contained in:
Linrador 2025-09-11 14:02:07 +02:00
parent 40fb31e151
commit 54a4324a7f
20 changed files with 92 additions and 83 deletions

View File

@ -7911,17 +7911,17 @@ namespace WinFormsApp1
private async Task GetCBOnlineModelsAsync() private async Task GetCBOnlineModelsAsync()
{ {
// 0) Abruf, Cancellation & Lock -----------------------------------
_cbApiCts?.Cancel();
_cbApiCts = new CancellationTokenSource(TimeSpan.FromSeconds(30));
var ct = _cbApiCts.Token;
// kein Warten auf dem UI-Thread, falls das Semaphore schon belegt ist
if (!await modelAccessLock.WaitAsync(0).ConfigureAwait(false))
return;
try try
{ {
// 0) Abruf, Cancellation & Lock -----------------------------------
_cbApiCts?.Cancel();
_cbApiCts = new CancellationTokenSource(TimeSpan.FromSeconds(30));
var ct = _cbApiCts.Token;
// kein Warten auf dem UI-Thread, falls das Semaphore schon belegt ist
if (!await modelAccessLock.WaitAsync(0).ConfigureAwait(false))
return;
// 1) Mini-Hop: Statusmeldung und (falls nötig) Fav-/Like-Caches // 1) Mini-Hop: Statusmeldung und (falls nötig) Fav-/Like-Caches
HashSet<string> favNames = default!; HashSet<string> favNames = default!;
HashSet<string> likeNames = default!; HashSet<string> likeNames = default!;
@ -7988,50 +7988,49 @@ namespace WinFormsApp1
timer_getRoomlist.Stop(); timer_getRoomlist.Stop();
modelDetails.Clear(); modelDetails.Clear();
} }
// ────────────────────────────────────────────────────────────────
// lokale Hilfsfunktion: baut den Patch komplett im Thread-Pool
// ────────────────────────────────────────────────────────────────
(Dictionary<string, ModelDetails> updated, HashSet<string> online)
BuildPatch(string jsonText, IReadOnlyCollection<string> favs, IReadOnlyCollection<string> likes)
{
var rooms = JArray.Parse(jsonText); // Newtonsoft
var updatedInfo = new Dictionary<string, ModelDetails>(StringComparer.OrdinalIgnoreCase);
var onlineNow = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var t in rooms)
{
string name = (string)t["username"]!;
string status = ((string?)t["current_show"] ?? "").Trim();
onlineNow.Add(name);
if (!favs.Contains(name) && !likes.Contains(name))
continue; // fürs UI uninteressant
updatedInfo[name] = new ModelDetails
{
room_status = status,
room_subject = (string?)t["room_subject"] ?? "",
real_name = (string?)t["display_name"] ?? "",
location = (string?)t["location"] ?? "",
display_age = (string?)t["age"] ?? "",
sex = (string?)t["gender"] ?? "",
languages = (string?)t["spoken_languages"] ?? "",
seconds_online = (string?)t["seconds_online"] ?? "",
last_update = DateTime.UtcNow.ToString("O"),
tags = t["tags"]?.ToObject<List<string>>() ?? new()
};
}
return (updatedInfo, onlineNow);
}
} }
finally finally
{ {
modelAccessLock.Release(); modelAccessLock.Release();
} }
// ────────────────────────────────────────────────────────────────
// lokale Hilfsfunktion: baut den Patch komplett im Thread-Pool
// ────────────────────────────────────────────────────────────────
(Dictionary<string, ModelDetails> updated, HashSet<string> online)
BuildPatch(string jsonText, IReadOnlyCollection<string> favs, IReadOnlyCollection<string> likes)
{
var rooms = JArray.Parse(jsonText); // Newtonsoft
var updatedInfo = new Dictionary<string, ModelDetails>(StringComparer.OrdinalIgnoreCase);
var onlineNow = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var t in rooms)
{
string name = (string)t["username"]!;
string status = ((string?)t["current_show"] ?? "").Trim();
onlineNow.Add(name);
if (!favs.Contains(name) && !likes.Contains(name))
continue; // fürs UI uninteressant
updatedInfo[name] = new ModelDetails
{
room_status = status,
room_subject = (string?)t["room_subject"] ?? "",
real_name = (string?)t["display_name"] ?? "",
location = (string?)t["location"] ?? "",
display_age = (string?)t["age"] ?? "",
sex = (string?)t["gender"] ?? "",
languages = (string?)t["spoken_languages"] ?? "",
seconds_online = (string?)t["seconds_online"] ?? "",
last_update = DateTime.UtcNow.ToString("O"),
tags = t["tags"]?.ToObject<List<string>>() ?? new()
};
}
return (updatedInfo, onlineNow);
}
} }

View File

@ -2,7 +2,7 @@
<!-- https://go.microsoft.com/fwlink/?LinkID=208121. --> <!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<History>True|2025-09-05T08:35:16.3265491Z||;True|2025-08-13T07:12:45.6489499+02:00||;True|2025-08-08T07:25:38.8935816+02:00||;True|2025-08-08T07:19:07.3835648+02:00||;True|2025-08-06T07:38:46.3420158+02:00||;True|2025-07-16T07:41:34.3557961+02:00||;True|2025-07-15T11:01:48.5566218+02:00||;True|2025-07-07T14:59:37.1240379+02:00||;False|2025-07-07T14:57:39.0613209+02:00||;True|2025-07-07T06:29:53.8853096+02:00||;True|2025-07-06T23:39:21.1017631+02:00||;True|2025-07-06T23:24:37.7792733+02:00||;False|2025-07-06T23:19:52.7135594+02:00||;True|2025-07-06T05:55:51.5281444+02:00||;True|2025-07-06T05:14:26.6590895+02:00||;True|2025-07-06T05:07:43.4335057+02:00||;False|2025-07-06T05:06:42.5442365+02:00||;True|2025-06-27T09:56:34.6625992+02:00||;True|2025-06-27T09:55:33.6399545+02:00||;True|2025-06-27T09:35:44.7409289+02:00||;True|2025-06-27T09:35:11.7955472+02:00||;True|2025-06-27T09:23:44.1433728+02:00||;True|2025-06-27T09:10:34.1084041+02:00||;True|2025-06-27T09:06:49.8646149+02:00||;True|2025-06-27T08:55:00.3110860+02:00||;True|2025-06-27T08:47:18.4476580+02:00||;True|2025-06-11T14:42:56.1622930+02:00||;True|2025-06-11T12:33:26.7419370+02:00||;True|2025-06-11T07:48:58.3963584+02:00||;True|2025-06-11T07:42:53.0277862+02:00||;False|2025-06-11T07:39:31.7470335+02:00||;True|2025-06-03T19:58:59.1868907+02:00||;True|2025-06-03T14:33:55.4389500+02:00||;True|2025-06-03T14:16:34.6963918+02:00||;True|2025-06-03T13:26:58.4834917+02:00||;True|2025-06-02T19:01:22.1305699+02:00||;True|2025-06-02T18:27:48.1629252+02:00||;True|2025-06-02T18:12:01.0339452+02:00||;True|2025-04-25T14:02:07.8958669+02:00||;True|2025-04-24T07:32:32.3215936+02:00||;True|2025-04-23T14:24:27.8051379+02:00||;True|2025-04-22T07:23:33.4961515+02:00||;True|2025-04-22T07:16:30.0019927+02:00||;True|2025-04-17T07:35:19.5003910+02:00||;True|2025-04-16T07:51:44.2105982+02:00||;True|2025-04-15T17:39:22.9354819+02:00||;True|2025-04-15T13:59:38.1491035+02:00||;True|2025-04-15T13:26:09.1911007+02:00||;False|2025-04-15T13:24:05.8283613+02:00||;True|2025-04-15T12:05:53.7928484+02:00||;True|2025-04-14T11:46:19.0213400+02:00||;True|2025-04-14T11:19:57.9110025+02:00||;False|2025-04-14T11:18:49.2970157+02:00||;True|2025-04-14T10:56:19.4313583+02:00||;True|2025-04-14T10:09:57.0472222+02:00||;True|2025-04-11T09:36:58.9281719+02:00||;True|2025-04-11T07:56:15.1143584+02:00||;True|2025-04-10T08:08:20.7849097+02:00||;True|2025-04-09T12:56:06.8510589+02:00||;True|2025-04-09T12:39:21.5101756+02:00||;True|2025-04-09T12:35:02.6306664+02:00||;True|2025-04-09T07:53:00.7307516+02:00||;True|2025-04-07T15:17:24.3233000+02:00||;True|2025-04-04T18:09:18.8844877+02:00||;True|2025-04-03T12:27:18.9922316+02:00||;True|2025-04-03T09:48:50.2518754+02:00||;True|2025-03-31T13:53:07.3910797+02:00||;True|2025-03-31T12:46:18.3638787+02:00||;True|2025-03-31T11:01:06.0182900+02:00||;True|2025-03-31T10:55:30.7399322+02:00||;True|2025-03-31T10:41:08.8975919+02:00||;True|2025-03-31T10:15:29.6315309+02:00||;True|2025-03-31T08:53:20.4511304+02:00||;True|2025-03-29T14:23:34.4407251+01:00||;True|2025-03-29T13:42:06.7348581+01:00||;True|2025-03-28T18:06:37.5932036+01:00||;True|2025-03-27T13:26:13.4721799+01:00||;True|2025-03-27T11:19:53.3525657+01:00||;True|2025-03-27T10:09:53.9177515+01:00||;True|2025-03-27T07:56:40.2542279+01:00||;True|2025-03-26T16:58:27.4112741+01:00||;True|2025-03-26T15:03:46.9772542+01:00||;True|2025-03-25T11:14:58.7342381+01:00||;True|2025-03-25T09:57:45.7084482+01:00||;True|2025-03-25T07:43:59.3237279+01:00||;True|2025-03-24T14:10:05.5099691+01:00||;True|2025-03-24T13:48:18.7826715+01:00||;True|2025-03-24T08:45:04.4414362+01:00||;True|2025-03-24T08:09:16.9512603+01:00||;True|2025-03-20T14:13:12.1535010+01:00||;True|2025-03-20T14:00:29.9824607+01:00||;True|2025-03-20T13:45:43.1699125+01:00||;True|2025-03-19T14:19:58.3321359+01:00||;True|2025-03-19T13:26:31.1028654+01:00||;True|2025-03-19T12:59:58.9858416+01:00||;True|2025-03-18T13:00:20.7436962+01:00||;False|2025-03-18T12:57:53.3072280+01:00||;True|2025-03-18T08:57:30.7588196+01:00||;True|2025-03-18T07:49:25.6452787+01:00||;True|2025-03-18T07:46:17.7880179+01:00||;</History> <History>True|2025-09-11T07:25:26.7487573Z||;True|2025-09-05T10:35:16.3265491+02:00||;True|2025-08-13T07:12:45.6489499+02:00||;True|2025-08-08T07:25:38.8935816+02:00||;True|2025-08-08T07:19:07.3835648+02:00||;True|2025-08-06T07:38:46.3420158+02:00||;True|2025-07-16T07:41:34.3557961+02:00||;True|2025-07-15T11:01:48.5566218+02:00||;True|2025-07-07T14:59:37.1240379+02:00||;False|2025-07-07T14:57:39.0613209+02:00||;True|2025-07-07T06:29:53.8853096+02:00||;True|2025-07-06T23:39:21.1017631+02:00||;True|2025-07-06T23:24:37.7792733+02:00||;False|2025-07-06T23:19:52.7135594+02:00||;True|2025-07-06T05:55:51.5281444+02:00||;True|2025-07-06T05:14:26.6590895+02:00||;True|2025-07-06T05:07:43.4335057+02:00||;False|2025-07-06T05:06:42.5442365+02:00||;True|2025-06-27T09:56:34.6625992+02:00||;True|2025-06-27T09:55:33.6399545+02:00||;True|2025-06-27T09:35:44.7409289+02:00||;True|2025-06-27T09:35:11.7955472+02:00||;True|2025-06-27T09:23:44.1433728+02:00||;True|2025-06-27T09:10:34.1084041+02:00||;True|2025-06-27T09:06:49.8646149+02:00||;True|2025-06-27T08:55:00.3110860+02:00||;True|2025-06-27T08:47:18.4476580+02:00||;True|2025-06-11T14:42:56.1622930+02:00||;True|2025-06-11T12:33:26.7419370+02:00||;True|2025-06-11T07:48:58.3963584+02:00||;True|2025-06-11T07:42:53.0277862+02:00||;False|2025-06-11T07:39:31.7470335+02:00||;True|2025-06-03T19:58:59.1868907+02:00||;True|2025-06-03T14:33:55.4389500+02:00||;True|2025-06-03T14:16:34.6963918+02:00||;True|2025-06-03T13:26:58.4834917+02:00||;True|2025-06-02T19:01:22.1305699+02:00||;True|2025-06-02T18:27:48.1629252+02:00||;True|2025-06-02T18:12:01.0339452+02:00||;True|2025-04-25T14:02:07.8958669+02:00||;True|2025-04-24T07:32:32.3215936+02:00||;True|2025-04-23T14:24:27.8051379+02:00||;True|2025-04-22T07:23:33.4961515+02:00||;True|2025-04-22T07:16:30.0019927+02:00||;True|2025-04-17T07:35:19.5003910+02:00||;True|2025-04-16T07:51:44.2105982+02:00||;True|2025-04-15T17:39:22.9354819+02:00||;True|2025-04-15T13:59:38.1491035+02:00||;True|2025-04-15T13:26:09.1911007+02:00||;False|2025-04-15T13:24:05.8283613+02:00||;True|2025-04-15T12:05:53.7928484+02:00||;True|2025-04-14T11:46:19.0213400+02:00||;True|2025-04-14T11:19:57.9110025+02:00||;False|2025-04-14T11:18:49.2970157+02:00||;True|2025-04-14T10:56:19.4313583+02:00||;True|2025-04-14T10:09:57.0472222+02:00||;True|2025-04-11T09:36:58.9281719+02:00||;True|2025-04-11T07:56:15.1143584+02:00||;True|2025-04-10T08:08:20.7849097+02:00||;True|2025-04-09T12:56:06.8510589+02:00||;True|2025-04-09T12:39:21.5101756+02:00||;True|2025-04-09T12:35:02.6306664+02:00||;True|2025-04-09T07:53:00.7307516+02:00||;True|2025-04-07T15:17:24.3233000+02:00||;True|2025-04-04T18:09:18.8844877+02:00||;True|2025-04-03T12:27:18.9922316+02:00||;True|2025-04-03T09:48:50.2518754+02:00||;True|2025-03-31T13:53:07.3910797+02:00||;True|2025-03-31T12:46:18.3638787+02:00||;True|2025-03-31T11:01:06.0182900+02:00||;True|2025-03-31T10:55:30.7399322+02:00||;True|2025-03-31T10:41:08.8975919+02:00||;True|2025-03-31T10:15:29.6315309+02:00||;True|2025-03-31T08:53:20.4511304+02:00||;True|2025-03-29T14:23:34.4407251+01:00||;True|2025-03-29T13:42:06.7348581+01:00||;True|2025-03-28T18:06:37.5932036+01:00||;True|2025-03-27T13:26:13.4721799+01:00||;True|2025-03-27T11:19:53.3525657+01:00||;True|2025-03-27T10:09:53.9177515+01:00||;True|2025-03-27T07:56:40.2542279+01:00||;True|2025-03-26T16:58:27.4112741+01:00||;True|2025-03-26T15:03:46.9772542+01:00||;True|2025-03-25T11:14:58.7342381+01:00||;True|2025-03-25T09:57:45.7084482+01:00||;True|2025-03-25T07:43:59.3237279+01:00||;True|2025-03-24T14:10:05.5099691+01:00||;True|2025-03-24T13:48:18.7826715+01:00||;True|2025-03-24T08:45:04.4414362+01:00||;True|2025-03-24T08:09:16.9512603+01:00||;True|2025-03-20T14:13:12.1535010+01:00||;True|2025-03-20T14:00:29.9824607+01:00||;True|2025-03-20T13:45:43.1699125+01:00||;True|2025-03-19T14:19:58.3321359+01:00||;True|2025-03-19T13:26:31.1028654+01:00||;True|2025-03-19T12:59:58.9858416+01:00||;True|2025-03-18T13:00:20.7436962+01:00||;False|2025-03-18T12:57:53.3072280+01:00||;True|2025-03-18T08:57:30.7588196+01:00||;True|2025-03-18T07:49:25.6452787+01:00||;</History>
<LastFailureDetails /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
</Project> </Project>

View File

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// the code is regenerated. // der Code erneut generiert wird.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -13,12 +14,12 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyCompanyAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+065321a90355ee6911099fbac29b54905d19d7a6")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+40fb31e1518103b1a61cd4ac5bd6d5ecbb9dac9e")]
[assembly: System.Reflection.AssemblyProductAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyProductAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyTitleAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyTitleAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows10.0.19041.0")] [assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows10.0.19041.0")]
[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows10.0.19041.0")] [assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows10.0.19041.0")]
// Generated by the MSBuild WriteCodeFragment class. // Von der MSBuild WriteCodeFragment-Klasse generiert.

View File

@ -14,7 +14,7 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = WinFormsApp1 build_property.RootNamespace = WinFormsApp1
build_property.ProjectDir = C:\Users\Chris\fork\WinFormsApp1\WinFormsApp1\ build_property.ProjectDir = C:\Users\Rother\fork\WinFormsApp1\WinFormsApp1\
build_property.EnableComHosting = build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.CsWinRTAotOptimizerEnabled = true build_property.CsWinRTAotOptimizerEnabled = true
@ -24,3 +24,6 @@ build_property.CsWinRTRcwFactoryFallbackGeneratorForceOptOut =
build_property.CsWinRTCcwLookupTableGeneratorEnabled = true build_property.CsWinRTCcwLookupTableGeneratorEnabled = true
build_property.CsWinRTMergeReferencedActivationFactories = build_property.CsWinRTMergeReferencedActivationFactories =
build_property.CsWinRTAotWarningLevel = build_property.CsWinRTAotWarningLevel =
build_property.CsWinRTUseWindowsUIXamlProjections = false
build_property.EffectiveAnalysisLevelStyle = 8.0
build_property.EnableCodeStyleSeverity =

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyCompanyAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7198c6e65410c028eed71e428fd247b958e07073")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+40fb31e1518103b1a61cd4ac5bd6d5ecbb9dac9e")]
[assembly: System.Reflection.AssemblyProductAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyProductAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyTitleAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyTitleAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyCompanyAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7198c6e65410c028eed71e428fd247b958e07073")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+40fb31e1518103b1a61cd4ac5bd6d5ecbb9dac9e")]
[assembly: System.Reflection.AssemblyProductAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyProductAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyTitleAttribute("WinFormsApp1")] [assembly: System.Reflection.AssemblyTitleAttribute("WinFormsApp1")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

View File

@ -1,29 +1,31 @@
{ {
"format": 1, "format": 1,
"restore": { "restore": {
"C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj": {} "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj": {}
}, },
"projects": { "projects": {
"C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj": { "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj", "projectUniqueName": "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj",
"projectName": "WinFormsApp1", "projectName": "WinFormsApp1",
"projectPath": "C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj", "projectPath": "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj",
"packagesPath": "C:\\Users\\Chris\\.nuget\\packages\\", "packagesPath": "C:\\Users\\Rother\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\obj\\", "outputPath": "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"fallbackFolders": [ "fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
], ],
"configFilePaths": [ "configFilePaths": [
"C:\\Users\\Chris\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Users\\Rother\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config" "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
], ],
"originalTargetFrameworks": [ "originalTargetFrameworks": [
"net8.0-windows10.0.19041.0" "net8.0-windows10.0.19041.0"
], ],
"sources": { "sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {} "https://api.nuget.org/v3/index.json": {}
}, },
"frameworks": { "frameworks": {
@ -41,7 +43,8 @@
"enableAudit": "true", "enableAudit": "true",
"auditLevel": "low", "auditLevel": "low",
"auditMode": "direct" "auditMode": "direct"
} },
"SdkAnalysisLevel": "9.0.300"
}, },
"frameworks": { "frameworks": {
"net8.0-windows10.0.19041": { "net8.0-windows10.0.19041": {
@ -126,21 +129,21 @@
"downloadDependencies": [ "downloadDependencies": [
{ {
"name": "Microsoft.Windows.SDK.NET.Ref", "name": "Microsoft.Windows.SDK.NET.Ref",
"version": "[10.0.19041.56, 10.0.19041.56]" "version": "[10.0.19041.57, 10.0.19041.57]"
} }
], ],
"frameworkReferences": { "frameworkReferences": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"privateAssets": "all" "privateAssets": "all"
}, },
"Microsoft.Windows.SDK.NET.Ref": { "Microsoft.Windows.SDK.NET.Ref.Windows": {
"privateAssets": "all" "privateAssets": "all"
}, },
"Microsoft.WindowsDesktop.App.WindowsForms": { "Microsoft.WindowsDesktop.App.WindowsForms": {
"privateAssets": "none" "privateAssets": "none"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.408/PortableRuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.304/PortableRuntimeIdentifierGraph.json"
} }
} }
} }

View File

@ -5,12 +5,12 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool> <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile> <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Chris\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Rother\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.11.1</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.1</NuGetToolVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Chris\.nuget\packages\" /> <SourceRoot Include="C:\Users\Rother\.nuget\packages\" />
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" /> <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">

View File

@ -4562,29 +4562,31 @@
] ]
}, },
"packageFolders": { "packageFolders": {
"C:\\Users\\Chris\\.nuget\\packages\\": {}, "C:\\Users\\Rother\\.nuget\\packages\\": {},
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
}, },
"project": { "project": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj", "projectUniqueName": "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj",
"projectName": "WinFormsApp1", "projectName": "WinFormsApp1",
"projectPath": "C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj", "projectPath": "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\WinFormsApp1.csproj",
"packagesPath": "C:\\Users\\Chris\\.nuget\\packages\\", "packagesPath": "C:\\Users\\Rother\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Chris\\fork\\WinFormsApp1\\WinFormsApp1\\obj\\", "outputPath": "C:\\Users\\Rother\\fork\\WinFormsApp1\\WinFormsApp1\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"fallbackFolders": [ "fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
], ],
"configFilePaths": [ "configFilePaths": [
"C:\\Users\\Chris\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Users\\Rother\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config" "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
], ],
"originalTargetFrameworks": [ "originalTargetFrameworks": [
"net8.0-windows10.0.19041.0" "net8.0-windows10.0.19041.0"
], ],
"sources": { "sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"https://api.nuget.org/v3/index.json": {} "https://api.nuget.org/v3/index.json": {}
}, },
"frameworks": { "frameworks": {
@ -4602,7 +4604,8 @@
"enableAudit": "true", "enableAudit": "true",
"auditLevel": "low", "auditLevel": "low",
"auditMode": "direct" "auditMode": "direct"
} },
"SdkAnalysisLevel": "9.0.300"
}, },
"frameworks": { "frameworks": {
"net8.0-windows10.0.19041": { "net8.0-windows10.0.19041": {
@ -4687,21 +4690,21 @@
"downloadDependencies": [ "downloadDependencies": [
{ {
"name": "Microsoft.Windows.SDK.NET.Ref", "name": "Microsoft.Windows.SDK.NET.Ref",
"version": "[10.0.19041.56, 10.0.19041.56]" "version": "[10.0.19041.57, 10.0.19041.57]"
} }
], ],
"frameworkReferences": { "frameworkReferences": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"privateAssets": "all" "privateAssets": "all"
}, },
"Microsoft.Windows.SDK.NET.Ref": { "Microsoft.Windows.SDK.NET.Ref.Windows": {
"privateAssets": "all" "privateAssets": "all"
}, },
"Microsoft.WindowsDesktop.App.WindowsForms": { "Microsoft.WindowsDesktop.App.WindowsForms": {
"privateAssets": "none" "privateAssets": "none"
} }
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.408/PortableRuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.304/PortableRuntimeIdentifierGraph.json"
} }
} }
} }