diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..835f1cd --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +Graphe.cs diff --git a/.vs/PSI/FileContentIndex/01d3d43e-1712-4955-adfb-babc7fbebae8.vsidx b/.vs/PSI/FileContentIndex/01d3d43e-1712-4955-adfb-babc7fbebae8.vsidx new file mode 100644 index 0000000..581d0f1 Binary files /dev/null and b/.vs/PSI/FileContentIndex/01d3d43e-1712-4955-adfb-babc7fbebae8.vsidx differ diff --git a/.vs/PSI/FileContentIndex/0dbb051c-73e7-4815-a5ff-3cb044bf843c.vsidx b/.vs/PSI/FileContentIndex/0dbb051c-73e7-4815-a5ff-3cb044bf843c.vsidx new file mode 100644 index 0000000..1092e44 Binary files /dev/null and b/.vs/PSI/FileContentIndex/0dbb051c-73e7-4815-a5ff-3cb044bf843c.vsidx differ diff --git a/.vs/PSI/FileContentIndex/3b0ef2ae-d9ab-43f6-b49a-9e1a6e34ef20.vsidx b/.vs/PSI/FileContentIndex/3b0ef2ae-d9ab-43f6-b49a-9e1a6e34ef20.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/.vs/PSI/FileContentIndex/3b0ef2ae-d9ab-43f6-b49a-9e1a6e34ef20.vsidx differ diff --git a/.vs/PSI/FileContentIndex/7578c8e8-7fd0-4ac1-8ca5-b3e59c89a2ac.vsidx b/.vs/PSI/FileContentIndex/7578c8e8-7fd0-4ac1-8ca5-b3e59c89a2ac.vsidx new file mode 100644 index 0000000..dbdce49 Binary files /dev/null and b/.vs/PSI/FileContentIndex/7578c8e8-7fd0-4ac1-8ca5-b3e59c89a2ac.vsidx differ diff --git a/.vs/PSI/FileContentIndex/9b72f6d3-f1a5-48db-aa5b-93f7fa5c5ecf.vsidx b/.vs/PSI/FileContentIndex/9b72f6d3-f1a5-48db-aa5b-93f7fa5c5ecf.vsidx new file mode 100644 index 0000000..d6ef02f Binary files /dev/null and b/.vs/PSI/FileContentIndex/9b72f6d3-f1a5-48db-aa5b-93f7fa5c5ecf.vsidx differ diff --git a/.vs/PSI/FileContentIndex/b162abb5-4f12-4892-b177-e13f49dad44f.vsidx b/.vs/PSI/FileContentIndex/b162abb5-4f12-4892-b177-e13f49dad44f.vsidx new file mode 100644 index 0000000..9e2f1e8 Binary files /dev/null and b/.vs/PSI/FileContentIndex/b162abb5-4f12-4892-b177-e13f49dad44f.vsidx differ diff --git a/.vs/PSI/FileContentIndex/b9c7d4c8-699d-48c9-a6ce-7cbdf166a515.vsidx b/.vs/PSI/FileContentIndex/b9c7d4c8-699d-48c9-a6ce-7cbdf166a515.vsidx new file mode 100644 index 0000000..04c4775 Binary files /dev/null and b/.vs/PSI/FileContentIndex/b9c7d4c8-699d-48c9-a6ce-7cbdf166a515.vsidx differ diff --git a/.vs/PSI/v17/DocumentLayout.backup.json b/.vs/PSI/v17/DocumentLayout.backup.json index 9892de8..e0e4f05 100644 --- a/.vs/PSI/v17/DocumentLayout.backup.json +++ b/.vs/PSI/v17/DocumentLayout.backup.json @@ -1,22 +1,45 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\", + "WorkspaceRootPath": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\graphe.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\graphe.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:graphe.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { +<<<<<<< Updated upstream "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" +======= + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" +>>>>>>> Stashed changes }, { - "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\noeud.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\psi project perso.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:psi project perso.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\noeud.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:noeud.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -29,25 +52,87 @@ "SelectedChildIndex": 3, "Children": [ { +<<<<<<< Updated upstream +======= + "$type": "Bookmark", + "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Document", + "DocumentIndex": 6, + "Title": "Graph Form.cs [Design]", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs", + "RelativeDocumentMoniker": "Graph Form.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs [Design]", + "RelativeToolTip": "Graph Form.cs [Design]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-01T20:29:45.423Z", + "EditorCaption": " [Design]" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "PSI Project Perso.csproj", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "RelativeDocumentMoniker": "PSI Project Perso.csproj", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "RelativeToolTip": "PSI Project Perso.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAUAAAAoAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2025-03-01T19:14:29.953Z" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Graph Form.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs", + "RelativeDocumentMoniker": "Graph Form.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs", + "RelativeToolTip": "Graph Form.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAwAAAAJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-01T19:14:47.618Z", + "EditorCaption": "" + }, + { +>>>>>>> Stashed changes "$type": "Document", "DocumentIndex": 1, "Title": "Graphe.cs", - "DocumentMoniker": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Graphe.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graphe.cs", "RelativeDocumentMoniker": "Graphe.cs", - "ToolTip": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Graphe.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graphe.cs", "RelativeToolTip": "Graphe.cs", +<<<<<<< Updated upstream "ViewState": "AgIAANYAAAAAAAAAAAAQwK4AAAAdAAAAAAAAAA==", +======= + "ViewState": "AgIAAA8AAAAAAAAAAAAuwCAAAAAZAAAAAAAAAA==", +>>>>>>> Stashed changes "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-27T10:44:18.776Z", "EditorCaption": "" }, { +<<<<<<< Updated upstream "$type": "Bookmark", "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" +======= + "$type": "Document", + "DocumentIndex": 3, + "Title": "Program.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Program.cs", + "RelativeDocumentMoniker": "Program.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Program.cs", + "RelativeToolTip": "Program.cs", + "ViewState": "AgIAAB4AAAAAAAAAAAAiwCgAAAAdAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-01-23T20:48:56.763Z" +>>>>>>> Stashed changes }, { "$type": "Document", "DocumentIndex": 2, +<<<<<<< Updated upstream "Title": "Lien.cs", "DocumentMoniker": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Lien.cs", "RelativeDocumentMoniker": "Lien.cs", @@ -80,9 +165,52 @@ "ToolTip": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Noeud.cs", "RelativeToolTip": "Noeud.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABQAAAAJAAAAAAAAAA==", +======= + "Title": "Microsoft.NET.Sdk.DefaultItems.targets", + "DocumentMoniker": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "ToolTip": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "RelativeToolTip": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "ViewState": "AgIAAIAAAAAAAAAAAAAawJMAAAAEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003801|", + "WhenOpened": "2025-03-01T20:45:00.06Z" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Microsoft.PackageDependencyResolution.targets", + "DocumentMoniker": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "ToolTip": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "RelativeToolTip": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "ViewState": "AgIAAPYAAAAAAAAAAAAawAkBAAAEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003801|", + "WhenOpened": "2025-03-01T20:48:14.423Z" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "Lien.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Lien.cs", + "RelativeDocumentMoniker": "Lien.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Lien.cs", + "RelativeToolTip": "Lien.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAAkAAAAAAAAAA==", +>>>>>>> Stashed changes "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-26T20:06:40.729Z", - "EditorCaption": "" + "WhenOpened": "2025-02-27T11:04:22.051Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "Noeud.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Noeud.cs", + "RelativeDocumentMoniker": "Noeud.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Noeud.cs", + "RelativeToolTip": "Noeud.cs", + "ViewState": "AgIAAAMAAAAAAAAAAAAAABEAAAAmAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T20:06:40.729Z" } ] } diff --git a/.vs/PSI/v17/DocumentLayout.json b/.vs/PSI/v17/DocumentLayout.json index 9892de8..520b94d 100644 --- a/.vs/PSI/v17/DocumentLayout.json +++ b/.vs/PSI/v17/DocumentLayout.json @@ -1,22 +1,45 @@ { "Version": 1, - "WorkspaceRootPath": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\", + "WorkspaceRootPath": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\graphe.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\graphe.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:graphe.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { +<<<<<<< Updated upstream "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" +======= + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" +>>>>>>> Stashed changes }, { - "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\xuanqi\\documents\\github\\psi\\noeud.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\psi project perso.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:psi project perso.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:graph form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}|Form" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\noeud.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:noeud.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|c:\\users\\comew\\onedrive\\documents\\github\\psi\\lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{576221AB-A018-9E6C-04A1-6B1531DA2EE2}|PSI Project Perso.csproj|solutionrelative:lien.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -28,26 +51,88 @@ "DockedWidth": 200, "SelectedChildIndex": 3, "Children": [ + { + "$type": "Bookmark", + "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}" + }, + { + "$type": "Document", +<<<<<<< Updated upstream +======= + "DocumentIndex": 6, + "Title": "Graph Form.cs [Design]", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs", + "RelativeDocumentMoniker": "Graph Form.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs [Design]", + "RelativeToolTip": "Graph Form.cs [Design]", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-01T20:29:45.423Z", + "EditorCaption": " [Design]" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "PSI Project Perso.csproj", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "RelativeDocumentMoniker": "PSI Project Perso.csproj", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "RelativeToolTip": "PSI Project Perso.csproj", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAUAAAAoAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", + "WhenOpened": "2025-03-01T19:14:29.953Z" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "Graph Form.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs", + "RelativeDocumentMoniker": "Graph Form.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graph Form.cs", + "RelativeToolTip": "Graph Form.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-01T19:14:47.618Z", + "EditorCaption": "" + }, { "$type": "Document", +>>>>>>> Stashed changes "DocumentIndex": 1, "Title": "Graphe.cs", - "DocumentMoniker": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Graphe.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graphe.cs", "RelativeDocumentMoniker": "Graphe.cs", - "ToolTip": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Graphe.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Graphe.cs", "RelativeToolTip": "Graphe.cs", +<<<<<<< Updated upstream "ViewState": "AgIAANYAAAAAAAAAAAAQwK4AAAAdAAAAAAAAAA==", +======= + "ViewState": "AgIAAA8AAAAAAAAAAAAuwCAAAAAZAAAAAAAAAA==", +>>>>>>> Stashed changes "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-02-27T10:44:18.776Z", "EditorCaption": "" }, { +<<<<<<< Updated upstream "$type": "Bookmark", "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" +======= + "$type": "Document", + "DocumentIndex": 3, + "Title": "Program.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Program.cs", + "RelativeDocumentMoniker": "Program.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Program.cs", + "RelativeToolTip": "Program.cs", + "ViewState": "AgIAAB4AAAAAAAAAAAAiwCgAAAAdAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-01-23T20:48:56.763Z" +>>>>>>> Stashed changes }, { "$type": "Document", "DocumentIndex": 2, +<<<<<<< Updated upstream "Title": "Lien.cs", "DocumentMoniker": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Lien.cs", "RelativeDocumentMoniker": "Lien.cs", @@ -80,9 +165,52 @@ "ToolTip": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\Noeud.cs", "RelativeToolTip": "Noeud.cs", "ViewState": "AgIAAAAAAAAAAAAAAAAAABQAAAAJAAAAAAAAAA==", +======= + "Title": "Microsoft.NET.Sdk.DefaultItems.targets", + "DocumentMoniker": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "ToolTip": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "RelativeToolTip": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.NET.Sdk.DefaultItems.targets", + "ViewState": "AgIAAIAAAAAAAAAAAAAawJMAAAAEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003801|", + "WhenOpened": "2025-03-01T20:45:00.06Z" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Microsoft.PackageDependencyResolution.targets", + "DocumentMoniker": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "RelativeDocumentMoniker": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "ToolTip": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "RelativeToolTip": "..\\..\\..\\..\\..\\..\\Program Files\\dotnet\\sdk\\9.0.101\\Sdks\\Microsoft.NET.Sdk\\targets\\Microsoft.PackageDependencyResolution.targets", + "ViewState": "AgIAAPYAAAAAAAAAAAAawAkBAAAEAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003801|", + "WhenOpened": "2025-03-01T20:48:14.423Z" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "Lien.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Lien.cs", + "RelativeDocumentMoniker": "Lien.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Lien.cs", + "RelativeToolTip": "Lien.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAQAAAAkAAAAAAAAAA==", +>>>>>>> Stashed changes "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-02-26T20:06:40.729Z", - "EditorCaption": "" + "WhenOpened": "2025-02-27T11:04:22.051Z" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "Noeud.cs", + "DocumentMoniker": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Noeud.cs", + "RelativeDocumentMoniker": "Noeud.cs", + "ToolTip": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\Noeud.cs", + "RelativeToolTip": "Noeud.cs", + "ViewState": "AgIAAAMAAAAAAAAAAAAAABEAAAAmAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-02-26T20:06:40.729Z" } ] } diff --git a/.vs/ProjectEvaluation/psi.strings.v9.bin b/.vs/ProjectEvaluation/psi.strings.v9.bin index b47ac5e..332a0ff 100644 Binary files a/.vs/ProjectEvaluation/psi.strings.v9.bin and b/.vs/ProjectEvaluation/psi.strings.v9.bin differ diff --git a/Graph Form.cs b/Graph Form.cs new file mode 100644 index 0000000..940570d --- /dev/null +++ b/Graph Form.cs @@ -0,0 +1,74 @@ +namespace PSI_Project_Perso +{ + using System; + using System.Drawing; + using System.Windows.Forms; + public class GraphForm : Form + { + private Graphe graph; + private Dictionary nodePositions; + private Random rnd; + + public GraphForm(Graphe graph) + { + + this.graph = graph; + if (graph.GetNoeuds() == null || graph.GetLiens() == null) + { + MessageBox.Show("Graph data is null! Check the initialization."); + return; + } + this.Text = "Graph Visualization"; + this.Size = new Size(600, 600); + this.Paint += new PaintEventHandler(GraphForm_Paint); + this.rnd = new Random(); + this.nodePositions = new Dictionary(); + + AssignRandomPositions(); + } + + private void AssignRandomPositions() + { + foreach (var noeud in graph.GetNoeuds()) + { + int x = rnd.Next(50, 550); + int y = rnd.Next(50, 550); + nodePositions[noeud.Id] = new Point(x, y); + } + } + + private void GraphForm_Paint(object sender, PaintEventArgs e) + { + Graphics g = e.Graphics; + Pen edgePen = new Pen(Color.Black, 2); + Font font = new Font("Arial", 12); + Brush brushBlanc = Brushes.Blue; + Brush brushJaune = Brushes.Yellow; + Brush brushRouge = Brushes.Red; + + // Draw edges + foreach (Lien lien in graph.GetLiens()) + { + Point p1 = nodePositions[lien.Noeud1.Id]; + Point p2 = nodePositions[lien.Noeud2.Id]; + g.DrawLine(edgePen, p1, p2); + } + + // Draw nodes + foreach (Noeud noeud in graph.GetNoeuds()) + { + Point p = nodePositions[noeud.Id]; + Brush nodeBrush = noeud.Couleur switch + { + "jaune" => brushJaune, + "rouge" => brushRouge, + _ => brushBlanc, + }; + + g.FillEllipse(nodeBrush, p.X - 15, p.Y - 15, 30, 30); + g.DrawString(noeud.Id.ToString(), font, Brushes.White, p.X - 7, p.Y - 7); + } + } + } + +} diff --git a/Graph Form.resx b/Graph Form.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Graph Form.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Graphe.cs b/Graphe.cs index ee0544f..df69997 100644 --- a/Graphe.cs +++ b/Graphe.cs @@ -8,7 +8,7 @@ /* namespace PSI_Project_Perso { - class Graphe + public class Graphe { private int[,] adjMatrix; private int nbNoeuds; @@ -40,7 +40,55 @@ public Graphe(int[,] matrix) // 1. DFS 遍历(带访问顺序 & 环检测) public void DFS_Main() { +<<<<<<< Updated upstream foreach (var i in Enumerable.Range(1, nbNoeuds - 1)) +======= + int nbNoeuds = 0; + + // Find the highest node ID in edges + foreach (var edge in edges) + { + nbNoeuds = Math.Max(nbNoeuds, Math.Max(edge.Item1, edge.Item2)); + } + + Matrice_Adj = new int[nbNoeuds + 1, nbNoeuds + 1]; + + + noeuds = new List(); + + // Fill the list with non-null nodes from 0 to nbNoeuds + for (int i = 0; i <= nbNoeuds; i++) + { + noeuds.Add(new Noeud(i)); + } + + + liens = new List(); + + // Create nodes + for (int i = 1; i <= nbNoeuds; i++) // Start from 1 to avoid Node 0 issue + { + noeuds[i] = new Noeud(i); // Avoid "Index out of range" + } + + // Create edges + foreach (var (noeud1, noeud2) in edges) + { + // Ensure nodes exist before using them + if (noeud1 >= noeuds.Count) noeuds.Add(new Noeud(noeud1)); + if (noeud2 >= noeuds.Count) noeuds.Add(new Noeud(noeud2)); + + Matrice_Adj[noeud1, noeud2] = 1; + Matrice_Adj[noeud2, noeud1] = 1; + + noeuds[noeud1].Rajouter(noeud2); + noeuds[noeud2].Rajouter(noeud1); + + liens.Add(new Lien(noeuds[noeud1], noeuds[noeud2])); + } + /*int nbNoeuds = 0; + for (int i = 0; i < edges.Count; i++) +>>>>>>> Stashed changes { couleur[i] = "blanc"; pred[i] = null; @@ -53,9 +101,40 @@ public void DFS_Main() hasCycle = false; connectedComponents = 0; +<<<<<<< Updated upstream foreach (var i in Enumerable.Range(1, nbNoeuds - 1)) { if (couleur[i] == "blanc") +======= + for (int i = 1; i <= nbNoeuds; i++) + { + noeuds.Add(new Noeud(i)); + } + + for (int i = 0; i < edges.Count; i++) + { + int noeud1 = edges[i].Item1; + int noeud2 = edges[i].Item2; + + Matrice_Adj[noeud1, noeud2] = 1; + Matrice_Adj[noeud2, noeud1] = 1; + + // Relation de voisin + noeuds[noeud1].Rajouter(noeud2); + noeuds[noeud2].Rajouter(noeud1); + + liens.Add(new Lien(noeuds[noeud1], noeuds[noeud2])); + }*/ + + } + + public void PrintAdjMatrix() + { + Console.WriteLine("\nMatrice d'adjacence:"); + for (int i = 1; i < Matrice_Adj.GetLength(0); i++) + { + for (int j = 1; j < Matrice_Adj.GetLength(1); j++) +>>>>>>> Stashed changes { connectedComponents++; // 发现一个新的连通分量 DFS_Rec(i, -1); @@ -94,7 +173,12 @@ public void PrintDFSResults() Console.WriteLine("Noeud | Début | Fin | Prédécesseur"); foreach (var i in Enumerable.Range(1, nbNoeuds - 1)) { +<<<<<<< Updated upstream Console.WriteLine($"{i} | {dateDec[i]} | {dateFin[i]} | {pred[i] ?? -1}"); +======= + if (noeud != null) + noeud.Couleur = "blanc"; // ✅ Avoids null exception +>>>>>>> Stashed changes } Console.WriteLine("\nOrdre de visite (DFS) : " + string.Join(" -> ", dfsOrder)); } @@ -155,11 +239,21 @@ public bool HasCycle() { return hasCycle; } + internal List GetNoeuds() + { + return noeuds; + } +<<<<<<< Updated upstream // 5. 计算连通分量个数 public int ConnectedComponents() { return connectedComponents; +======= + internal List GetLiens() + { + return liens; +>>>>>>> Stashed changes } } } diff --git a/Noeud.cs b/Noeud.cs index 920dba3..08cd6a6 100644 --- a/Noeud.cs +++ b/Noeud.cs @@ -10,14 +10,20 @@ internal class Noeud public int DateDec; // 发现时间 public int DateFin; // 完成时间 + public int X { get; set; } + public int Y { get; set; } + public Noeud(int id) { + Random rnd = new Random(); Id = id; Voisins = new List(); Couleur = "blanc"; Pred = null; DateDec = int.MaxValue; DateFin = int.MaxValue; + X = rnd.Next(50, 350); + Y = rnd.Next(50, 350); } public void Rajouter(int voisin) diff --git a/PSI Project Perso.csproj b/PSI Project Perso.csproj index 28e9db2..aa557a6 100644 --- a/PSI Project Perso.csproj +++ b/PSI Project Perso.csproj @@ -1,8 +1,9 @@ - + - Exe - net8.0 + WinExe + net8.0-windows + true PSI_Project_Perso enable enable diff --git a/PSI Project Perso.csproj.user b/PSI Project Perso.csproj.user new file mode 100644 index 0000000..db3cd84 --- /dev/null +++ b/PSI Project Perso.csproj.user @@ -0,0 +1,9 @@ + + + + + + Form + + + \ No newline at end of file diff --git a/Program.cs b/Program.cs index 29969e1..80b33d1 100644 --- a/Program.cs +++ b/Program.cs @@ -111,6 +111,7 @@ static void Main() graph.PrintDFSResults(); +<<<<<<< Updated upstream Console.WriteLine("\n Graph est connecté ? " + (graph.IsConnected() ? "Oui" : "Non")); Console.WriteLine("\n Le graph contient un cycle ? " + (graph.HasCycle() ? "Oui" : "Non")); Console.WriteLine("\n Nombre de composants connexes: " + graph.ConnectedComponents()); @@ -126,6 +127,27 @@ static void Main() int[,] dBTable = new int[2, 78]; int indice = 0; using (StreamReader sr = new StreamReader("soc-karate.mtx")) +======= + // 执行 BFS 并输出访问顺序 + Console.WriteLine("\nExécution de BFS depuis le sommet 1:"); + List bfsOrder = graph.BFS(1); + graph.PrintBFSOrder(bfsOrder); + + Application.EnableVisualStyles(); + Application.SetCompatibleTextRenderingDefault(false); + + Application.Run(new GraphForm(graph)); + } + + /// + /// 读取数据文件并转换为边的列表 ez + /// + static List<(int, int)> ReadEdgesFromFile(string filePath) + { + List<(int, int)> edges = new List<(int, int)>(); + + using (StreamReader sr = new StreamReader(filePath)) +>>>>>>> Stashed changes { string data; while ((data = sr.ReadLine()) != null) diff --git a/bin/Debug/net8.0-windows/PSI Project Perso.deps.json b/bin/Debug/net8.0-windows/PSI Project Perso.deps.json new file mode 100644 index 0000000..4ae3f6c --- /dev/null +++ b/bin/Debug/net8.0-windows/PSI Project Perso.deps.json @@ -0,0 +1,23 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "PSI Project Perso/1.0.0": { + "runtime": { + "PSI Project Perso.dll": {} + } + } + } + }, + "libraries": { + "PSI Project Perso/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/bin/Debug/net8.0-windows/PSI Project Perso.dll b/bin/Debug/net8.0-windows/PSI Project Perso.dll new file mode 100644 index 0000000..bd129a4 Binary files /dev/null and b/bin/Debug/net8.0-windows/PSI Project Perso.dll differ diff --git a/bin/Debug/net8.0-windows/PSI Project Perso.exe b/bin/Debug/net8.0-windows/PSI Project Perso.exe new file mode 100644 index 0000000..aeb6214 Binary files /dev/null and b/bin/Debug/net8.0-windows/PSI Project Perso.exe differ diff --git a/bin/Debug/net8.0-windows/PSI Project Perso.pdb b/bin/Debug/net8.0-windows/PSI Project Perso.pdb new file mode 100644 index 0000000..96a63cb Binary files /dev/null and b/bin/Debug/net8.0-windows/PSI Project Perso.pdb differ diff --git a/bin/Debug/net8.0-windows/PSI Project Perso.runtimeconfig.json b/bin/Debug/net8.0-windows/PSI Project Perso.runtimeconfig.json new file mode 100644 index 0000000..b2dedf3 --- /dev/null +++ b/bin/Debug/net8.0-windows/PSI Project Perso.runtimeconfig.json @@ -0,0 +1,19 @@ +{ + "runtimeOptions": { + "tfm": "net8.0", + "frameworks": [ + { + "name": "Microsoft.NETCore.App", + "version": "8.0.0" + }, + { + "name": "Microsoft.WindowsDesktop.App", + "version": "8.0.0" + } + ], + "configProperties": { + "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": true, + "CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS": false + } + } +} \ No newline at end of file diff --git a/soc-karate.mtx b/bin/Debug/net8.0-windows/soc-karate.mtx similarity index 100% rename from soc-karate.mtx rename to bin/Debug/net8.0-windows/soc-karate.mtx diff --git a/obj/Debug/net8.0-windows/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/obj/Debug/net8.0-windows/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/obj/Debug/net8.0-windows/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.AssemblyInfo.cs b/obj/Debug/net8.0-windows/PSI Project Perso.AssemblyInfo.cs new file mode 100644 index 0000000..594f916 --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.AssemblyInfo.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("PSI Project Perso")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f033a303c684acd7ce33a65bc1920993133f6b84")] +[assembly: System.Reflection.AssemblyProductAttribute("PSI Project Perso")] +[assembly: System.Reflection.AssemblyTitleAttribute("PSI Project Perso")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] +[assembly: System.Runtime.Versioning.TargetPlatformAttribute("Windows7.0")] +[assembly: System.Runtime.Versioning.SupportedOSPlatformAttribute("Windows7.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.AssemblyInfoInputs.cache b/obj/Debug/net8.0-windows/PSI Project Perso.AssemblyInfoInputs.cache new file mode 100644 index 0000000..ff52391 --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +e7d63096a6ca32d612137b3b34a8152d178daa41110978d6c1ba5709ebb34a72 diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net8.0-windows/PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..eaf7429 --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,22 @@ +is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = +build_property.TargetFramework = net8.0-windows +build_property.TargetPlatformMinVersion = 7.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = PSI_Project_Perso +build_property.ProjectDir = C:\Users\comew\OneDrive\Documents\GitHub\PSI\ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.CsWinRTUseWindowsUIXamlProjections = false +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.GlobalUsings.g.cs b/obj/Debug/net8.0-windows/PSI Project Perso.GlobalUsings.g.cs new file mode 100644 index 0000000..84bbb89 --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.GlobalUsings.g.cs @@ -0,0 +1,10 @@ +// +global using global::System; +global using global::System.Collections.Generic; +global using global::System.Drawing; +global using global::System.IO; +global using global::System.Linq; +global using global::System.Net.Http; +global using global::System.Threading; +global using global::System.Threading.Tasks; +global using global::System.Windows.Forms; diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.assets.cache b/obj/Debug/net8.0-windows/PSI Project Perso.assets.cache new file mode 100644 index 0000000..23f6e63 Binary files /dev/null and b/obj/Debug/net8.0-windows/PSI Project Perso.assets.cache differ diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.csproj.BuildWithSkipAnalyzers b/obj/Debug/net8.0-windows/PSI Project Perso.csproj.BuildWithSkipAnalyzers new file mode 100644 index 0000000..e69de29 diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.csproj.CoreCompileInputs.cache b/obj/Debug/net8.0-windows/PSI Project Perso.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..4c25ced --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +3cb1c1e44d27e1c700d5908823f7ed6e59c17b70b0cfa409f363557066d2823e diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.csproj.FileListAbsolute.txt b/obj/Debug/net8.0-windows/PSI Project Perso.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..64da970 --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.csproj.FileListAbsolute.txt @@ -0,0 +1,17 @@ +C:\Users\comew\OneDrive\Documents\GitHub\PSI\bin\Debug\net8.0-windows\PSI Project Perso.exe +C:\Users\comew\OneDrive\Documents\GitHub\PSI\bin\Debug\net8.0-windows\PSI Project Perso.deps.json +C:\Users\comew\OneDrive\Documents\GitHub\PSI\bin\Debug\net8.0-windows\PSI Project Perso.runtimeconfig.json +C:\Users\comew\OneDrive\Documents\GitHub\PSI\bin\Debug\net8.0-windows\PSI Project Perso.dll +C:\Users\comew\OneDrive\Documents\GitHub\PSI\bin\Debug\net8.0-windows\PSI Project Perso.pdb +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI_Project_Perso.GraphForm.resources +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.csproj.GenerateResource.cache +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.AssemblyInfoInputs.cache +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.AssemblyInfo.cs +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.csproj.CoreCompileInputs.cache +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.sourcelink.json +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.dll +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\refint\PSI Project Perso.dll +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.pdb +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\PSI Project Perso.genruntimeconfig.cache +C:\Users\comew\OneDrive\Documents\GitHub\PSI\obj\Debug\net8.0-windows\ref\PSI Project Perso.dll diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.csproj.GenerateResource.cache b/obj/Debug/net8.0-windows/PSI Project Perso.csproj.GenerateResource.cache new file mode 100644 index 0000000..2154e16 Binary files /dev/null and b/obj/Debug/net8.0-windows/PSI Project Perso.csproj.GenerateResource.cache differ diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.designer.deps.json b/obj/Debug/net8.0-windows/PSI Project Perso.designer.deps.json new file mode 100644 index 0000000..8599efd --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.designer.deps.json @@ -0,0 +1,11 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": {} + }, + "libraries": {} +} \ No newline at end of file diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.designer.runtimeconfig.json b/obj/Debug/net8.0-windows/PSI Project Perso.designer.runtimeconfig.json new file mode 100644 index 0000000..b5d074b --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.designer.runtimeconfig.json @@ -0,0 +1,25 @@ +{ + "runtimeOptions": { + "tfm": "net8.0", + "frameworks": [ + { + "name": "Microsoft.NETCore.App", + "version": "8.0.0" + }, + { + "name": "Microsoft.WindowsDesktop.App", + "version": "8.0.0" + } + ], + "additionalProbingPaths": [ + "C:\\Users\\comew\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\comew\\.nuget\\packages", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configProperties": { + "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": true, + "CSWINRT_USE_WINDOWS_UI_XAML_PROJECTIONS": false, + "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true + } + } +} \ No newline at end of file diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.dll b/obj/Debug/net8.0-windows/PSI Project Perso.dll new file mode 100644 index 0000000..bd129a4 Binary files /dev/null and b/obj/Debug/net8.0-windows/PSI Project Perso.dll differ diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.genruntimeconfig.cache b/obj/Debug/net8.0-windows/PSI Project Perso.genruntimeconfig.cache new file mode 100644 index 0000000..3b68b95 --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.genruntimeconfig.cache @@ -0,0 +1 @@ +57901ae98e0096445338a1197402518255849fe8a4112f18e77d82812cce2c10 diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.pdb b/obj/Debug/net8.0-windows/PSI Project Perso.pdb new file mode 100644 index 0000000..96a63cb Binary files /dev/null and b/obj/Debug/net8.0-windows/PSI Project Perso.pdb differ diff --git a/obj/Debug/net8.0-windows/PSI Project Perso.sourcelink.json b/obj/Debug/net8.0-windows/PSI Project Perso.sourcelink.json new file mode 100644 index 0000000..1b8835d --- /dev/null +++ b/obj/Debug/net8.0-windows/PSI Project Perso.sourcelink.json @@ -0,0 +1 @@ +{"documents":{"C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\*":"https://raw.githubusercontent.com/Come404/PSI/f033a303c684acd7ce33a65bc1920993133f6b84/*"}} \ No newline at end of file diff --git a/obj/Debug/net8.0-windows/PSI_Project_Perso.GraphForm.resources b/obj/Debug/net8.0-windows/PSI_Project_Perso.GraphForm.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/obj/Debug/net8.0-windows/PSI_Project_Perso.GraphForm.resources differ diff --git a/obj/Debug/net8.0-windows/apphost.exe b/obj/Debug/net8.0-windows/apphost.exe new file mode 100644 index 0000000..aeb6214 Binary files /dev/null and b/obj/Debug/net8.0-windows/apphost.exe differ diff --git a/obj/Debug/net8.0-windows/ref/PSI Project Perso.dll b/obj/Debug/net8.0-windows/ref/PSI Project Perso.dll new file mode 100644 index 0000000..5749da6 Binary files /dev/null and b/obj/Debug/net8.0-windows/ref/PSI Project Perso.dll differ diff --git a/obj/Debug/net8.0-windows/refint/PSI Project Perso.dll b/obj/Debug/net8.0-windows/refint/PSI Project Perso.dll new file mode 100644 index 0000000..5749da6 Binary files /dev/null and b/obj/Debug/net8.0-windows/refint/PSI Project Perso.dll differ diff --git a/obj/Debug/net8.0/PSI Project Perso.AssemblyInfo.cs b/obj/Debug/net8.0/PSI Project Perso.AssemblyInfo.cs index dd670da..78fb325 100644 --- a/obj/Debug/net8.0/PSI Project Perso.AssemblyInfo.cs +++ b/obj/Debug/net8.0/PSI Project Perso.AssemblyInfo.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// 对此文件的更改可能会导致不正确的行为,并且如果 -// 重新生成代码,这些更改将会丢失。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -14,10 +14,14 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("PSI Project Perso")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +<<<<<<< Updated upstream [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+7208428287916389fc7e4ba87a9c2efc692566a1")] +======= +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f033a303c684acd7ce33a65bc1920993133f6b84")] +>>>>>>> Stashed changes [assembly: System.Reflection.AssemblyProductAttribute("PSI Project Perso")] [assembly: System.Reflection.AssemblyTitleAttribute("PSI Project Perso")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -// 由 MSBuild WriteCodeFragment 类生成。 +// Generated by the MSBuild WriteCodeFragment class. diff --git a/obj/Debug/net8.0/PSI Project Perso.AssemblyInfoInputs.cache b/obj/Debug/net8.0/PSI Project Perso.AssemblyInfoInputs.cache index a0a68e4..9f33374 100644 --- a/obj/Debug/net8.0/PSI Project Perso.AssemblyInfoInputs.cache +++ b/obj/Debug/net8.0/PSI Project Perso.AssemblyInfoInputs.cache @@ -1 +1,5 @@ +<<<<<<< Updated upstream caa4b4339f224d8d938026388c33eaeda0a244a810f6adac0bc0cecbf5eaa73c +======= +9c01ad7a8e6c67403f60606fc7ae0d953c5d6fa90fc58fcdb540c6bf777d9dc4 +>>>>>>> Stashed changes diff --git a/obj/Debug/net8.0/PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net8.0/PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig index 0f9e1b1..e3b6c01 100644 --- a/obj/Debug/net8.0/PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig +++ b/obj/Debug/net8.0/PSI Project Perso.GeneratedMSBuildEditorConfig.editorconfig @@ -1,4 +1,10 @@ is_global = true +build_property.ApplicationManifest = +build_property.StartupObject = +build_property.ApplicationDefaultFont = +build_property.ApplicationHighDpiMode = +build_property.ApplicationUseCompatibleTextRendering = +build_property.ApplicationVisualStyles = build_property.TargetFramework = net8.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = @@ -8,6 +14,8 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = PSI_Project_Perso -build_property.ProjectDir = C:\Users\Xuanqi\Documents\GitHub\PSI\ +build_property.ProjectDir = C:\Users\comew\OneDrive\Documents\GitHub\PSI\ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/obj/Debug/net8.0/PSI Project Perso.GlobalUsings.g.cs b/obj/Debug/net8.0/PSI Project Perso.GlobalUsings.g.cs index 8578f3d..84bbb89 100644 --- a/obj/Debug/net8.0/PSI Project Perso.GlobalUsings.g.cs +++ b/obj/Debug/net8.0/PSI Project Perso.GlobalUsings.g.cs @@ -1,8 +1,10 @@ // global using global::System; global using global::System.Collections.Generic; +global using global::System.Drawing; global using global::System.IO; global using global::System.Linq; global using global::System.Net.Http; global using global::System.Threading; global using global::System.Threading.Tasks; +global using global::System.Windows.Forms; diff --git a/obj/Debug/net8.0/PSI Project Perso.assets.cache b/obj/Debug/net8.0/PSI Project Perso.assets.cache index 3a64a2c..0a41942 100644 Binary files a/obj/Debug/net8.0/PSI Project Perso.assets.cache and b/obj/Debug/net8.0/PSI Project Perso.assets.cache differ diff --git a/obj/Debug/net8.0/PSI Project Perso.csproj.CoreCompileInputs.cache b/obj/Debug/net8.0/PSI Project Perso.csproj.CoreCompileInputs.cache index 291ecae..48f9a27 100644 --- a/obj/Debug/net8.0/PSI Project Perso.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net8.0/PSI Project Perso.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -84c5f22cb5f89cd4b1e106739a71c993231b05aa6bf3a14ee22b578d4163f2c0 +7b00f174debbf95bdb2b94f0a3da46e3b5b2da4e7a0982046aca654cc21a7277 diff --git a/obj/Debug/net8.0/PSI Project Perso.designer.deps.json b/obj/Debug/net8.0/PSI Project Perso.designer.deps.json new file mode 100644 index 0000000..8599efd --- /dev/null +++ b/obj/Debug/net8.0/PSI Project Perso.designer.deps.json @@ -0,0 +1,11 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": {} + }, + "libraries": {} +} \ No newline at end of file diff --git a/obj/Debug/net8.0/PSI Project Perso.designer.runtimeconfig.json b/obj/Debug/net8.0/PSI Project Perso.designer.runtimeconfig.json new file mode 100644 index 0000000..c593d63 --- /dev/null +++ b/obj/Debug/net8.0/PSI Project Perso.designer.runtimeconfig.json @@ -0,0 +1,24 @@ +{ + "runtimeOptions": { + "tfm": "net8.0", + "frameworks": [ + { + "name": "Microsoft.NETCore.App", + "version": "8.0.0" + }, + { + "name": "Microsoft.WindowsDesktop.App", + "version": "8.0.0" + } + ], + "additionalProbingPaths": [ + "C:\\Users\\comew\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\comew\\.nuget\\packages", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configProperties": { + "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": true, + "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true + } + } +} \ No newline at end of file diff --git a/obj/Debug/net8.0/PSI Project Perso.genruntimeconfig.cache b/obj/Debug/net8.0/PSI Project Perso.genruntimeconfig.cache index 5dfe59e..cc3fac9 100644 --- a/obj/Debug/net8.0/PSI Project Perso.genruntimeconfig.cache +++ b/obj/Debug/net8.0/PSI Project Perso.genruntimeconfig.cache @@ -1 +1 @@ -5af764ffc145ae7b271cccb860a9c6d296be4973edfbc3a6c85e1f660dadeefd +f8c4262bf37b0ec1ee51a6eb4f36cdb6860ed59a7b1a97cf0c079da1d2d2c448 diff --git a/obj/Debug/net8.0/PSI Project Perso.sourcelink.json b/obj/Debug/net8.0/PSI Project Perso.sourcelink.json index c68b0fe..f94e01d 100644 --- a/obj/Debug/net8.0/PSI Project Perso.sourcelink.json +++ b/obj/Debug/net8.0/PSI Project Perso.sourcelink.json @@ -1 +1,5 @@ -{"documents":{"C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\*":"https://raw.githubusercontent.com/Come404/PSI/7208428287916389fc7e4ba87a9c2efc692566a1/*"}} \ No newline at end of file +<<<<<<< Updated upstream +{"documents":{"C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\*":"https://raw.githubusercontent.com/Come404/PSI/7208428287916389fc7e4ba87a9c2efc692566a1/*"}} +======= +{"documents":{"C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\*":"https://raw.githubusercontent.com/Come404/PSI/f033a303c684acd7ce33a65bc1920993133f6b84/*"}} +>>>>>>> Stashed changes diff --git a/obj/PSI Project Perso.csproj.nuget.dgspec.json b/obj/PSI Project Perso.csproj.nuget.dgspec.json index 68b368d..15b061d 100644 --- a/obj/PSI Project Perso.csproj.nuget.dgspec.json +++ b/obj/PSI Project Perso.csproj.nuget.dgspec.json @@ -1,32 +1,36 @@ { "format": 1, "restore": { - "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj": {} + "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj": {} }, "projects": { - "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj": { + "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "projectUniqueName": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", "projectName": "PSI Project Perso", - "projectPath": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", - "packagesPath": "C:\\Users\\Xuanqi\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\obj\\", + "projectPath": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "packagesPath": "C:\\Users\\comew\\.nuget\\packages\\", + "outputPath": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ - "C:\\Users\\Xuanqi\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\comew\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ - "net8.0" + "net8.0-windows" ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net8.0": { - "targetAlias": "net8.0", + "net8.0-windows7.0": { + "targetAlias": "net8.0-windows", "projectReferences": {} } }, @@ -39,11 +43,12 @@ "enableAudit": "true", "auditLevel": "low", "auditMode": "direct" - } + }, + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { - "net8.0": { - "targetAlias": "net8.0", + "net8.0-windows7.0": { + "targetAlias": "net8.0-windows", "imports": [ "net461", "net462", @@ -58,9 +63,12 @@ "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" + }, + "Microsoft.WindowsDesktop.App.WindowsForms": { + "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101/PortableRuntimeIdentifierGraph.json" } } } diff --git a/obj/PSI Project Perso.csproj.nuget.g.props b/obj/PSI Project Perso.csproj.nuget.g.props index efebac9..a1810ef 100644 --- a/obj/PSI Project Perso.csproj.nuget.g.props +++ b/obj/PSI Project Perso.csproj.nuget.g.props @@ -5,11 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Xuanqi\.nuget\packages\ + C:\Users\comew\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages PackageReference - 6.11.0 + 6.12.2 - + + \ No newline at end of file diff --git a/obj/project.assets.json b/obj/project.assets.json index 84e32fa..079bf9f 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -1,38 +1,43 @@ { "version": 3, "targets": { - "net8.0": {} + "net8.0-windows7.0": {} }, "libraries": {}, "projectFileDependencyGroups": { - "net8.0": [] + "net8.0-windows7.0": [] }, "packageFolders": { - "C:\\Users\\Xuanqi\\.nuget\\packages\\": {} + "C:\\Users\\comew\\.nuget\\packages\\": {}, + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "projectUniqueName": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", "projectName": "PSI Project Perso", - "projectPath": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", - "packagesPath": "C:\\Users\\Xuanqi\\.nuget\\packages\\", - "outputPath": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\obj\\", + "projectPath": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "packagesPath": "C:\\Users\\comew\\.nuget\\packages\\", + "outputPath": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\obj\\", "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], "configFilePaths": [ - "C:\\Users\\Xuanqi\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\comew\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], "originalTargetFrameworks": [ - "net8.0" + "net8.0-windows" ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net8.0": { - "targetAlias": "net8.0", + "net8.0-windows7.0": { + "targetAlias": "net8.0-windows", "projectReferences": {} } }, @@ -45,11 +50,12 @@ "enableAudit": "true", "auditLevel": "low", "auditMode": "direct" - } + }, + "SdkAnalysisLevel": "9.0.100" }, "frameworks": { - "net8.0": { - "targetAlias": "net8.0", + "net8.0-windows7.0": { + "targetAlias": "net8.0-windows", "imports": [ "net461", "net462", @@ -64,9 +70,12 @@ "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" + }, + "Microsoft.WindowsDesktop.App.WindowsForms": { + "privateAssets": "none" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.400/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101/PortableRuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index 13cc6b9..deea83a 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "kfxSUEDR6JE=", + "dgSpecHash": "fbsdC04PS5o=", "success": true, - "projectFilePath": "C:\\Users\\Xuanqi\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", + "projectFilePath": "C:\\Users\\comew\\OneDrive\\Documents\\GitHub\\PSI\\PSI Project Perso.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file