PBS2H23AMA/PMC_Projekt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.bib.de/PBS2H23AMA/PMC_Projekt

Browse Source 
# Conflicts:
#	PMCProjekt/.vs/PMCProjekt/v17/.suo
#	PMCProjekt/.vs/PMCProjekt/v17/DocumentLayout.json
#	PMCProjekt/PMCProjekt/Program.cs
#	PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.AssemblyInfo.cs
#	PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.AssemblyInfoInputs.cache
This commit is contained in:
Philipp Morasch 2024-06-14 10:55:31 +02:00
parent f3c6c19991
commit 6e07e4dea0
9 changed files with 18 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PMCProjekt/.vs/PMCProjekt/v17/.suo
View File

Binary file not shown.

47
PMCProjekt/.vs/PMCProjekt/v17/DocumentLayout.json
View File

@ -1,53 +1,12 @@
{ {
"Version": 1, "Version": 1,
"WorkspaceRootPath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\", "WorkspaceRootPath": "C:\\c\u002B\u002B c#\\PMCProjekt\\PMCProjekt\\",
"Documents": [ "Documents": [],
{
"AbsoluteMoniker": "D:0:0:{7B328FFA-E441-4FED-8B99-C2B2453AA3E2}|PMCProjekt\\PMCProjekt.csproj|c:\\schule\\pmc\\pmcprojekt\\pmcprojekt\\pmcprojekt\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{7B328FFA-E441-4FED-8B99-C2B2453AA3E2}|PMCProjekt\\PMCProjekt.csproj|solutionrelative:pmcprojekt\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\bib\\AppData\\Local\\Temp\\6548756f-1fb5-487a-8435-26bbd99167cc_DBTest.7z.7cc\\DBTest\\DBTest\\Program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [ "DocumentGroupContainers": [
{ {
"Orientation": 0, "Orientation": 0,
"VerticalTabListWidth": 256, "VerticalTabListWidth": 256,
"DocumentGroups": [ "DocumentGroups": []
{
"DockedWidth": 200,
"SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "Program.cs",
"DocumentMoniker": "C:\\Users\\bib\\AppData\\Local\\Temp\\6548756f-1fb5-487a-8435-26bbd99167cc_DBTest.7z.7cc\\DBTest\\DBTest\\Program.cs",
"RelativeDocumentMoniker": "..\\..\\..\\..\\Users\\bib\\AppData\\Local\\Temp\\6548756f-1fb5-487a-8435-26bbd99167cc_DBTest.7z.7cc\\DBTest\\DBTest\\Program.cs",
"ToolTip": "C:\\Users\\bib\\AppData\\Local\\Temp\\6548756f-1fb5-487a-8435-26bbd99167cc_DBTest.7z.7cc\\DBTest\\DBTest\\Program.cs [Schreibgesch\u00FCtzt]",
"RelativeToolTip": "..\\..\\..\\..\\Users\\bib\\AppData\\Local\\Temp\\6548756f-1fb5-487a-8435-26bbd99167cc_DBTest.7z.7cc\\DBTest\\DBTest\\Program.cs [Schreibgesch\u00FCtzt]",
"ViewState": "AQIAABUAAAAAAAAAAAAAACkAAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-06-12T10:19:37.026Z",
"EditorCaption": " [Schreibgesch\u00FCtzt]"
},
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Program.cs",
"DocumentMoniker": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
"RelativeDocumentMoniker": "PMCProjekt\\Program.cs",
"ToolTip": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
"RelativeToolTip": "PMCProjekt\\Program.cs",
"ViewState": "AQIAACsAAAAAAAAAAAAQwC4AAAAAAAAA",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-29T10:43:22.805Z",
"EditorCaption": ""
}
]
}
]
} }
] ]
} }

2
PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.AssemblyInfo.cs
View File

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("PMCProjekt")] [assembly: System.Reflection.AssemblyCompanyAttribute("PMCProjekt")]
[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+f20c4b0b542d9633aff6f03a140a8fe8229bb381")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f3c6c199913e56995cb0293e47b34d79d2c85ffd")]
[assembly: System.Reflection.AssemblyProductAttribute("PMCProjekt")] [assembly: System.Reflection.AssemblyProductAttribute("PMCProjekt")]
[assembly: System.Reflection.AssemblyTitleAttribute("PMCProjekt")] [assembly: System.Reflection.AssemblyTitleAttribute("PMCProjekt")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.AssemblyInfoInputs.cache
View File

@ -1 +1 @@
8effae74d8590a37008381cb2c6ceda2d6294252be9b010a2944c71324fcb286 a4a88e57bbad55497841e3b09024a2c5ae3dfe6b082b7e603b7d9840f54db5fd

2
PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.GeneratedMSBuildEditorConfig.editorconfig
View File

@ -8,6 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules = build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = PMCProjekt build_property.RootNamespace = PMCProjekt
build_property.ProjectDir = C:\Schule\PMC\PMCProjekt\PMCProjekt\PMCProjekt\ build_property.ProjectDir = C:\c++ c#\PMCProjekt\PMCProjekt\PMCProjekt\
build_property.EnableComHosting = build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EnableGeneratedComInterfaceComImportInterop =

BIN
PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.assets.cache
View File

Binary file not shown.

10
PMCProjekt/PMCProjekt/obj/PMCProjekt.csproj.nuget.dgspec.json
View File

@ -1,17 +1,17 @@
{ {
"format": 1, "format": 1,
"restore": { "restore": {
"C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj": {} "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj": {}
}, },
"projects": { "projects": {
"C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj": { "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj", "projectUniqueName": "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
"projectName": "PMCProjekt", "projectName": "PMCProjekt",
"projectPath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj", "projectPath": "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
"packagesPath": "C:\\Users\\bib\\.nuget\\packages\\", "packagesPath": "C:\\Users\\bib\\.nuget\\packages\\",
"outputPath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\obj\\", "outputPath": "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"configFilePaths": [ "configFilePaths": [
"C:\\Users\\bib\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Users\\bib\\AppData\\Roaming\\NuGet\\NuGet.Config",

16
PMCProjekt/PMCProjekt/obj/project.assets.json
View File

@ -1791,11 +1791,11 @@
"project": { "project": {
"version": "1.0.0", "version": "1.0.0",
"restore": { "restore": {
"projectUniqueName": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj", "projectUniqueName": "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
"projectName": "PMCProjekt", "projectName": "PMCProjekt",
"projectPath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj", "projectPath": "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
"packagesPath": "C:\\Users\\bib\\.nuget\\packages\\", "packagesPath": "C:\\Users\\bib\\.nuget\\packages\\",
"outputPath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\obj\\", "outputPath": "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\obj\\",
"projectStyle": "PackageReference", "projectStyle": "PackageReference",
"configFilePaths": [ "configFilePaths": [
"C:\\Users\\bib\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Users\\bib\\AppData\\Roaming\\NuGet\\NuGet.Config",
@ -1853,13 +1853,5 @@
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.204/PortableRuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.204/PortableRuntimeIdentifierGraph.json"
} }
} }
}, }
"logs": [
{
"code": "Undefined",
"level": "Warning",
"warningLevel": 1,
"message": "Problem beim Lesen der Cachedatei \"C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\obj\\project.nuget.cache\": Invalid property identifier character: <. Path 'version', line 3, position 0."
}
]
} }

13
PMCProjekt/PMCProjekt/obj/project.nuget.cache
View File

@ -1,8 +1,8 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "GuZxYKqyxPKXrLIHTLiW4dbsfQtATzQU40yfFQuTfNrD+HunMVP/cZM5+daazdtJBtftPKPqAU5vRUnfnCNvqA==", "dgSpecHash": "hmjpczB20rO9+XIWVQE6LffNwpIbJnVyQpbAXGcthVX7MhdlK2/SeQpWsyghUPz07HV2wtAYW2lx3ET7P7TDlg==",
"success": true, "success": true,
"projectFilePath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj", "projectFilePath": "C:\\c++ c#\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [
"C:\\Users\\bib\\.nuget\\packages\\bouncycastle.cryptography\\2.2.1\\bouncycastle.cryptography.2.2.1.nupkg.sha512", "C:\\Users\\bib\\.nuget\\packages\\bouncycastle.cryptography\\2.2.1\\bouncycastle.cryptography.2.2.1.nupkg.sha512",
"C:\\Users\\bib\\.nuget\\packages\\google.protobuf\\3.25.1\\google.protobuf.3.25.1.nupkg.sha512", "C:\\Users\\bib\\.nuget\\packages\\google.protobuf\\3.25.1\\google.protobuf.3.25.1.nupkg.sha512",
@ -37,12 +37,5 @@
"C:\\Users\\bib\\.nuget\\packages\\system.windows.extensions\\4.7.0\\system.windows.extensions.4.7.0.nupkg.sha512", "C:\\Users\\bib\\.nuget\\packages\\system.windows.extensions\\4.7.0\\system.windows.extensions.4.7.0.nupkg.sha512",
"C:\\Users\\bib\\.nuget\\packages\\zstdsharp.port\\0.7.1\\zstdsharp.port.0.7.1.nupkg.sha512" "C:\\Users\\bib\\.nuget\\packages\\zstdsharp.port\\0.7.1\\zstdsharp.port.0.7.1.nupkg.sha512"
], ],
"logs": [ "logs": []
{
"code": "Undefined",
"level": "Warning",
"warningLevel": 1,
"message": "Problem beim Lesen der Cachedatei \"C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\obj\\project.nuget.cache\": Invalid property identifier character: <. Path 'version', line 3, position 0."
}
]
} }