diff --git a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 index 9a709ea..9274c02 100644 Binary files a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 and b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo index 13b85bc..f407f52 100644 Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ diff --git a/ASCKU Projects.sln b/ASCKU Projects.sln index ea486dd..834aa91 100644 --- a/ASCKU Projects.sln +++ b/ASCKU Projects.sln @@ -23,7 +23,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PrintPDF", "PrintPDF", "{EF EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Korp90TimePasport", "Korp90TimePasport\Korp90TimePasport.csproj", "{EC718A4D-6B40-453F-8650-4AF9CF8FE9BD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "STPClient", "STPClient\STPClient.csproj", "{EE48A5E6-C8DD-4829-8132-30DC5AA40854}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DataClient", "DataClient\DataClient.csproj", "{EE48A5E6-C8DD-4829-8132-30DC5AA40854}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test2", "Test2\Test2.csproj", "{9D5DF611-A1D3-4544-8E32-D14CFDF91BFA}" EndProject diff --git a/DataClients/FileClient.cs b/DataClients/FileClient.cs index ad49eaa..c9458bf 100644 --- a/DataClients/FileClient.cs +++ b/DataClients/FileClient.cs @@ -24,8 +24,8 @@ namespace DataClients public FileClient() { //fileClient(@"/archive_rmt/data"); - //fileClient(@"Y:\data"); - fileClient(@"C:\data"); + fileClient(@"Y:\data"); + //fileClient(@"C:\data"); } public FileClient(string directory) { diff --git a/DataClients/bin/Debug/netstandard2.0/DataClients.dll b/DataClients/bin/Debug/netstandard2.0/DataClients.dll index 17fe9db..ddeda4e 100644 Binary files a/DataClients/bin/Debug/netstandard2.0/DataClients.dll and b/DataClients/bin/Debug/netstandard2.0/DataClients.dll differ diff --git a/DataClients/bin/Debug/netstandard2.0/DataClients.pdb b/DataClients/bin/Debug/netstandard2.0/DataClients.pdb index 1961122..e0af495 100644 Binary files a/DataClients/bin/Debug/netstandard2.0/DataClients.pdb and b/DataClients/bin/Debug/netstandard2.0/DataClients.pdb differ diff --git a/DataClients/obj/DataClients.csproj.nuget.dgspec.json b/DataClients/obj/DataClients.csproj.nuget.dgspec.json index 5ef43ee..834aa6e 100644 --- a/DataClients/obj/DataClients.csproj.nuget.dgspec.json +++ b/DataClients/obj/DataClients.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": {} + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -138,7 +140,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/DataClients.csproj.nuget.g.props b/DataClients/obj/DataClients.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/DataClients/obj/DataClients.csproj.nuget.g.props +++ b/DataClients/obj/DataClients.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/DataClients/obj/DataClients.csproj.nuget.g.targets b/DataClients/obj/DataClients.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/DataClients/obj/DataClients.csproj.nuget.g.targets +++ b/DataClients/obj/DataClients.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache b/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache index 40257a4..bfe4fad 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache and b/DataClients/obj/Debug/netstandard2.0/DataClients.assets.cache differ diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache b/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache index a842b2e..56a73bf 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache and b/DataClients/obj/Debug/netstandard2.0/DataClients.csprojAssemblyReference.cache differ diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.dll b/DataClients/obj/Debug/netstandard2.0/DataClients.dll index 17fe9db..ddeda4e 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.dll and b/DataClients/obj/Debug/netstandard2.0/DataClients.dll differ diff --git a/DataClients/obj/Debug/netstandard2.0/DataClients.pdb b/DataClients/obj/Debug/netstandard2.0/DataClients.pdb index 1961122..e0af495 100644 Binary files a/DataClients/obj/Debug/netstandard2.0/DataClients.pdb and b/DataClients/obj/Debug/netstandard2.0/DataClients.pdb differ diff --git a/DataClients/obj/project.assets.json b/DataClients/obj/project.assets.json index 33db62e..35350d4 100644 --- a/DataClients/obj/project.assets.json +++ b/DataClients/obj/project.assets.json @@ -321,25 +321,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -355,8 +357,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -396,7 +398,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/project.nuget.cache b/DataClients/obj/project.nuget.cache index 10591cd..9f967c1 100644 --- a/DataClients/obj/project.nuget.cache +++ b/DataClients/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "j9dBpaCb4Zh30HGgPu9yq82zO3WLcf0RY8XU1X6pNbDFiEm8hS9Cd7Xfcc2o0U22zzmH+V7PxjTG+WDV0WUUkQ==", + "dgSpecHash": "uA9rgRXaUEUYoOTmuecMN9sEzQQ9h4wmOmVaX+dlb8QuS5RVxDdEJxCv+xV1gZk+Klv90ZG2LpnZBC8Qo/W4FA==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.7.1\\system.runtime.compilerservices.unsafe.4.7.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.7.1\\system.runtime.compilerservices.unsafe.4.7.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache index 9126624..874c649 100644 Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.assets.cache differ diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache index cdf5872..5e4020e 100644 Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csprojAssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json index 7654e10..14b9b41 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": {} + "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": { + "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "projectName": "Korp90TimePasport", - "projectPath": "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -109,8 +111,8 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" } } } @@ -145,25 +147,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -208,7 +211,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Korp90TimePasport/obj/project.assets.json b/Korp90TimePasport/obj/project.assets.json index 0d36980..980ee1e 100644 --- a/Korp90TimePasport/obj/project.assets.json +++ b/Korp90TimePasport/obj/project.assets.json @@ -224,25 +224,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "projectName": "Korp90TimePasport", - "projectPath": "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -258,8 +260,8 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" } } } @@ -294,7 +296,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/project.nuget.cache b/Korp90TimePasport/obj/project.nuget.cache index a07c1f5..9ece160 100644 --- a/Korp90TimePasport/obj/project.nuget.cache +++ b/Korp90TimePasport/obj/project.nuget.cache @@ -1,13 +1,13 @@ { "version": 2, - "dgSpecHash": "r7BiiqXcyabTYtaVl59T7Wjrl4E1I+nE555tepaKFs1oovFw5OqHn4YE7i2iNAJX50rgVUxrlqv0uRCo5mwvDw==", + "dgSpecHash": "AqbvvkDwL7rcBYkLzhlGt3MNX9HhqeqsJEu5ffbVRs0+3TsQS/BVQ91hVOf+q+SExRT+Ex2NuehhNNw64BSdsA==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.data.odbc\\5.0.0\\system.data.odbc.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.data.odbc\\5.0.0\\system.data.odbc.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Mailing/bin/Debug/netcoreapp3.1/DataClients.dll b/Mailing/bin/Debug/netcoreapp3.1/DataClients.dll index 17fe9db..ddeda4e 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/DataClients.dll and b/Mailing/bin/Debug/netcoreapp3.1/DataClients.dll differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/DataClients.pdb b/Mailing/bin/Debug/netcoreapp3.1/DataClients.pdb index 1961122..e0af495 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/DataClients.pdb and b/Mailing/bin/Debug/netcoreapp3.1/DataClients.pdb differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/Mailing.dll b/Mailing/bin/Debug/netcoreapp3.1/Mailing.dll index 5c3b6e3..6d04539 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/Mailing.dll and b/Mailing/bin/Debug/netcoreapp3.1/Mailing.dll differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/Mailing.pdb b/Mailing/bin/Debug/netcoreapp3.1/Mailing.pdb index d283e24..23afad1 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/Mailing.pdb and b/Mailing/bin/Debug/netcoreapp3.1/Mailing.pdb differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll index 97200de..59b6e57 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll and b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb index 61d2541..a360360 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb and b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll index 61a05e2..59e76df 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll and b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb index 1a44150..4cceeba 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb and b/Mailing/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll index 7bad3ea..18a927b 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll and b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb index 0f391d2..ac560c5 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb and b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.dll b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.dll index 4321e1b..6bee00e 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.dll and b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.dll differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.pdb b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.pdb index 14e504b..2976c94 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.pdb and b/Mailing/bin/Debug/netcoreapp3.1/PdfSharp.pdb differ diff --git a/Mailing/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll b/Mailing/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll index 7d289ce..0663904 100644 Binary files a/Mailing/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll and b/Mailing/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll differ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache index 825dc03..4473545 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache differ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache index 6261fd8..445f539 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csprojAssemblyReference.cache differ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.dll b/Mailing/obj/Debug/netcoreapp3.1/Mailing.dll index 5c3b6e3..6d04539 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.dll and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.dll differ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.pdb b/Mailing/obj/Debug/netcoreapp3.1/Mailing.pdb index d283e24..23afad1 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.pdb and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.pdb differ diff --git a/Mailing/obj/Mailing.csproj.nuget.dgspec.json b/Mailing/obj/Mailing.csproj.nuget.dgspec.json index 10c8f1a..ed2730a 100644 --- a/Mailing/obj/Mailing.csproj.nuget.dgspec.json +++ b/Mailing/obj/Mailing.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": {} + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -109,20 +111,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -157,25 +159,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -224,25 +227,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -258,14 +262,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -301,25 +305,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -335,8 +340,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -372,25 +377,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -439,25 +445,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -502,7 +509,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/Mailing.csproj.nuget.g.props b/Mailing/obj/Mailing.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/Mailing/obj/Mailing.csproj.nuget.g.props +++ b/Mailing/obj/Mailing.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Mailing/obj/project.assets.json b/Mailing/obj/project.assets.json index b063955..164179a 100644 --- a/Mailing/obj/project.assets.json +++ b/Mailing/obj/project.assets.json @@ -334,25 +334,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -368,20 +370,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -416,7 +418,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/project.nuget.cache b/Mailing/obj/project.nuget.cache index 2029ab0..0195330 100644 --- a/Mailing/obj/project.nuget.cache +++ b/Mailing/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "D3EqopcklOfWOCH6TmsQAhx2FEHp5UpUC6mgkqz5cnus/Sc+tau9VHMkYSijRrKd2T/rhMSjz191Z3w/yfYKrw==", + "dgSpecHash": "Fq2IpnyHMNBQTnMq0ZCrHwoCRgbhW2V3rILfncJWwkSpZ1dRVvNmfB6O7vhaEKYd5vbV0iFcMdt415hrQJ6Sog==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll b/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll index 97200de..59b6e57 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll and b/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb b/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb index 61d2541..a360360 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb and b/PrintPDF/MigraDoc.DocumentObjectModel/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache index 565f039..241954e 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache index aab19e2..af31f80 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.csprojAssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll index 97200de..59b6e57 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb index 61d2541..a360360 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json index aac019d..bb20f34 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -67,7 +68,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json index 9f26a00..8757008 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json @@ -222,25 +222,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -289,7 +291,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache index 1f83b0d..1a7310a 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "swrr9Xizfig+0Y1cEit2ODczuSCjLNcvfFFHYiwTT0JKmyYnbRG2tisRj5nco3k1j3iz+nceML4THXkoi4/G6w==", + "dgSpecHash": "sBm+civ/y30T28G19ksOeAZSL5HnW74LwApvyScSK1Z25T7B9Gkr9fA+YnAY/upXXLbBJADGkxTQ3draLrfiTQ==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll index 97200de..59b6e57 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb index 61d2541..a360360 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.DocumentObjectModel.pdb differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.dll b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.dll index 61a05e2..59e76df 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.dll and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.pdb b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.pdb index 1a44150..4cceeba 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.pdb and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/MigraDoc.Rendering.pdb differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.dll b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.dll index 7bad3ea..18a927b 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.dll and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb index 0f391d2..ac560c5 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.dll b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.dll index 4321e1b..6bee00e 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.dll and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.pdb b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.pdb index 14e504b..2976c94 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.pdb and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/PdfSharp.pdb differ diff --git a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll index 7d289ce..0663904 100644 Binary files a/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll and b/PrintPDF/MigraDoc.Rendering/bin/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.de.resources b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.de.resources index 84a4af7..2eb1f95 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.de.resources and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.de.resources differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.resources b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.resources index 3993155..20b075b 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.resources and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.Rendering.Resources.Messages2.resources differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache index a776645..6c6e3cc 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.assets.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache index 3ff4014..82aad13 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csproj.GenerateResource.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache index 8d8dbc9..3662fc9 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.csprojAssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.dll b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.dll index 61a05e2..59e76df 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.dll and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.pdb b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.pdb index 1a44150..4cceeba 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.pdb and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/MigraDoc.Rendering.pdb differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll index 7d289ce..0663904 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll and b/PrintPDF/MigraDoc.Rendering/obj/Debug/netstandard2.0/de/MigraDoc.Rendering.resources.dll differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json index f0acc99..c651205 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -67,25 +68,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -101,14 +103,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -144,25 +146,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -178,8 +181,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -215,25 +218,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -282,7 +286,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json index e014284..0860442 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json +++ b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json @@ -280,25 +280,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -314,14 +316,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -357,7 +359,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache index 629d26f..76a4196 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "zSIMeeTti/wf7461nZpu715HAjnmSTSssktajV3FGE11Er70H1NcCZpeDqu1ThXRlJ7lRxrFwOPSRm9ZTE4wPQ==", + "dgSpecHash": "TxR9xRD7C2qxgn4+fmYYQ80yeu7RmqNvCRhmxCD1mxKyia2AoKu19WCJNH7gSVRBpw5yNVgRJYXvflrC/gST+A==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.dll b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.dll index 7bad3ea..18a927b 100644 Binary files a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.dll and b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.dll differ diff --git a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb index 0f391d2..ac560c5 100644 Binary files a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb and b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.Charting.pdb differ diff --git a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.dll b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.dll index 4321e1b..6bee00e 100644 Binary files a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.dll and b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.dll differ diff --git a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.pdb b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.pdb index 14e504b..2976c94 100644 Binary files a/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.pdb and b/PrintPDF/PdfSharp.Charting/bin/Debug/netstandard2.0/PdfSharp.pdb differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache index e37f730..7b0f304 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.assets.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache index 2395306..88298a9 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.csprojAssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.dll b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.dll index 7bad3ea..18a927b 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.dll and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.dll differ diff --git a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.pdb b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.pdb index 0f391d2..ac560c5 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.pdb and b/PrintPDF/PdfSharp.Charting/obj/Debug/netstandard2.0/PdfSharp.Charting.pdb differ diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json index f02a9fd..1d5cad6 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -71,25 +72,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -138,7 +140,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/PdfSharp.Charting/obj/project.assets.json b/PrintPDF/PdfSharp.Charting/obj/project.assets.json index 02c027c..7dd8dab 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.assets.json +++ b/PrintPDF/PdfSharp.Charting/obj/project.assets.json @@ -241,25 +241,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -275,8 +277,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -312,7 +314,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache index b2b63f5..144e274 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "49cy0sTKi3QqnxBsQPxFTmsux/Twu0wb1LxDbpeY/FrUtHR7Xn7va8b5iQQT7uQM+fJG4Ot7aOxe1FROtnN5+A==", + "dgSpecHash": "ylFR2pFfHruJfLgzgidtqc3YfADHj/7nw+tQ1nHK/jI7pRvAVQTnBsGvB/IdLnxMQFZVD+HIjX9oz6WxWvfZqQ==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.dll b/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.dll index 4321e1b..6bee00e 100644 Binary files a/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.dll and b/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.dll differ diff --git a/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.pdb b/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.pdb index 14e504b..2976c94 100644 Binary files a/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.pdb and b/PrintPDF/PdfSharp/bin/Debug/netstandard2.0/PdfSharp.pdb differ diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache index d1a042e..233265e 100644 Binary files a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache and b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache differ diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csproj.GenerateResource.cache b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csproj.GenerateResource.cache index ca11108..2172f4e 100644 Binary files a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csproj.GenerateResource.cache and b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csproj.GenerateResource.cache differ diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache index 828b5d6..ec9b2b0 100644 Binary files a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache and b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.csprojAssemblyReference.cache differ diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.dll b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.dll index 4321e1b..6bee00e 100644 Binary files a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.dll and b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.dll differ diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.pdb b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.pdb index 14e504b..2976c94 100644 Binary files a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.pdb and b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.pdb differ diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json index 0334996..99cbd8b 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": {} + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -67,7 +68,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/PrintPDF/PdfSharp/obj/project.assets.json b/PrintPDF/PdfSharp/obj/project.assets.json index a375291..9015a39 100644 --- a/PrintPDF/PdfSharp/obj/project.assets.json +++ b/PrintPDF/PdfSharp/obj/project.assets.json @@ -222,25 +222,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -289,7 +291,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/project.nuget.cache b/PrintPDF/PdfSharp/obj/project.nuget.cache index b5c10b0..fa5de92 100644 --- a/PrintPDF/PdfSharp/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "wSnO5mgpeplUpbKXP2p+n9EfChBNr8skmTBFUKLxsInRD0xUb6sVOAio2IWbrrqlXa3W4gjMWxRSoZWxRVxonQ==", + "dgSpecHash": "gAA+4olGjjwVeZQSmw/Z0DOTpvSV4fy+dgVMwmTj80c7nXa8OCdrFx82JQ+RJR4CtrbDPW55iyjFjOyll2at+A==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/STPClient/Config/config.json b/STPClient/Config/config.json deleted file mode 100644 index f71d35f..0000000 --- a/STPClient/Config/config.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "servers": [ - { - "name": "STP 1", - "ip": "10.10.45.151", - "port": 1070, - "dir": "Y:\\data" - }, - { - "name": "STP 2", - "ip": "10.10.45.152", - "port": 1070, - "dir": "Z:\\data" - } - ] -} diff --git a/STPClient/Properties/PublishProfiles/FolderProfile.pubxml b/STPClient/Properties/PublishProfiles/FolderProfile.pubxml deleted file mode 100644 index e724048..0000000 --- a/STPClient/Properties/PublishProfiles/FolderProfile.pubxml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - Release - Any CPU - ..\Release\STPClient\ - FileSystem - - \ No newline at end of file diff --git a/STPClient/Properties/PublishProfiles/FolderProfile.pubxml.user b/STPClient/Properties/PublishProfiles/FolderProfile.pubxml.user deleted file mode 100644 index a7e830d..0000000 --- a/STPClient/Properties/PublishProfiles/FolderProfile.pubxml.user +++ /dev/null @@ -1,9 +0,0 @@ - - - - - True|2021-05-27T05:25:25.8638099Z;True|2021-05-27T10:16:30.2483150+05:00; - - \ No newline at end of file diff --git a/STPClient/STPClient.cs b/STPClient/STPClient.cs deleted file mode 100644 index 462beb9..0000000 --- a/STPClient/STPClient.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.IO; -using System.Collections.Generic; -using NLog; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using DataClient.Struct; -using System.Net; - -namespace DataClient -{ - public class STPClient - { - Logger log = LogManager.GetCurrentClassLogger(); - string confDir = Path.Combine(Directory.GetCurrentDirectory(), "Config", "config.json"); - private List servers = new List(); - int serverDefault = -1; - - public STPClient() - { - log.Trace("Create instance class."); - GetConfig(); - } - public STPClient(string confDir) - { - log.Trace("Create instance class."); - this.confDir = confDir; - } - public bool AddServer(string name, string ip, int port, string dir) - { - - - return true; - } - private void GetConfig() - { - log.Trace("Get config from: " + confDir); - string jsonString; - try - { - log.Trace("Read config file."); - jsonString = File.ReadAllText(confDir); - } - catch (Exception e) - { - log.Warn(e, "Can't read config file."); - return; - } - var conf = (JObject)JsonConvert.DeserializeObject(jsonString); - if (!conf.HasValues && !conf["servers"].HasValues && conf["servers"].Type != JTokenType.Array) - { - log.Warn("Doesn't exist \"servers\" object in config file."); - return; - } - var count = -1; - foreach (var s in conf["servers"]) - { - count++; - var name = (s["name"].Type == JTokenType.String && ((string)s["name"]).Length > 0) ? (string)s["name"] : "default"; - var ip = (s["ip"].Type == JTokenType.String && IPAddress.TryParse((string)s["ip"], out _)) ? (string)s["ip"] : ""; - var port = (s["port"].Type == JTokenType.Integer) ? (int)s["port"] : -1; - var dir = (s["dir"].Type == JTokenType.String && Directory.Exists((string)s["dir"])) ? (string)s["dir"] : ""; - if (ip == "") - { - log.Warn("servers[" + count.ToString() + "].ip - incorrect. Skip server."); - continue; - } - if (port < 0 && port > 65535) - { - log.Warn("servers[" + count.ToString() + "].port - incorrect. Skip server."); - continue; - } - if (dir == "") - { - log.Warn("servers[" + count.ToString() + "].dir - incorrect or not exist. Skip server."); - continue; - } - - } - } - - } - -} \ No newline at end of file diff --git a/STPClient/STPClient.csproj b/STPClient/STPClient.csproj deleted file mode 100644 index fedf490..0000000 --- a/STPClient/STPClient.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - net5.0 - - - - - - - - - - - Always - - - - diff --git a/STPClient/STPClient.csproj.user b/STPClient/STPClient.csproj.user deleted file mode 100644 index b75df9c..0000000 --- a/STPClient/STPClient.csproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - <_LastSelectedProfileId>D:\GIT\ASCKU_PC\STPClient\Properties\PublishProfiles\FolderProfile.pubxml - - \ No newline at end of file diff --git a/STPClient/Struct.cs b/STPClient/Struct.cs deleted file mode 100644 index d550387..0000000 --- a/STPClient/Struct.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DataClient.Struct -{ - public struct server - { - public string name; - public string ip; - public int port; - public string dir; - public server(string Ip, int Port, string Dir) - { - name = "default"; - ip = Ip; - port = Port; - dir = Dir; - } - public server(string Name, string Ip, int Port, string Dir) - { - name = Name; - ip = Ip; - port = Port; - dir = Dir; - } - } -} diff --git a/STPClient/bin/Debug/net5.0/Config/config.json b/STPClient/bin/Debug/net5.0/Config/config.json deleted file mode 100644 index 0d02ca9..0000000 --- a/STPClient/bin/Debug/net5.0/Config/config.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "servers": [ - { - "name": "STP 1", - "address": "10.10.45.151:1070", - "archive": "Y:\\data" - }, - { - "name": "STP 2", - "address": "10.10.45.152:1070", - "archive": "Z:\\data" - } - ] -} diff --git a/STPClient/bin/Debug/net5.0/STPClient.deps.json b/STPClient/bin/Debug/net5.0/STPClient.deps.json deleted file mode 100644 index ffcbe3b..0000000 --- a/STPClient/bin/Debug/net5.0/STPClient.deps.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v5.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v5.0": { - "STPClient/1.0.0": { - "dependencies": { - "NLog": "4.7.10", - "NLog.Extensions.Logging": "1.7.2", - "Newtonsoft.Json": "13.0.1" - }, - "runtime": { - "STPClient.dll": {} - } - }, - "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { - "dependencies": { - "Microsoft.Extensions.Primitives": "5.0.0" - }, - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Configuration.Abstractions.dll": { - "assemblyVersion": "5.0.0.0", - "fileVersion": "5.0.20.51904" - } - } - }, - "Microsoft.Extensions.DependencyInjection/5.0.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0" - }, - "runtime": { - "lib/net5.0/Microsoft.Extensions.DependencyInjection.dll": { - "assemblyVersion": "5.0.0.0", - "fileVersion": "5.0.20.51904" - } - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { - "assemblyVersion": "5.0.0.0", - "fileVersion": "5.0.20.51904" - } - } - }, - "Microsoft.Extensions.Logging/5.0.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection": "5.0.0", - "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", - "Microsoft.Extensions.Logging.Abstractions": "5.0.0", - "Microsoft.Extensions.Options": "5.0.0" - }, - "runtime": { - "lib/netstandard2.1/Microsoft.Extensions.Logging.dll": { - "assemblyVersion": "5.0.0.0", - "fileVersion": "5.0.20.51904" - } - } - }, - "Microsoft.Extensions.Logging.Abstractions/5.0.0": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll": { - "assemblyVersion": "5.0.0.0", - "fileVersion": "5.0.20.51904" - } - } - }, - "Microsoft.Extensions.Options/5.0.0": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "5.0.0", - "Microsoft.Extensions.Primitives": "5.0.0" - }, - "runtime": { - "lib/net5.0/Microsoft.Extensions.Options.dll": { - "assemblyVersion": "5.0.0.0", - "fileVersion": "5.0.20.51904" - } - } - }, - "Microsoft.Extensions.Primitives/5.0.0": { - "runtime": { - "lib/netcoreapp3.0/Microsoft.Extensions.Primitives.dll": { - "assemblyVersion": "5.0.0.0", - "fileVersion": "5.0.20.51904" - } - } - }, - "Newtonsoft.Json/13.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.1.25517" - } - } - }, - "NLog/4.7.10": { - "runtime": { - "lib/netstandard2.0/NLog.dll": { - "assemblyVersion": "4.0.0.0", - "fileVersion": "4.7.10.13013" - } - } - }, - "NLog.Extensions.Logging/1.7.2": { - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "5.0.0", - "Microsoft.Extensions.Logging": "5.0.0", - "NLog": "4.7.10" - }, - "runtime": { - "lib/net5.0/NLog.Extensions.Logging.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.7.2.1548" - } - } - } - } - }, - "libraries": { - "STPClient/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.Extensions.Configuration.Abstractions/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ETjSBHMp3OAZ4HxGQYpwyGsD8Sw5FegQXphi0rpoGMT74S4+I2mm7XJEswwn59XAaKOzC15oDSOWEE8SzDCd6Q==", - "path": "microsoft.extensions.configuration.abstractions/5.0.0", - "hashPath": "microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-Rc2kb/p3Ze6cP6rhFC3PJRdWGbLvSHZc0ev7YlyeU6FmHciDMLrhoVoTUEzKPhN5ZjFgKF1Cf5fOz8mCMIkvpA==", - "path": "microsoft.extensions.dependencyinjection/5.0.0", - "hashPath": "microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ORj7Zh81gC69TyvmcUm9tSzytcy8AVousi+IVRAI8nLieQjOFryRusSFh7+aLk16FN9pQNqJAiMd7BTKINK0kA==", - "path": "microsoft.extensions.dependencyinjection.abstractions/5.0.0", - "hashPath": "microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-MgOwK6tPzB6YNH21wssJcw/2MKwee8b2gI7SllYfn6rvTpIrVvVS5HAjSU2vqSku1fwqRvWP0MdIi14qjd93Aw==", - "path": "microsoft.extensions.logging/5.0.0", - "hashPath": "microsoft.extensions.logging.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Logging.Abstractions/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==", - "path": "microsoft.extensions.logging.abstractions/5.0.0", - "hashPath": "microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Options/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-CBvR92TCJ5uBIdd9/HzDSrxYak+0W/3+yxrNg8Qm6Bmrkh5L+nu6m3WeazQehcZ5q1/6dDA7J5YdQjim0165zg==", - "path": "microsoft.extensions.options/5.0.0", - "hashPath": "microsoft.extensions.options.5.0.0.nupkg.sha512" - }, - "Microsoft.Extensions.Primitives/5.0.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-cI/VWn9G1fghXrNDagX9nYaaB/nokkZn0HYAawGaELQrl8InSezfe9OnfPZLcJq3esXxygh3hkq2c3qoV3SDyQ==", - "path": "microsoft.extensions.primitives/5.0.0", - "hashPath": "microsoft.extensions.primitives.5.0.0.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", - "path": "newtonsoft.json/13.0.1", - "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" - }, - "NLog/4.7.10": { - "type": "package", - "serviceable": true, - "sha512": "sha512-rcegW7kYOCjl7wX0SzsqpPBqnJ51JKi1WkYb6QBVX0Wc5IgH19Pv4t/co+T0s06OS0Ne44xgkY/mHg0PdrmJow==", - "path": "nlog/4.7.10", - "hashPath": "nlog.4.7.10.nupkg.sha512" - }, - "NLog.Extensions.Logging/1.7.2": { - "type": "package", - "serviceable": true, - "sha512": "sha512-0y1QziAUCdePQc4itPOQF3xDcs0iE9NHlIK0hE0eA0+Ef6E9dnJDPveNu7w2ckYaDfJIFHpOoLK8sZmNEyiBCw==", - "path": "nlog.extensions.logging/1.7.2", - "hashPath": "nlog.extensions.logging.1.7.2.nupkg.sha512" - } - } -} \ No newline at end of file diff --git a/STPClient/bin/Debug/net5.0/STPClient.dll b/STPClient/bin/Debug/net5.0/STPClient.dll deleted file mode 100644 index e562dfa..0000000 Binary files a/STPClient/bin/Debug/net5.0/STPClient.dll and /dev/null differ diff --git a/STPClient/bin/Debug/net5.0/STPClient.pdb b/STPClient/bin/Debug/net5.0/STPClient.pdb deleted file mode 100644 index 60f5019..0000000 Binary files a/STPClient/bin/Debug/net5.0/STPClient.pdb and /dev/null differ diff --git a/STPClient/bin/Debug/net5.0/ref/STPClient.dll b/STPClient/bin/Debug/net5.0/ref/STPClient.dll deleted file mode 100644 index 9b294e5..0000000 Binary files a/STPClient/bin/Debug/net5.0/ref/STPClient.dll and /dev/null differ diff --git a/STPClient/bin/Release/net5.0/Config/config.json b/STPClient/bin/Release/net5.0/Config/config.json deleted file mode 100644 index 0d02ca9..0000000 --- a/STPClient/bin/Release/net5.0/Config/config.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "servers": [ - { - "name": "STP 1", - "address": "10.10.45.151:1070", - "archive": "Y:\\data" - }, - { - "name": "STP 2", - "address": "10.10.45.152:1070", - "archive": "Z:\\data" - } - ] -} diff --git a/STPClient/bin/Release/net5.0/STPClient.deps.json b/STPClient/bin/Release/net5.0/STPClient.deps.json deleted file mode 100644 index 93ba91f..0000000 --- a/STPClient/bin/Release/net5.0/STPClient.deps.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v5.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v5.0": { - "STPClient/1.0.0": { - "runtime": { - "STPClient.dll": {} - } - } - } - }, - "libraries": { - "STPClient/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/STPClient/bin/Release/net5.0/STPClient.dll b/STPClient/bin/Release/net5.0/STPClient.dll deleted file mode 100644 index e70265e..0000000 Binary files a/STPClient/bin/Release/net5.0/STPClient.dll and /dev/null differ diff --git a/STPClient/bin/Release/net5.0/STPClient.pdb b/STPClient/bin/Release/net5.0/STPClient.pdb deleted file mode 100644 index ec402f8..0000000 Binary files a/STPClient/bin/Release/net5.0/STPClient.pdb and /dev/null differ diff --git a/STPClient/bin/Release/net5.0/ref/STPClient.dll b/STPClient/bin/Release/net5.0/ref/STPClient.dll deleted file mode 100644 index e964650..0000000 Binary files a/STPClient/bin/Release/net5.0/ref/STPClient.dll and /dev/null differ diff --git a/STPClient/obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs b/STPClient/obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs deleted file mode 100644 index 2f7e5ec..0000000 --- a/STPClient/obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v5.0", FrameworkDisplayName = "")] diff --git a/STPClient/obj/Debug/net5.0/STPClient.AssemblyInfo.cs b/STPClient/obj/Debug/net5.0/STPClient.AssemblyInfo.cs deleted file mode 100644 index 1cdb0c3..0000000 --- a/STPClient/obj/Debug/net5.0/STPClient.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Этот код создан программой. -// Исполняемая версия:4.0.30319.42000 -// -// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае -// повторной генерации кода. -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("STPClient")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("STPClient")] -[assembly: System.Reflection.AssemblyTitleAttribute("STPClient")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// Создано классом WriteCodeFragment MSBuild. - diff --git a/STPClient/obj/Debug/net5.0/STPClient.AssemblyInfoInputs.cache b/STPClient/obj/Debug/net5.0/STPClient.AssemblyInfoInputs.cache deleted file mode 100644 index bf6d8bf..0000000 --- a/STPClient/obj/Debug/net5.0/STPClient.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -9ee3277397ec3cb181dbbe40dc2ab41a1c484c50 diff --git a/STPClient/obj/Debug/net5.0/STPClient.GeneratedMSBuildEditorConfig.editorconfig b/STPClient/obj/Debug/net5.0/STPClient.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index d7e2983..0000000 --- a/STPClient/obj/Debug/net5.0/STPClient.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,8 +0,0 @@ -is_global = true -build_property.TargetFramework = net5.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.PublishSingleFile = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows diff --git a/STPClient/obj/Debug/net5.0/STPClient.assets.cache b/STPClient/obj/Debug/net5.0/STPClient.assets.cache deleted file mode 100644 index ef49caa..0000000 Binary files a/STPClient/obj/Debug/net5.0/STPClient.assets.cache and /dev/null differ diff --git a/STPClient/obj/Debug/net5.0/STPClient.csproj.CoreCompileInputs.cache b/STPClient/obj/Debug/net5.0/STPClient.csproj.CoreCompileInputs.cache deleted file mode 100644 index e3fa16c..0000000 --- a/STPClient/obj/Debug/net5.0/STPClient.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -a29c3e780c8e96aa2aba5808887a3d3a0431eb52 diff --git a/STPClient/obj/Debug/net5.0/STPClient.csproj.FileListAbsolute.txt b/STPClient/obj/Debug/net5.0/STPClient.csproj.FileListAbsolute.txt deleted file mode 100644 index a87299c..0000000 --- a/STPClient/obj/Debug/net5.0/STPClient.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,13 +0,0 @@ -D:\GIT\ASCKU_PC\STPClient\bin\Debug\net5.0\Config\config.json -D:\GIT\ASCKU_PC\STPClient\bin\Debug\net5.0\STPClient.deps.json -D:\GIT\ASCKU_PC\STPClient\bin\Debug\net5.0\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\bin\Debug\net5.0\ref\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\bin\Debug\net5.0\STPClient.pdb -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\STPClient.csprojAssemblyReference.cache -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\STPClient.GeneratedMSBuildEditorConfig.editorconfig -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\STPClient.AssemblyInfoInputs.cache -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\STPClient.AssemblyInfo.cs -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\STPClient.csproj.CoreCompileInputs.cache -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\ref\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\obj\Debug\net5.0\STPClient.pdb diff --git a/STPClient/obj/Debug/net5.0/STPClient.csprojAssemblyReference.cache b/STPClient/obj/Debug/net5.0/STPClient.csprojAssemblyReference.cache deleted file mode 100644 index 0243998..0000000 Binary files a/STPClient/obj/Debug/net5.0/STPClient.csprojAssemblyReference.cache and /dev/null differ diff --git a/STPClient/obj/Debug/net5.0/STPClient.dll b/STPClient/obj/Debug/net5.0/STPClient.dll deleted file mode 100644 index e562dfa..0000000 Binary files a/STPClient/obj/Debug/net5.0/STPClient.dll and /dev/null differ diff --git a/STPClient/obj/Debug/net5.0/STPClient.pdb b/STPClient/obj/Debug/net5.0/STPClient.pdb deleted file mode 100644 index 60f5019..0000000 Binary files a/STPClient/obj/Debug/net5.0/STPClient.pdb and /dev/null differ diff --git a/STPClient/obj/Debug/net5.0/ref/STPClient.dll b/STPClient/obj/Debug/net5.0/ref/STPClient.dll deleted file mode 100644 index 9b294e5..0000000 Binary files a/STPClient/obj/Debug/net5.0/ref/STPClient.dll and /dev/null differ diff --git a/STPClient/obj/Release/STPClient.1.0.0.nuspec b/STPClient/obj/Release/STPClient.1.0.0.nuspec deleted file mode 100644 index a5cdcdb..0000000 --- a/STPClient/obj/Release/STPClient.1.0.0.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - STPClient - 1.0.0 - STPClient - false - Package Description - - - - - - - - \ No newline at end of file diff --git a/STPClient/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs b/STPClient/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs deleted file mode 100644 index 2f7e5ec..0000000 --- a/STPClient/obj/Release/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v5.0", FrameworkDisplayName = "")] diff --git a/STPClient/obj/Release/net5.0/STPClient.AssemblyInfo.cs b/STPClient/obj/Release/net5.0/STPClient.AssemblyInfo.cs deleted file mode 100644 index 5276a9d..0000000 --- a/STPClient/obj/Release/net5.0/STPClient.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Этот код создан программой. -// Исполняемая версия:4.0.30319.42000 -// -// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае -// повторной генерации кода. -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("STPClient")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("STPClient")] -[assembly: System.Reflection.AssemblyTitleAttribute("STPClient")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// Создано классом WriteCodeFragment MSBuild. - diff --git a/STPClient/obj/Release/net5.0/STPClient.AssemblyInfoInputs.cache b/STPClient/obj/Release/net5.0/STPClient.AssemblyInfoInputs.cache deleted file mode 100644 index 52e83cc..0000000 --- a/STPClient/obj/Release/net5.0/STPClient.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -37f042a4f38dfb7d4476c4b8fc055adc3323e40d diff --git a/STPClient/obj/Release/net5.0/STPClient.GeneratedMSBuildEditorConfig.editorconfig b/STPClient/obj/Release/net5.0/STPClient.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index d7e2983..0000000 --- a/STPClient/obj/Release/net5.0/STPClient.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,8 +0,0 @@ -is_global = true -build_property.TargetFramework = net5.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.PublishSingleFile = -build_property.IncludeAllContentForSelfExtract = -build_property._SupportedPlatformList = Android,iOS,Linux,macOS,Windows diff --git a/STPClient/obj/Release/net5.0/STPClient.assets.cache b/STPClient/obj/Release/net5.0/STPClient.assets.cache deleted file mode 100644 index c1d4f9d..0000000 Binary files a/STPClient/obj/Release/net5.0/STPClient.assets.cache and /dev/null differ diff --git a/STPClient/obj/Release/net5.0/STPClient.csproj.CoreCompileInputs.cache b/STPClient/obj/Release/net5.0/STPClient.csproj.CoreCompileInputs.cache deleted file mode 100644 index 3e7d0f5..0000000 --- a/STPClient/obj/Release/net5.0/STPClient.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -76d37c1a71009ecd915d190cd7beb8053e3ff188 diff --git a/STPClient/obj/Release/net5.0/STPClient.csproj.FileListAbsolute.txt b/STPClient/obj/Release/net5.0/STPClient.csproj.FileListAbsolute.txt deleted file mode 100644 index 621d418..0000000 --- a/STPClient/obj/Release/net5.0/STPClient.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,13 +0,0 @@ -D:\GIT\ASCKU_PC\STPClient\bin\Release\net5.0\Config\config.json -D:\GIT\ASCKU_PC\STPClient\bin\Release\net5.0\STPClient.deps.json -D:\GIT\ASCKU_PC\STPClient\bin\Release\net5.0\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\bin\Release\net5.0\ref\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\bin\Release\net5.0\STPClient.pdb -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\STPClient.csprojAssemblyReference.cache -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\STPClient.GeneratedMSBuildEditorConfig.editorconfig -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\STPClient.AssemblyInfoInputs.cache -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\STPClient.AssemblyInfo.cs -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\STPClient.csproj.CoreCompileInputs.cache -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\ref\STPClient.dll -D:\GIT\ASCKU_PC\STPClient\obj\Release\net5.0\STPClient.pdb diff --git a/STPClient/obj/Release/net5.0/STPClient.csprojAssemblyReference.cache b/STPClient/obj/Release/net5.0/STPClient.csprojAssemblyReference.cache deleted file mode 100644 index 9a18cbc..0000000 Binary files a/STPClient/obj/Release/net5.0/STPClient.csprojAssemblyReference.cache and /dev/null differ diff --git a/STPClient/obj/Release/net5.0/STPClient.dll b/STPClient/obj/Release/net5.0/STPClient.dll deleted file mode 100644 index e70265e..0000000 Binary files a/STPClient/obj/Release/net5.0/STPClient.dll and /dev/null differ diff --git a/STPClient/obj/Release/net5.0/STPClient.pdb b/STPClient/obj/Release/net5.0/STPClient.pdb deleted file mode 100644 index ec402f8..0000000 Binary files a/STPClient/obj/Release/net5.0/STPClient.pdb and /dev/null differ diff --git a/STPClient/obj/Release/net5.0/ref/STPClient.dll b/STPClient/obj/Release/net5.0/ref/STPClient.dll deleted file mode 100644 index e964650..0000000 Binary files a/STPClient/obj/Release/net5.0/ref/STPClient.dll and /dev/null differ diff --git a/STPClient/obj/STPClient.csproj.nuget.dgspec.json b/STPClient/obj/STPClient.csproj.nuget.dgspec.json index 8d0329d..739367c 100644 --- a/STPClient/obj/STPClient.csproj.nuget.dgspec.json +++ b/STPClient/obj/STPClient.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj": {} + "D:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj": { - "version": "1.0.0", + "D:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj": { + "version": "0.0.3", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", - "projectName": "STPClient", - "projectPath": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\STPClient\\obj\\", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", + "projectName": "DataClient", + "projectPath": "D:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\STPClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -74,7 +75,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/STPClient/obj/STPClient.csproj.nuget.g.props b/STPClient/obj/STPClient.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/STPClient/obj/STPClient.csproj.nuget.g.props +++ b/STPClient/obj/STPClient.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/STPClient/obj/project.assets.json b/STPClient/obj/project.assets.json index 2c7e65a..49cb284 100644 --- a/STPClient/obj/project.assets.json +++ b/STPClient/obj/project.assets.json @@ -361,25 +361,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { - "version": "1.0.0", + "version": "0.0.3", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", - "projectName": "STPClient", - "projectPath": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\STPClient\\obj\\", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", + "projectName": "DataClient", + "projectPath": "D:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\STPClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -435,7 +437,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/STPClient/obj/project.nuget.cache b/STPClient/obj/project.nuget.cache index 373e51e..6b5a519 100644 --- a/STPClient/obj/project.nuget.cache +++ b/STPClient/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "o6OPlvqTxZe87EkkLNG7xOH1lJZMPMyHMIDMPp42fdz3B4ER8i4Ky4UZZnOmWzYk7VdkNj7lD5UH+oB4UNPduA==", + "dgSpecHash": "EmbwZ7SwMJWgbFue8nyHBdE4ncOyGFZrHWPrhJnnAGQ3ZcXtnfZ3crT7OVc5RbuLASujwv+C2eky/VDZVjvtGg==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache index 7f02614..0779812 100644 Binary files a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache and b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.assets.cache differ diff --git a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache index 6184101..bfdce24 100644 Binary files a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache and b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csprojAssemblyReference.cache differ diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json index 6bba731..93d56da 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": {} + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -63,7 +64,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets b/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets index 8f2d2d6..f09823b 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/SupportClasses/obj/project.assets.json b/SupportClasses/obj/project.assets.json index a4c9210..0a0315d 100644 --- a/SupportClasses/obj/project.assets.json +++ b/SupportClasses/obj/project.assets.json @@ -179,25 +179,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -242,7 +244,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/project.nuget.cache b/SupportClasses/obj/project.nuget.cache index b9eb9b4..b008c15 100644 --- a/SupportClasses/obj/project.nuget.cache +++ b/SupportClasses/obj/project.nuget.cache @@ -1,11 +1,11 @@ { "version": 2, - "dgSpecHash": "WCsxh7YZJZBKup5xSB5GwbEJ12OHvTx4eBHycJKcdA4s/uF37j8Lf9OLw68XV5rotZsmt/zKKPpGOKCr1svq7A==", + "dgSpecHash": "4z8iakRemDHltW/xazDzU5cngA0Pqip9r1fUiMe+4pEedLlKbRR2y7psVjUGx9IEupBfp4Gj7OPOyPOJ/OLgqQ==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512" + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\1.1.0\\microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\netstandard.library\\2.0.3\\netstandard.library.2.0.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Test2/Program.cs b/Test2/Program.cs index c430505..4ff87eb 100644 --- a/Test2/Program.cs +++ b/Test2/Program.cs @@ -3,6 +3,10 @@ using NLog; using NLog.Config; using NLog.Targets; using DataClient; +using System.Net.Sockets; +using System.Net; +using System.Collections.Generic; +using System.Text; namespace Test2 { @@ -26,5 +30,26 @@ namespace Test2 conf.AddRule(LogLevel.Trace, LogLevel.Fatal, logcon); LogManager.Configuration = conf; } + + static void testSocket() + { + Socket s = null; + IPEndPoint ipe = new IPEndPoint(IPAddress.Parse("10.10.45.152"), 1070); + s = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + var code = "slit history"; + var send = new List(); + for (var i = 0; i < 4; i++) + send.Add(0xff); + send.AddRange(BitConverter.GetBytes((uint)code.Length)); + send.AddRange(Encoding.ASCII.GetBytes(code)); + send.Add(0x00); + + s.Connect(ipe); + s.Send(send.ToArray()); + + + s.Available; + + } } } diff --git a/Test2/Test2.csproj b/Test2/Test2.csproj index bbaad1e..b602ab3 100644 --- a/Test2/Test2.csproj +++ b/Test2/Test2.csproj @@ -11,7 +11,7 @@ - + diff --git a/Test2/bin/Debug/net5.0/Config/config.json b/Test2/bin/Debug/net5.0/Config/config.json index 0d02ca9..f71d35f 100644 --- a/Test2/bin/Debug/net5.0/Config/config.json +++ b/Test2/bin/Debug/net5.0/Config/config.json @@ -2,13 +2,15 @@ "servers": [ { "name": "STP 1", - "address": "10.10.45.151:1070", - "archive": "Y:\\data" + "ip": "10.10.45.151", + "port": 1070, + "dir": "Y:\\data" }, { "name": "STP 2", - "address": "10.10.45.152:1070", - "archive": "Z:\\data" + "ip": "10.10.45.152", + "port": 1070, + "dir": "Z:\\data" } ] } diff --git a/Test2/bin/Debug/net5.0/STPClient.dll b/Test2/bin/Debug/net5.0/STPClient.dll index e562dfa..3b76eff 100644 Binary files a/Test2/bin/Debug/net5.0/STPClient.dll and b/Test2/bin/Debug/net5.0/STPClient.dll differ diff --git a/Test2/bin/Debug/net5.0/STPClient.pdb b/Test2/bin/Debug/net5.0/STPClient.pdb index 60f5019..838924c 100644 Binary files a/Test2/bin/Debug/net5.0/STPClient.pdb and b/Test2/bin/Debug/net5.0/STPClient.pdb differ diff --git a/Test2/bin/Debug/net5.0/Test2.dll b/Test2/bin/Debug/net5.0/Test2.dll index ec28545..c573e73 100644 Binary files a/Test2/bin/Debug/net5.0/Test2.dll and b/Test2/bin/Debug/net5.0/Test2.dll differ diff --git a/Test2/bin/Debug/net5.0/Test2.pdb b/Test2/bin/Debug/net5.0/Test2.pdb index 4549571..ca9e41a 100644 Binary files a/Test2/bin/Debug/net5.0/Test2.pdb and b/Test2/bin/Debug/net5.0/Test2.pdb differ diff --git a/Test2/obj/Debug/net5.0/Test2.assets.cache b/Test2/obj/Debug/net5.0/Test2.assets.cache index b88c605..abb7629 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.assets.cache and b/Test2/obj/Debug/net5.0/Test2.assets.cache differ diff --git a/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache b/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache index 0e2a190..6b7caa7 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache and b/Test2/obj/Debug/net5.0/Test2.csprojAssemblyReference.cache differ diff --git a/Test2/obj/Debug/net5.0/Test2.dll b/Test2/obj/Debug/net5.0/Test2.dll index ec28545..c573e73 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.dll and b/Test2/obj/Debug/net5.0/Test2.dll differ diff --git a/Test2/obj/Debug/net5.0/Test2.pdb b/Test2/obj/Debug/net5.0/Test2.pdb index 4549571..ca9e41a 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.pdb and b/Test2/obj/Debug/net5.0/Test2.pdb differ diff --git a/Test2/obj/Test2.csproj.nuget.dgspec.json b/Test2/obj/Test2.csproj.nuget.dgspec.json index 348409a..f6dc323 100644 --- a/Test2/obj/Test2.csproj.nuget.dgspec.json +++ b/Test2/obj/Test2.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": {} + "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj": { - "version": "1.0.0", + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "version": "0.0.3", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", - "projectName": "STPClient", - "projectPath": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\STPClient\\obj\\", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectName": "DataClient", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClient\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -74,25 +75,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": { + "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "projectName": "Test2", - "projectPath": "E:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Test2\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Test2\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -108,8 +110,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj" + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -148,7 +150,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/Test2.csproj.nuget.g.props b/Test2/obj/Test2.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/Test2/obj/Test2.csproj.nuget.g.props +++ b/Test2/obj/Test2.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Test2/obj/project.assets.json b/Test2/obj/project.assets.json index 4e833d7..ff54544 100644 --- a/Test2/obj/project.assets.json +++ b/Test2/obj/project.assets.json @@ -113,7 +113,7 @@ "lib/net5.0/NLog.Extensions.Logging.dll": {} } }, - "STPClient/1.0.0": { + "DataClient/0.0.3": { "type": "project", "framework": ".NETCoreApp,Version=v5.0", "dependencies": { @@ -122,10 +122,10 @@ "Newtonsoft.Json": "13.0.1" }, "compile": { - "bin/placeholder/STPClient.dll": {} + "bin/placeholder/DataClient.dll": {} }, "runtime": { - "bin/placeholder/STPClient.dll": {} + "bin/placeholder/DataClient.dll": {} } } } @@ -367,39 +367,41 @@ "nlog.extensions.logging.nuspec" ] }, - "STPClient/1.0.0": { + "DataClient/0.0.3": { "type": "project", - "path": "../STPClient/STPClient.csproj", - "msbuildProject": "../STPClient/STPClient.csproj" + "path": "../DataClient/DataClient.csproj", + "msbuildProject": "../DataClient/DataClient.csproj" } }, "projectFileDependencyGroups": { "net5.0": [ + "DataClient >= 0.0.3", "NLog >= 4.7.10", - "NLog.Extensions.Logging >= 1.7.2", - "STPClient >= 1.0.0" + "NLog.Extensions.Logging >= 1.7.2" ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "projectName": "Test2", - "projectPath": "E:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Test2\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Test2\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -415,8 +417,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\STPClient\\STPClient.csproj" + "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -455,7 +457,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/project.nuget.cache b/Test2/obj/project.nuget.cache index 3015c95..903f4de 100644 --- a/Test2/obj/project.nuget.cache +++ b/Test2/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "4uSTFIfT5ALuuLduPST5+bzo6EtWcr7wauqXwJNr1les3S2MFImkfJI1D3YCkGB4XCLQl9juPBv0/47ozBV/1A==", + "dgSpecHash": "HhmSRaWdg6GJzveREREh4I6l8jtRdUwLBMWV/9wd89PVj6NuodYu7Nx5js8D/6uwoLtiRHDPF6/kAFeVHlQ5pg==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.0\\microsoft.extensions.dependencyinjection.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.0\\microsoft.extensions.primitives.5.0.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\newtonsoft.json\\13.0.1\\newtonsoft.json.13.0.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\nlog\\4.7.10\\nlog.4.7.10.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\nlog.extensions.logging\\1.7.2\\nlog.extensions.logging.1.7.2.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/Tests/Program.cs b/Tests/Program.cs index c13e75d..f40f1bc 100644 --- a/Tests/Program.cs +++ b/Tests/Program.cs @@ -369,8 +369,8 @@ namespace Tests static void test14() { var total = new List<(ushort, Protect)>(); - var ts = new DateTime(2021, 05, 10); - var te = new DateTime(2021, 05, 25); + var ts = new DateTime(2021, 05, 17); + var te = new DateTime(2021, 05, 28); var a = new STPClient(); var vdp = new ushort[] { 3, 4, 5, 6, 8, 10, 17, 18, 33, 39, 40, 43, 44 }; foreach(var v in vdp) diff --git a/Tests/bin/Debug/netcoreapp3.1/03.txt b/Tests/bin/Debug/netcoreapp3.1/03.txt index d0b0b87..653f8e3 100644 --- a/Tests/bin/Debug/netcoreapp3.1/03.txt +++ b/Tests/bin/Debug/netcoreapp3.1/03.txt @@ -1,7 +1,3 @@ -2021-05-14 04:25:42.9 035 Отс. связь ГМП 01 -2021-05-14 04:25:48.4 035 Отс. связь ГМП 00 -2021-05-16 02:46:32.2 105 Отс. связь AB 01 -2021-05-16 02:46:32.6 105 Отс. связь AB 00 2021-05-17 22:19:34.5 035 Отс. связь ГМП 01 2021-05-17 22:19:36.2 035 Отс. связь ГМП 00 2021-05-18 14:42:13.5 035 Отс. связь ГМП 01 @@ -12,3 +8,11 @@ 2021-05-23 03:12:37.2 035 Отс. связь ГМП 00 2021-05-24 20:56:41.0 035 Отс. связь ГМП 01 2021-05-24 20:56:46.5 035 Отс. связь ГМП 00 +2021-05-25 20:42:30.1 035 Отс. связь ГМП 01 +2021-05-25 20:42:35.6 035 Отс. связь ГМП 00 +2021-05-26 00:00:00.3 105 Отс. связь AB 01 +2021-05-26 00:00:00.6 105 Отс. связь AB 00 +2021-05-27 06:42:07.1 035 Отс. связь ГМП 01 +2021-05-27 06:42:12.6 035 Отс. связь ГМП 00 +2021-05-27 14:51:46.2 035 Отс. связь ГМП 01 +2021-05-27 14:51:51.7 035 Отс. связь ГМП 00 diff --git a/Tests/bin/Debug/netcoreapp3.1/10.txt b/Tests/bin/Debug/netcoreapp3.1/10.txt index b1cfe51..72f9ba8 100644 --- a/Tests/bin/Debug/netcoreapp3.1/10.txt +++ b/Tests/bin/Debug/netcoreapp3.1/10.txt @@ -1,8 +1,8 @@ -2021-05-14 02:15:45.1 105 Отс. связь AB 01 -2021-05-14 02:15:45.4 105 Отс. связь AB 00 2021-05-17 09:58:39.9 035 Отс. связь ГМП 01 2021-05-17 10:07:04.5 035 Отс. связь ГМП 00 2021-05-22 01:00:38.6 035 Отс. связь ГМП 01 2021-05-22 01:00:44.1 035 Отс. связь ГМП 00 2021-05-22 12:14:53.7 035 Отс. связь ГМП 01 2021-05-22 12:14:59.2 035 Отс. связь ГМП 00 +2021-05-25 14:01:20.3 035 Отс. связь ГМП 01 +2021-05-25 14:01:32.1 035 Отс. связь ГМП 00 diff --git a/Tests/bin/Debug/netcoreapp3.1/DataClients.dll b/Tests/bin/Debug/netcoreapp3.1/DataClients.dll index 17fe9db..ddeda4e 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/DataClients.dll and b/Tests/bin/Debug/netcoreapp3.1/DataClients.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/DataClients.pdb b/Tests/bin/Debug/netcoreapp3.1/DataClients.pdb index 1961122..e0af495 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/DataClients.pdb and b/Tests/bin/Debug/netcoreapp3.1/DataClients.pdb differ diff --git a/Tests/bin/Debug/netcoreapp3.1/Mailing.dll b/Tests/bin/Debug/netcoreapp3.1/Mailing.dll index 5c3b6e3..6d04539 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/Mailing.dll and b/Tests/bin/Debug/netcoreapp3.1/Mailing.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/Mailing.pdb b/Tests/bin/Debug/netcoreapp3.1/Mailing.pdb index d283e24..23afad1 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/Mailing.pdb and b/Tests/bin/Debug/netcoreapp3.1/Mailing.pdb differ diff --git a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll index 97200de..59b6e57 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll and b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb index 61d2541..a360360 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb and b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.DocumentObjectModel.pdb differ diff --git a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll index 61a05e2..59e76df 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll and b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb index 1a44150..4cceeba 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb and b/Tests/bin/Debug/netcoreapp3.1/MigraDoc.Rendering.pdb differ diff --git a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll index 7bad3ea..18a927b 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll and b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb index 0f391d2..ac560c5 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb and b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.Charting.pdb differ diff --git a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.dll b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.dll index 4321e1b..6bee00e 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.dll and b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.pdb b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.pdb index 14e504b..2976c94 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/PdfSharp.pdb and b/Tests/bin/Debug/netcoreapp3.1/PdfSharp.pdb differ diff --git a/Tests/bin/Debug/netcoreapp3.1/Tests.dll b/Tests/bin/Debug/netcoreapp3.1/Tests.dll index 5f59e47..05c3a10 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/Tests.dll and b/Tests/bin/Debug/netcoreapp3.1/Tests.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/Tests.pdb b/Tests/bin/Debug/netcoreapp3.1/Tests.pdb index 6bec8f4..bf6df4b 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/Tests.pdb and b/Tests/bin/Debug/netcoreapp3.1/Tests.pdb differ diff --git a/Tests/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll b/Tests/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll index 7d289ce..0663904 100644 Binary files a/Tests/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll and b/Tests/bin/Debug/netcoreapp3.1/de/MigraDoc.Rendering.resources.dll differ diff --git a/Tests/bin/Debug/netcoreapp3.1/total.txt b/Tests/bin/Debug/netcoreapp3.1/total.txt index 5e673c8..742afe7 100644 --- a/Tests/bin/Debug/netcoreapp3.1/total.txt +++ b/Tests/bin/Debug/netcoreapp3.1/total.txt @@ -1,9 +1,3 @@ -2021-05-14 02:15:45.1 105 Отс. связь AB 01 <- vdp10 -2021-05-14 02:15:45.4 105 Отс. связь AB 00 <- vdp10 -2021-05-14 04:25:42.9 035 Отс. связь ГМП 01 <- vdp03 -2021-05-14 04:25:48.4 035 Отс. связь ГМП 00 <- vdp03 -2021-05-16 02:46:32.2 105 Отс. связь AB 01 <- vdp03 -2021-05-16 02:46:32.6 105 Отс. связь AB 00 <- vdp03 2021-05-17 09:58:39.9 035 Отс. связь ГМП 01 <- vdp10 2021-05-17 10:07:04.5 035 Отс. связь ГМП 00 <- vdp10 2021-05-17 11:25:48.1 035 Отс. связь ГМП 01 <- vdp17 @@ -24,3 +18,15 @@ 2021-05-23 03:12:37.2 035 Отс. связь ГМП 00 <- vdp03 2021-05-24 20:56:41.0 035 Отс. связь ГМП 01 <- vdp03 2021-05-24 20:56:46.5 035 Отс. связь ГМП 00 <- vdp03 +2021-05-25 14:01:20.3 035 Отс. связь ГМП 01 <- vdp10 +2021-05-25 14:01:32.1 035 Отс. связь ГМП 00 <- vdp10 +2021-05-25 20:42:30.1 035 Отс. связь ГМП 01 <- vdp03 +2021-05-25 20:42:35.6 035 Отс. связь ГМП 00 <- vdp03 +2021-05-26 00:00:00.3 105 Отс. связь AB 01 <- vdp03 +2021-05-26 00:00:00.6 105 Отс. связь AB 00 <- vdp03 +2021-05-26 11:44:42.8 035 Отс. связь ГМП 01 <- vdp04 +2021-05-26 11:44:43.4 035 Отс. связь ГМП 00 <- vdp04 +2021-05-27 06:42:07.1 035 Отс. связь ГМП 01 <- vdp03 +2021-05-27 06:42:12.6 035 Отс. связь ГМП 00 <- vdp03 +2021-05-27 14:51:46.2 035 Отс. связь ГМП 01 <- vdp03 +2021-05-27 14:51:51.7 035 Отс. связь ГМП 00 <- vdp03 diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache index 7d631a0..f7fba33 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache and b/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache differ diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache index 8f549ff..65970dd 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache and b/Tests/obj/Debug/netcoreapp3.1/Tests.csprojAssemblyReference.cache differ diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.dll b/Tests/obj/Debug/netcoreapp3.1/Tests.dll index 5f59e47..05c3a10 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.dll and b/Tests/obj/Debug/netcoreapp3.1/Tests.dll differ diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.pdb b/Tests/obj/Debug/netcoreapp3.1/Tests.pdb index 6bec8f4..bf6df4b 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.pdb and b/Tests/obj/Debug/netcoreapp3.1/Tests.pdb differ diff --git a/Tests/obj/Tests.csproj.nuget.dgspec.json b/Tests/obj/Tests.csproj.nuget.dgspec.json index 702a4ac..038c3eb 100644 --- a/Tests/obj/Tests.csproj.nuget.dgspec.json +++ b/Tests/obj/Tests.csproj.nuget.dgspec.json @@ -1,24 +1,25 @@ { "format": 1, "restore": { - "E:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": {} + "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": {} }, "projects": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -34,8 +35,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -75,25 +76,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -109,20 +111,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -157,25 +159,26 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -224,25 +227,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -258,14 +262,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -301,25 +305,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -335,8 +340,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -372,25 +377,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -439,25 +445,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -502,25 +509,26 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } }, - "E:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": { + "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "projectName": "Tests", - "projectPath": "E:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Tests\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Tests\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -536,23 +544,23 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -591,7 +599,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/Tests.csproj.nuget.g.props b/Tests/obj/Tests.csproj.nuget.g.props index 8aed690..471ec1a 100644 --- a/Tests/obj/Tests.csproj.nuget.g.props +++ b/Tests/obj/Tests.csproj.nuget.g.props @@ -5,14 +5,15 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ + C:\Users\google\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder PackageReference 5.9.0 - + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Tests/obj/project.assets.json b/Tests/obj/project.assets.json index fd07848..bcb6a0e 100644 --- a/Tests/obj/project.assets.json +++ b/Tests/obj/project.assets.json @@ -359,25 +359,27 @@ ] }, "packageFolders": { - "C:\\Users\\Admin\\.nuget\\packages\\": {}, + "C:\\Users\\google\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "E:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "projectName": "Tests", - "projectPath": "E:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", - "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", - "outputPath": "E:\\GIT\\ASCKU_PC\\Tests\\obj\\", + "projectPath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", + "outputPath": "D:\\GIT\\ASCKU_PC\\Tests\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ], "configFilePaths": [ - "C:\\Users\\Admin\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\google\\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", "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config" @@ -393,23 +395,23 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" + "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "E:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -448,7 +450,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.200\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/project.nuget.cache b/Tests/obj/project.nuget.cache index 0e54201..d1c05b3 100644 --- a/Tests/obj/project.nuget.cache +++ b/Tests/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "5222nuXn/3M7VpedSrAzS6O/gAgZVOs+MQypShH4h7hRKc7ODBZE+5uvgyZy62pYhfA5DWESJz/qUr60DQnu2w==", + "dgSpecHash": "+JVwZP7/0pLNGuHgZlzASiN8JWedGIGhi98le9dVNBxqkkn0YIfoy1/t55ebd/PW/fwEUZP6BzK0vbkfIdOJQw==", "success": true, - "projectFilePath": "E:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectFilePath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "expectedPackageFiles": [ - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", - "C:\\Users\\Admin\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" + "C:\\Users\\google\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.1\\microsoft.netcore.platforms.3.1.1.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\microsoft.win32.systemevents\\4.5.0\\microsoft.win32.systemevents.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.drawing.common\\4.5.0\\system.drawing.common.4.5.0.nupkg.sha512", + "C:\\Users\\google\\.nuget\\packages\\system.text.encoding.codepages\\4.7.1\\system.text.encoding.codepages.4.7.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file