diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo index 51a7543..038e525 100644 Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ diff --git a/ApiServer/ApiServer.csproj.user b/ApiServer/ApiServer.csproj.user index 7b2e2e2..19869ae 100644 --- a/ApiServer/ApiServer.csproj.user +++ b/ApiServer/ApiServer.csproj.user @@ -4,7 +4,7 @@ MvcControllerEmptyScaffolder root/Common/MVC/Controller ApiServer - D:\GIT\ASCKU_PC\ApiServer\Properties\PublishProfiles\FolderProfile.pubxml + F:\GIT\ASCKU_PC\ApiServer\Properties\PublishProfiles\FolderProfile.pubxml ProjectDebugger diff --git a/ApiServer/ApiStruct/Pasport.cs b/ApiServer/ApiStruct/Pasport.cs index 74e6252..b398cbc 100644 --- a/ApiServer/ApiStruct/Pasport.cs +++ b/ApiServer/ApiStruct/Pasport.cs @@ -6,27 +6,26 @@ using DataClient.Struct; namespace ApiServer.ApiStruct { - public class PasportCheckRep + public class PasportCheckApi { - public bool HasData { get; set; } + public bool Status { get; set; } public DateTime DateAndTime { get; set; } public string Name { get; set; } } - public class PasportCheckReq + public class PasportCheckClient { - public bool Status { get; set; } = true; + public bool Status { get; set; } public bool Exist { get; set; } + public ulong PaspSum { get; set; } + } + public class PasportCreateApi + { + public bool Status { get; set; } public Pasport Pasp { get; set; } } - public class PasportCreateRep + public class PasportCreateClient { - public bool HasData { get; set; } - public DateTime DateAndTime { get; set; } - public string Name { get; set; } - public Pasport Pasp { get; set; } - } - public class PasportCreateReq - { - public bool Status { get; set; } = true; + public bool Status { get; set; } } + } diff --git a/ApiServer/Controllers/PasportController.cs b/ApiServer/Controllers/PasportController.cs index 230b2e5..c820b45 100644 --- a/ApiServer/Controllers/PasportController.cs +++ b/ApiServer/Controllers/PasportController.cs @@ -18,62 +18,89 @@ namespace ApiServer.Controllers public class PasportController : ControllerBase { private Logger log = LogManager.GetCurrentClassLogger(); + [HttpPost, Route("check")] - public PasportCheckReq Check([FromBody] object value) + public PasportCheckClient Check([FromBody] object value) { try { - var reply = JsonConvert.DeserializeObject(value.ToString()); - if (!reply.HasData || string.IsNullOrEmpty(reply.Name)) throw new Exception(); - + var getResult = JsonConvert.DeserializeObject(value.ToString()); + if (!getResult.Status || string.IsNullOrEmpty(getResult.Name)) + { + log.Warn("Wrong answer."); + return new PasportCheckClient(); + } + var paspName = - reply.DateAndTime.Hour.ToString("D2") + - reply.DateAndTime.Minute.ToString("D2") + - reply.DateAndTime.Second.ToString("D2") + - "-" + reply.Name; + getResult.DateAndTime.Hour.ToString("D2") + + getResult.DateAndTime.Minute.ToString("D2") + + getResult.DateAndTime.Second.ToString("D2") + + "-" + getResult.Name; var paspDir = Path.Combine( Directory.GetCurrentDirectory(), "data", "pasport", - reply.DateAndTime.Year.ToString("D4"), - reply.DateAndTime.Month.ToString("D2"), - reply.DateAndTime.Day.ToString("D2"), + getResult.DateAndTime.Year.ToString("D4"), + getResult.DateAndTime.Month.ToString("D2"), + getResult.DateAndTime.Day.ToString("D2"), paspName); - + log.Info("Search pasport: " + paspDir); if (!System.IO.File.Exists(paspDir)) - return new PasportCheckReq { Status = true, Exist = false }; - return new PasportCheckReq { Status = true, Exist = true, Pasp = new Pasport(System.IO.File.ReadAllBytes(paspDir)) }; + { + log.Info("Psport not exist: " + paspDir); + return new PasportCheckClient { Status = true, Exist = false, PaspSum = 0 }; + } + var pasport = System.IO.File.ReadAllBytes(paspDir); + ulong paspResult = 0; + foreach (var b in pasport) + paspResult += b; + log.Info("Send pasport size: " + paspResult + " | " + paspDir); + return new PasportCheckClient { Status = true, Exist = true, PaspSum = paspResult }; + } + catch(Exception e) + { + log.Warn(e); + return new PasportCheckClient(); } - catch { return new PasportCheckReq { Status = false }; } } [HttpPost, Route("create")] - public PasportCreateReq Create([FromBody] object value) + public PasportCreateClient Create([FromBody] object value) { try { - var reply = JsonConvert.DeserializeObject(value.ToString()); - if (!reply.HasData || string.IsNullOrEmpty(reply.Name)) throw new Exception(); - + var getResult = JsonConvert.DeserializeObject(value.ToString()); + if (!getResult.Status || + getResult.Pasp == null || + !getResult.Pasp.HasData) + { + log.Warn("Wrong answer."); + return new PasportCreateClient(); + } var paspName = - reply.DateAndTime.Hour.ToString("D2") + - reply.DateAndTime.Minute.ToString("D2") + - reply.DateAndTime.Second.ToString("D2") + - "-" + reply.Name; + getResult.Pasp.dEnd.Value.Hour.ToString("D2") + + getResult.Pasp.dEnd.Value.Minute.ToString("D2") + + getResult.Pasp.dEnd.Value.Second.ToString("D2") + + "-" + (string.IsNullOrEmpty(getResult.Pasp.nplav) ? + getResult.Pasp.numVDP.Value.ToString("D2") : + getResult.Pasp.nplav); var dir = Path.Combine( Directory.GetCurrentDirectory(), "data", "pasport", - reply.DateAndTime.Year.ToString("D4"), - reply.DateAndTime.Month.ToString("D2"), - reply.DateAndTime.Day.ToString("D2")); + getResult.Pasp.dEnd.Value.Year.ToString("D4"), + getResult.Pasp.dEnd.Value.Month.ToString("D2"), + getResult.Pasp.dEnd.Value.Day.ToString("D2")); var paspDir = Path.Combine(dir, paspName); - if (!Directory.Exists(dir)) Directory.CreateDirectory(dir); - System.IO.File.WriteAllBytes(paspDir, reply.Pasp.PaspByte); - - return new PasportCreateReq { Status = true }; + System.IO.File.WriteAllBytes(paspDir, getResult.Pasp.PaspByte); + log.Info("Save pasport: " + paspDir); + return new PasportCreateClient { Status = true }; + } + catch (Exception e) + { + log.Warn(e); + return new PasportCreateClient(); } - catch { return new PasportCreateReq { Status = false }; } } } diff --git a/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user b/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user index dd63e10..a47692e 100644 --- a/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ApiServer/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2021-07-31T12:43:14.2797709Z;False|2021-07-31T17:41:49.3152422+05:00;True|2021-07-31T14:07:45.4057263+05:00;False|2021-07-31T13:53:38.4952669+05:00; - <_PublishTargetUrl>D:\GIT\ASCKU_PC\ApiServer\bin\Release\ + True|2021-08-01T14:33:24.0605718Z;True|2021-08-01T19:29:09.0622642+05:00;True|2021-08-01T16:14:00.2837619+05:00;True|2021-07-31T17:43:14.2797709+05:00;False|2021-07-31T17:41:49.3152422+05:00;True|2021-07-31T14:07:45.4057263+05:00;False|2021-07-31T13:53:38.4952669+05:00; + <_PublishTargetUrl>F:\GIT\ASCKU_PC\ApiServer\bin\Release\ \ No newline at end of file diff --git a/ApiServer/bin/Release/ApiServer.dll b/ApiServer/bin/Release/ApiServer.dll index bd1acbf..7ec6389 100644 Binary files a/ApiServer/bin/Release/ApiServer.dll and b/ApiServer/bin/Release/ApiServer.dll differ diff --git a/ApiServer/bin/Release/ApiServer.exe b/ApiServer/bin/Release/ApiServer.exe index b796af4..055a749 100644 Binary files a/ApiServer/bin/Release/ApiServer.exe and b/ApiServer/bin/Release/ApiServer.exe differ diff --git a/ApiServer/bin/Release/ApiServer.pdb b/ApiServer/bin/Release/ApiServer.pdb index cae18c9..90dff67 100644 Binary files a/ApiServer/bin/Release/ApiServer.pdb and b/ApiServer/bin/Release/ApiServer.pdb differ diff --git a/ApiServer/bin/Release/DataClient.dll b/ApiServer/bin/Release/DataClient.dll index 117ed48..4e3dc96 100644 Binary files a/ApiServer/bin/Release/DataClient.dll and b/ApiServer/bin/Release/DataClient.dll differ diff --git a/ApiServer/bin/Release/DataClient.pdb b/ApiServer/bin/Release/DataClient.pdb index 6ca4778..4da4ec6 100644 Binary files a/ApiServer/bin/Release/DataClient.pdb and b/ApiServer/bin/Release/DataClient.pdb differ diff --git a/ApiServer/bin/Release/net5.0/ApiServer.dll b/ApiServer/bin/Release/net5.0/ApiServer.dll index bd1acbf..7ec6389 100644 Binary files a/ApiServer/bin/Release/net5.0/ApiServer.dll and b/ApiServer/bin/Release/net5.0/ApiServer.dll differ diff --git a/ApiServer/bin/Release/net5.0/ApiServer.exe b/ApiServer/bin/Release/net5.0/ApiServer.exe index b796af4..055a749 100644 Binary files a/ApiServer/bin/Release/net5.0/ApiServer.exe and b/ApiServer/bin/Release/net5.0/ApiServer.exe differ diff --git a/ApiServer/bin/Release/net5.0/ApiServer.pdb b/ApiServer/bin/Release/net5.0/ApiServer.pdb index cae18c9..90dff67 100644 Binary files a/ApiServer/bin/Release/net5.0/ApiServer.pdb and b/ApiServer/bin/Release/net5.0/ApiServer.pdb differ diff --git a/ApiServer/bin/Release/net5.0/ApiServer.runtimeconfig.dev.json b/ApiServer/bin/Release/net5.0/ApiServer.runtimeconfig.dev.json index ea4326b..cb610d9 100644 --- a/ApiServer/bin/Release/net5.0/ApiServer.runtimeconfig.dev.json +++ b/ApiServer/bin/Release/net5.0/ApiServer.runtimeconfig.dev.json @@ -1,11 +1,10 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\google\\.nuget\\packages", + "C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Admin\\.nuget\\packages", "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet" ] } } \ No newline at end of file diff --git a/ApiServer/bin/Release/net5.0/DataClient.dll b/ApiServer/bin/Release/net5.0/DataClient.dll index 117ed48..4e3dc96 100644 Binary files a/ApiServer/bin/Release/net5.0/DataClient.dll and b/ApiServer/bin/Release/net5.0/DataClient.dll differ diff --git a/ApiServer/bin/Release/net5.0/DataClient.pdb b/ApiServer/bin/Release/net5.0/DataClient.pdb index 6ca4778..4da4ec6 100644 Binary files a/ApiServer/bin/Release/net5.0/DataClient.pdb and b/ApiServer/bin/Release/net5.0/DataClient.pdb differ diff --git a/ApiServer/bin/Release/net5.0/ref/ApiServer.dll b/ApiServer/bin/Release/net5.0/ref/ApiServer.dll index b02a52d..9fd470a 100644 Binary files a/ApiServer/bin/Release/net5.0/ref/ApiServer.dll and b/ApiServer/bin/Release/net5.0/ref/ApiServer.dll differ diff --git a/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json b/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json index a4da3df..5046b4d 100644 --- a/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json +++ b/ApiServer/obj/ApiServer.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": {} + "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": { + "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", "projectName": "ApiServer", - "projectPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -35,8 +34,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -78,26 +77,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { "version": "0.0.3", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "F:\\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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -153,7 +151,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/ApiServer/obj/ApiServer.csproj.nuget.g.props b/ApiServer/obj/ApiServer.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/ApiServer/obj/ApiServer.csproj.nuget.g.props +++ b/ApiServer/obj/ApiServer.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache b/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache index 2498030..7dd91e3 100644 Binary files a/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache and b/ApiServer/obj/Debug/net5.0/ApiServer.assets.cache differ diff --git a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache index bd3102d..50037aa 100644 Binary files a/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache and b/ApiServer/obj/Debug/net5.0/ApiServer.csproj.AssemblyReference.cache differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.assets.cache b/ApiServer/obj/Release/net5.0/ApiServer.assets.cache index 79d9899..dadf5b7 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.assets.cache and b/ApiServer/obj/Release/net5.0/ApiServer.assets.cache differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache b/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache index 3427cd7..f7eb24a 100644 --- a/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache +++ b/ApiServer/obj/Release/net5.0/ApiServer.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3105bb879a54082cdc433603df634090df709038 +d29ca1fc6ac51c211fa6b3f4cdcf6f83a5b03d11 diff --git a/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt b/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt index c1aa1b1..8335b3f 100644 --- a/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt +++ b/ApiServer/obj/Release/net5.0/ApiServer.csproj.FileListAbsolute.txt @@ -29,3 +29,34 @@ D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.dll D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ref\ApiServer.dll D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.pdb D:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.genruntimeconfig.cache +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\appsettings.Development.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\appsettings.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.exe +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\analog\default.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Config\config.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.deps.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.runtimeconfig.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.runtimeconfig.dev.json +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ref\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\ApiServer.pdb +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\NLog.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\ApiServer\bin\Release\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.GeneratedMSBuildEditorConfig.editorconfig +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.AssemblyInfo.cs +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.MvcApplicationPartsAssemblyInfo.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\staticwebassets\ApiServer.StaticWebAssets.Manifest.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\staticwebassets\ApiServer.StaticWebAssets.xml +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\scopedcss\bundle\ApiServer.styles.css +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.RazorTargetAssemblyInfo.cache +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.csproj.CopyComplete +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ref\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.pdb +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\ApiServer.genruntimeconfig.cache diff --git a/ApiServer/obj/Release/net5.0/ApiServer.dll b/ApiServer/obj/Release/net5.0/ApiServer.dll index bd1acbf..7ec6389 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.dll and b/ApiServer/obj/Release/net5.0/ApiServer.dll differ diff --git a/ApiServer/obj/Release/net5.0/ApiServer.genruntimeconfig.cache b/ApiServer/obj/Release/net5.0/ApiServer.genruntimeconfig.cache index abb2a20..6016326 100644 --- a/ApiServer/obj/Release/net5.0/ApiServer.genruntimeconfig.cache +++ b/ApiServer/obj/Release/net5.0/ApiServer.genruntimeconfig.cache @@ -1 +1 @@ -0a8c2f7fcebea58b73a53bb1c0a2aa1056202aba +b0f840db997650a7593b11f7a1ba44023edfe205 diff --git a/ApiServer/obj/Release/net5.0/ApiServer.pdb b/ApiServer/obj/Release/net5.0/ApiServer.pdb index cae18c9..90dff67 100644 Binary files a/ApiServer/obj/Release/net5.0/ApiServer.pdb and b/ApiServer/obj/Release/net5.0/ApiServer.pdb differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll index bd1acbf..7ec6389 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll and b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.dll differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.exe b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.exe index b796af4..055a749 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.exe and b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.exe differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb index cae18c9..90dff67 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb and b/ApiServer/obj/Release/net5.0/PubTmp/Out/ApiServer.pdb differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll index 117ed48..4e3dc96 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll and b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.dll differ diff --git a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb index 6ca4778..4da4ec6 100644 Binary files a/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb and b/ApiServer/obj/Release/net5.0/PubTmp/Out/DataClient.pdb differ diff --git a/ApiServer/obj/Release/net5.0/PublishOutputs.d3aa5e4bdb.txt b/ApiServer/obj/Release/net5.0/PublishOutputs.d3aa5e4bdb.txt new file mode 100644 index 0000000..dbc60fa --- /dev/null +++ b/ApiServer/obj/Release/net5.0/PublishOutputs.d3aa5e4bdb.txt @@ -0,0 +1,14 @@ +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\Config\analog\default.json +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\Config\config.json +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.exe +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\appsettings.Development.json +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\appsettings.json +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.deps.json +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.runtimeconfig.json +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\ApiServer.pdb +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\NLog.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\DataClient.dll +F:\GIT\ASCKU_PC\ApiServer\obj\Release\net5.0\PubTmp\Out\DataClient.pdb diff --git a/ApiServer/obj/Release/net5.0/apphost.exe b/ApiServer/obj/Release/net5.0/apphost.exe index b796af4..055a749 100644 Binary files a/ApiServer/obj/Release/net5.0/apphost.exe and b/ApiServer/obj/Release/net5.0/apphost.exe differ diff --git a/ApiServer/obj/Release/net5.0/ref/ApiServer.dll b/ApiServer/obj/Release/net5.0/ref/ApiServer.dll index b02a52d..9fd470a 100644 Binary files a/ApiServer/obj/Release/net5.0/ref/ApiServer.dll and b/ApiServer/obj/Release/net5.0/ref/ApiServer.dll differ diff --git a/ApiServer/obj/project.assets.json b/ApiServer/obj/project.assets.json index 37028cb..56b624c 100644 --- a/ApiServer/obj/project.assets.json +++ b/ApiServer/obj/project.assets.json @@ -381,27 +381,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", "projectName": "ApiServer", - "projectPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\ApiServer\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\ApiServer\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -417,8 +415,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -460,7 +458,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/ApiServer/obj/project.nuget.cache b/ApiServer/obj/project.nuget.cache index e0d707e..e419834 100644 --- a/ApiServer/obj/project.nuget.cache +++ b/ApiServer/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "hTY5ZT/WYp2p43FfX3KnXAnDiB/J5VtZtww7gAIXsFl9arYKmuE7Kv3LxQJ/AR8R5Z4ajxBuJMpvWXDq7mxwrA==", + "dgSpecHash": "c7G+nOZ81H331zux09OXgbP7HT0d7L0fH0RWR7PzDQiuRE4M8wC0X3SJ0DcA3WX51Fx127vns1AXmLvzg6K8jQ==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\ApiServer\\ApiServer.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file diff --git a/ClientCollector/ClientCollector.csproj.user b/ClientCollector/ClientCollector.csproj.user index f40e2d6..fc70844 100644 --- a/ClientCollector/ClientCollector.csproj.user +++ b/ClientCollector/ClientCollector.csproj.user @@ -1,6 +1,6 @@  - <_LastSelectedProfileId>D:\GIT\ASCKU_PC\ClientCollector\Properties\PublishProfiles\FolderProfile.pubxml + <_LastSelectedProfileId>F:\GIT\ASCKU_PC\ClientCollector\Properties\PublishProfiles\FolderProfile.pubxml \ No newline at end of file diff --git a/ClientCollector/Pasport.cs b/ClientCollector/Pasport.cs index 74e6252..b398cbc 100644 --- a/ClientCollector/Pasport.cs +++ b/ClientCollector/Pasport.cs @@ -6,27 +6,26 @@ using DataClient.Struct; namespace ApiServer.ApiStruct { - public class PasportCheckRep + public class PasportCheckApi { - public bool HasData { get; set; } + public bool Status { get; set; } public DateTime DateAndTime { get; set; } public string Name { get; set; } } - public class PasportCheckReq + public class PasportCheckClient { - public bool Status { get; set; } = true; + public bool Status { get; set; } public bool Exist { get; set; } + public ulong PaspSum { get; set; } + } + public class PasportCreateApi + { + public bool Status { get; set; } public Pasport Pasp { get; set; } } - public class PasportCreateRep + public class PasportCreateClient { - public bool HasData { get; set; } - public DateTime DateAndTime { get; set; } - public string Name { get; set; } - public Pasport Pasp { get; set; } - } - public class PasportCreateReq - { - public bool Status { get; set; } = true; + public bool Status { get; set; } } + } diff --git a/ClientCollector/Program.cs b/ClientCollector/Program.cs index e126ad4..694b521 100644 --- a/ClientCollector/Program.cs +++ b/ClientCollector/Program.cs @@ -13,6 +13,7 @@ using ApiServer.ApiStruct; using Newtonsoft.Json; using System.Text; using System.IO; +using System.Collections.Generic; namespace ClientCollector { @@ -24,148 +25,136 @@ namespace ClientCollector { LogConf(); log.Info("Start Client Collector."); - while (true) + Task taskPasp = null; + while (true) + { + if (taskPasp == null || taskPasp.IsCompleted) + { + log.Info("Start Pasport Task."); + taskPasp = Task.Run(WorkPasport); + } + log.Info("Wait tasks."); + Task.WaitAny(new Task[] { taskPasp }); + } + } + + static async void WorkPasport() + { + var nameCurrDate = "pasport"; + var currDate = GetCurrData(nameCurrDate); + if (!currDate.HasValue) + currDate = new DateTime(2001, 01, 01); + NETClient netClient = new NETClient("10.10.45.152", 1070); + while (currDate.Value < DateTime.Now.AddDays(-1)) { - NETClient nc = new NETClient("10.10.45.152", 1070); try { - log.Info("Get Years."); - var dir_1lvl = nc.Full_Dir_Browse(); - foreach (var dir_1lvl_val in dir_1lvl) - { - if (dir_1lvl_val == "current") continue; - log.Info("Get Month of " + dir_1lvl_val + "."); - var dir_2lvl = nc.Full_Dir_Browse(dir_1lvl_val); - foreach (var dir_2lvl_val in dir_2lvl) + var currDir = + currDate.Value.Year.ToString("D4") + '/' + + currDate.Value.Month.ToString("D2") + '/' + + currDate.Value.Day.ToString("D2"); + log.Info("Get pasports from: " + currDir); + while (!netClient.Connected()) + if (!netClient.Connect()) { - log.Info("Get Days of " + dir_2lvl_val + "."); - var dir_3lvl = nc.Full_Dir_Browse(dir_2lvl_val); - foreach (var dir_3lvl_val in dir_3lvl) - { - log.Info("Get Pasps of " + dir_3lvl_val + "."); - var pasp_list = nc.Full_Dir_Browse(dir_3lvl_val); - foreach (var pasp_dir in pasp_list) - { - int count = 0; - do - { - try - { - log.Info("Get Pasp " + pasp_dir + ". Try " + (count + 1)); - var pasp = nc.Full_Pasp_Download(pasp_dir); - if (pasp.HasData && SendPasport(pasp)) - { - log.Info("Send OK."); - break; - } - log.Warn("Can't send " + pasp_dir + "."); - Task.Delay(1000 * 60 * 5); - count = 0; - } - catch (Exception e) { log.Warn(e.Message); } - if (nc.Connect()) - { - nc.Close(); - count++; - } - else - { - log.Warn("Can't connect to STP."); - Task.Delay(1000 * 60 * 5); - count = 0; - } - } while (count < 5); - } - } + netClient.Close(); + log.Warn("Can't connect to STP."); + await Task.Delay(10000); } - } - - while (true) + var currPasports = netClient.Full_Dir_Browse(currDir); + netClient.Close(); + if (currPasports == null) + currPasports = Array.Empty(); + foreach (var paspDir in currPasports) { - log.Info("Wait next day."); - var currDate = DateTime.Now; - while (currDate.ToString("yyyy.MM.dd") == DateTime.Now.ToString("yyyy.MM.dd")) - Task.Delay(1000 * 60 * 60); - try + var count = 0; + do { - var dir_3lvl_val = - currDate.Year.ToString("D4") + "/" + - currDate.Month.ToString("D2") + "/" + - currDate.Day.ToString("D2"); - log.Info("Get Pasps of " + dir_3lvl_val + "."); - var pasp_list = nc.Full_Dir_Browse(dir_3lvl_val); - foreach (var pasp_dir in pasp_list) + try { - int count = 0; - do - { - try - { - log.Info("Get Pasp " + pasp_dir + ". Try " + (count + 1)); - var pasp = nc.Full_Pasp_Download(pasp_dir); - if (pasp.HasData && SendPasport(pasp)) - { - log.Info("Send OK."); - break; - } - log.Warn("Can't send " + pasp_dir + "."); - Task.Delay(1000 * 60 * 5); - count = 0; - } - catch (Exception e) { log.Warn(e.Message); } - if (nc.Connect()) - { - nc.Close(); - count++; - } - else + log.Info("Get pasport: " + paspDir + " try " + (count + 1)); + while (!netClient.Connected()) + if (!netClient.Connect()) { log.Warn("Can't connect to STP."); - Task.Delay(1000 * 60 * 5); - count = 0; + netClient.Close(); + await Task.Delay(10000); } - } while (count < 5); + var pasp = netClient.Full_Pasp_Download(paspDir); + netClient.Close(); + if (pasp == null || !pasp.HasData) + { + log.Warn("Can't get pasport."); + if (netClient.Connect()) + count++; + netClient.Close(); + await Task.Delay(10000); + continue; + } + while (SendPasport(pasp)) + { + log.Warn("Can't send pasp to API."); + await Task.Delay(10000); + } + break; + } + catch (Exception e) + { + log.Warn(e); + await Task.Delay(5000); } - currDate = DateTime.Now; - } - catch (Exception e) - { - log.Warn(e); - Task.Delay(1000 * 60 * 10); } + while (count < 5); } + SaveCurrData(nameCurrDate, currDate.Value); + currDate = currDate.Value.AddDays(1); } catch (Exception e) { log.Warn(e); - Task.Delay(1000 * 60 * 10); + await Task.Delay(1000 * 60 * 5); } - } + do + { + log.Info("Wait next day."); + await Task.Delay(1000 * 60 * 60); + } while (!(currDate.Value < DateTime.Now.AddDays(-1))); + currDate.Value.AddMonths(-1); + SaveCurrData(nameCurrDate, currDate.Value); } static bool SendPasport(Pasport pasp) { + HttpWebRequest GetRequest(string path, bool useProxy = true) + { + HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create(path); + clientReq.Method = "POST"; + clientReq.ContentType = "application/json; charset=utf-8"; + if (useProxy) + { + clientReq.Proxy = new WebProxy("194.226.128.245", 3128) + { + BypassProxyOnLocal = false, + Credentials = new NetworkCredential("user4", "user4") + }; + } + return clientReq; + } + try { { log.Info("Check pasport on remote API server."); var req = JsonConvert.SerializeObject( - new PasportCheckRep() + new PasportCheckApi() { - HasData = true, + Status = true, DateAndTime = pasp.dEnd.Value, - Name = string.IsNullOrEmpty(pasp.nplav) ? pasp.numVDP.Value.ToString() : pasp.nplav + Name = string.IsNullOrEmpty(pasp.nplav) ? pasp.numVDP.Value.ToString("D2") : pasp.nplav }); var reqArr = Encoding.UTF8.GetBytes(req); - HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create("https://vsmpo.mbucb.ru/api/pasport/check"); - clientReq.Method = "POST"; - clientReq.ContentType = "application/json; charset=utf-8"; - clientReq.Proxy = new WebProxy("194.226.128.245", 3128) - { - BypassProxyOnLocal = false, - Credentials = new NetworkCredential("user4", "user4") - }; + HttpWebRequest clientReq = GetRequest("https://vsmpo.mbucb.ru/api/pasport/check"); clientReq.ContentLength = reqArr.Length; using (var stream = clientReq.GetRequestStream()) { @@ -174,7 +163,6 @@ namespace ClientCollector string response = ""; using (var clientRes = (HttpWebResponse)clientReq.GetResponse()) { - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8)) { response = readStream.ReadToEnd(); @@ -182,31 +170,29 @@ namespace ClientCollector clientRes.Close(); } } - var rep = JsonConvert.DeserializeObject(response); + var rep = JsonConvert.DeserializeObject(response); if (!rep.Status) return false; - if (rep.Exist && rep.Pasp.PaspByte.SequenceEqual(pasp.PaspByte)) return true; + ulong paspSum = 0; + var paspArr = pasp.PaspByte; + foreach (var b in paspArr) + paspSum += b; + if (rep.Exist && rep.PaspSum == paspSum) return true; + if (!rep.Exist) + log.Info("API: Pasport not exist."); + if (rep.Exist && rep.PaspSum != paspSum) + log.Info("API: Wrong size pasport."); } - { log.Info("Send pasport to remote API server."); var req = JsonConvert.SerializeObject( - new PasportCreateRep() + new PasportCreateApi() { - HasData = true, - DateAndTime = pasp.dEnd.Value, - Name = string.IsNullOrEmpty(pasp.nplav) ? pasp.numVDP.Value.ToString() : pasp.nplav, + Status = true, Pasp = pasp }); var reqArr = Encoding.UTF8.GetBytes(req); - HttpWebRequest clientReq = (HttpWebRequest)WebRequest.Create("https://vsmpo.mbucb.ru/api/pasport/create"); - clientReq.Method = "POST"; - clientReq.ContentType = "application/json; charset=utf-8"; - clientReq.Proxy = new WebProxy("194.226.128.245", 3128) - { - BypassProxyOnLocal = false, - Credentials = new NetworkCredential("user4", "user4") - }; + HttpWebRequest clientReq = GetRequest("https://vsmpo.mbucb.ru/api/pasport/create"); clientReq.ContentLength = reqArr.Length; using (var stream = clientReq.GetRequestStream()) { @@ -215,7 +201,6 @@ namespace ClientCollector string response = ""; using (var clientRes = (HttpWebResponse)clientReq.GetResponse()) { - Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); using (var readStream = new StreamReader(clientRes.GetResponseStream(), Encoding.UTF8)) { response = readStream.ReadToEnd(); @@ -223,7 +208,7 @@ namespace ClientCollector clientRes.Close(); } } - var rep = JsonConvert.DeserializeObject(response); + var rep = JsonConvert.DeserializeObject(response); if (!rep.Status) return false; } return true; @@ -247,6 +232,77 @@ namespace ClientCollector conf.AddRule(LogLevel.Trace, LogLevel.Fatal, logcon); LogManager.Configuration = conf; } + static bool SaveCurrData(string name, DateTime currDate) + { + try + { + var fileForSave = Path.Combine(Directory.GetCurrentDirectory(), "currentState"); + var currStrings = Array.Empty(); + if (File.Exists(fileForSave)) + currStrings = File.ReadAllLines(fileForSave, Encoding.UTF8); + var newString = + name + ':' + + currDate.Year.ToString("D4") + + currDate.Month.ToString("D2") + + currDate.Day.ToString("D2"); + for (var i = 0; i < currStrings.Length; i++) + { + var splitString = currStrings[i].Split(':'); + if (splitString.Length != 2) continue; + if (splitString[0] != name) continue; + currStrings[i] = newString; + newString = null; + break; + } + if (!string.IsNullOrEmpty(newString)) + { + Array.Resize(ref currStrings, currStrings.Length + 1); + currStrings[currStrings.Length - 1] = newString; + } + File.WriteAllLines(fileForSave, currStrings, Encoding.UTF8); + return true; + } + catch (Exception e) + { + log.Warn(e); + return false; + } + } + static DateTime? GetCurrData(string name) + { + try + { + var file = Path.Combine(Directory.GetCurrentDirectory(), "currentState"); + if (!File.Exists(file)) + { + log.Info("State file not exist."); + return null; + } + var listStrings = File.ReadAllLines(file, Encoding.UTF8); + for(var i = 0; i < listStrings.Length; i++) + { + var splitString = listStrings[i].Split(':'); + if (splitString.Length != 2) continue; + if (splitString[0] != name) continue; + if ( + !int.TryParse(splitString[1].Substring(0, 4), out int year) || + !int.TryParse(splitString[1].Substring(4, 2), out int month) || + !int.TryParse(splitString[1].Substring(6, 2), out int day)) + { + log.Warn("Wron format state string."); + return null; + } + return new DateTime(year, month, day); + } + log.Info("State not exist."); + return null; + } + catch (Exception e) + { + log.Warn(e); + return null; + } + } } } diff --git a/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user b/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user index a6a4a10..632909f 100644 --- a/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ClientCollector/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,6 +4,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - True|2021-07-31T15:35:08.9408458Z;True|2021-07-31T20:20:29.0886405+05:00; + True|2021-08-01T14:27:43.9900600Z;True|2021-08-01T19:18:48.8000969+05:00;True|2021-08-01T19:15:19.9257002+05:00;True|2021-08-01T19:08:17.1315589+05:00;True|2021-07-31T20:35:08.9408458+05:00;True|2021-07-31T20:20:29.0886405+05:00; \ No newline at end of file diff --git a/ClientCollector/bin/Debug/net5.0/ClientCollector.dll b/ClientCollector/bin/Debug/net5.0/ClientCollector.dll index 3c9d33f..fb2c413 100644 Binary files a/ClientCollector/bin/Debug/net5.0/ClientCollector.dll and b/ClientCollector/bin/Debug/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/bin/Debug/net5.0/ClientCollector.exe b/ClientCollector/bin/Debug/net5.0/ClientCollector.exe index 579b8cc..750a361 100644 Binary files a/ClientCollector/bin/Debug/net5.0/ClientCollector.exe and b/ClientCollector/bin/Debug/net5.0/ClientCollector.exe differ diff --git a/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb b/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb index 844f4b3..aa5324b 100644 Binary files a/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb and b/ClientCollector/bin/Debug/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/bin/Debug/net5.0/ClientCollector.runtimeconfig.dev.json b/ClientCollector/bin/Debug/net5.0/ClientCollector.runtimeconfig.dev.json index ea4326b..cb610d9 100644 --- a/ClientCollector/bin/Debug/net5.0/ClientCollector.runtimeconfig.dev.json +++ b/ClientCollector/bin/Debug/net5.0/ClientCollector.runtimeconfig.dev.json @@ -1,11 +1,10 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\google\\.nuget\\packages", + "C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Admin\\.nuget\\packages", "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet" ] } } \ No newline at end of file diff --git a/ClientCollector/bin/Debug/net5.0/DataClient.dll b/ClientCollector/bin/Debug/net5.0/DataClient.dll index 3716908..9671c62 100644 Binary files a/ClientCollector/bin/Debug/net5.0/DataClient.dll and b/ClientCollector/bin/Debug/net5.0/DataClient.dll differ diff --git a/ClientCollector/bin/Debug/net5.0/DataClient.pdb b/ClientCollector/bin/Debug/net5.0/DataClient.pdb index 2b4f6f7..3f3ff98 100644 Binary files a/ClientCollector/bin/Debug/net5.0/DataClient.pdb and b/ClientCollector/bin/Debug/net5.0/DataClient.pdb differ diff --git a/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll b/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll index c61ad8d..a1a0689 100644 Binary files a/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll and b/ClientCollector/bin/Debug/net5.0/ref/ClientCollector.dll differ diff --git a/ClientCollector/bin/Release/ClientCollector.dll b/ClientCollector/bin/Release/ClientCollector.dll index ecedb0b..50ad41c 100644 Binary files a/ClientCollector/bin/Release/ClientCollector.dll and b/ClientCollector/bin/Release/ClientCollector.dll differ diff --git a/ClientCollector/bin/Release/ClientCollector.exe b/ClientCollector/bin/Release/ClientCollector.exe index 579b8cc..750a361 100644 Binary files a/ClientCollector/bin/Release/ClientCollector.exe and b/ClientCollector/bin/Release/ClientCollector.exe differ diff --git a/ClientCollector/bin/Release/ClientCollector.pdb b/ClientCollector/bin/Release/ClientCollector.pdb index 1890a32..fdb8019 100644 Binary files a/ClientCollector/bin/Release/ClientCollector.pdb and b/ClientCollector/bin/Release/ClientCollector.pdb differ diff --git a/ClientCollector/bin/Release/DataClient.dll b/ClientCollector/bin/Release/DataClient.dll index 117ed48..4e3dc96 100644 Binary files a/ClientCollector/bin/Release/DataClient.dll and b/ClientCollector/bin/Release/DataClient.dll differ diff --git a/ClientCollector/bin/Release/DataClient.pdb b/ClientCollector/bin/Release/DataClient.pdb index 6ca4778..4da4ec6 100644 Binary files a/ClientCollector/bin/Release/DataClient.pdb and b/ClientCollector/bin/Release/DataClient.pdb differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.dll b/ClientCollector/bin/Release/net5.0/ClientCollector.dll index ecedb0b..50ad41c 100644 Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.dll and b/ClientCollector/bin/Release/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.exe b/ClientCollector/bin/Release/net5.0/ClientCollector.exe index 579b8cc..750a361 100644 Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.exe and b/ClientCollector/bin/Release/net5.0/ClientCollector.exe differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.pdb b/ClientCollector/bin/Release/net5.0/ClientCollector.pdb index 1890a32..fdb8019 100644 Binary files a/ClientCollector/bin/Release/net5.0/ClientCollector.pdb and b/ClientCollector/bin/Release/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json b/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json index ea4326b..cb610d9 100644 --- a/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json +++ b/ClientCollector/bin/Release/net5.0/ClientCollector.runtimeconfig.dev.json @@ -1,11 +1,10 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\google\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\google\\.nuget\\packages", + "C:\\Users\\Admin\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Admin\\.nuget\\packages", "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet" ] } } \ No newline at end of file diff --git a/ClientCollector/bin/Release/net5.0/DataClient.dll b/ClientCollector/bin/Release/net5.0/DataClient.dll index 117ed48..4e3dc96 100644 Binary files a/ClientCollector/bin/Release/net5.0/DataClient.dll and b/ClientCollector/bin/Release/net5.0/DataClient.dll differ diff --git a/ClientCollector/bin/Release/net5.0/DataClient.pdb b/ClientCollector/bin/Release/net5.0/DataClient.pdb index 6ca4778..4da4ec6 100644 Binary files a/ClientCollector/bin/Release/net5.0/DataClient.pdb and b/ClientCollector/bin/Release/net5.0/DataClient.pdb differ diff --git a/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll b/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll index 6addea6..954da53 100644 Binary files a/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll and b/ClientCollector/bin/Release/net5.0/ref/ClientCollector.dll differ diff --git a/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json b/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json index c07389c..8b210a9 100644 --- a/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json +++ b/ClientCollector/obj/ClientCollector.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": {} + "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": { + "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", "projectName": "ClientCollector", - "projectPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -35,8 +34,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -75,26 +74,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { "version": "0.0.3", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "F:\\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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -150,7 +148,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/ClientCollector/obj/ClientCollector.csproj.nuget.g.props b/ClientCollector/obj/ClientCollector.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/ClientCollector/obj/ClientCollector.csproj.nuget.g.props +++ b/ClientCollector/obj/ClientCollector.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache index de8a6a4..3344e90 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache and b/ClientCollector/obj/Debug/net5.0/ClientCollector.assets.cache differ diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache index bd3102d..2aaaa32 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache and b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.AssemblyReference.cache differ diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.CoreCompileInputs.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.CoreCompileInputs.cache index 48a9459..a118b1c 100644 --- a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.CoreCompileInputs.cache +++ b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ca600f6453a6328134e1cf4f5631c7614d873558 +3cb6fb029cd592b5bb8875b7b57cbd9077b47c81 diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.FileListAbsolute.txt b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.FileListAbsolute.txt index 5662f60..0c04593 100644 --- a/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.FileListAbsolute.txt +++ b/ClientCollector/obj/Debug/net5.0/ClientCollector.csproj.FileListAbsolute.txt @@ -30,3 +30,35 @@ D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.dll D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ref\ClientCollector.dll D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.pdb D:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.genruntimeconfig.cache +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.exe +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Config\analog\default.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Config\config.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.deps.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.runtimeconfig.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.runtimeconfig.dev.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ref\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\ClientCollector.pdb +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.DependencyInjection.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Logging.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Options.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Microsoft.Extensions.Primitives.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\NLog.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\ClientCollector\bin\Debug\net5.0\DataClient.xml +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.GeneratedMSBuildEditorConfig.editorconfig +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.AssemblyInfo.cs +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.csproj.CopyComplete +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ref\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.pdb +F:\GIT\ASCKU_PC\ClientCollector\obj\Debug\net5.0\ClientCollector.genruntimeconfig.cache diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.dll b/ClientCollector/obj/Debug/net5.0/ClientCollector.dll index 3c9d33f..fb2c413 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.dll and b/ClientCollector/obj/Debug/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.genruntimeconfig.cache b/ClientCollector/obj/Debug/net5.0/ClientCollector.genruntimeconfig.cache index e06a85e..abc5d0f 100644 --- a/ClientCollector/obj/Debug/net5.0/ClientCollector.genruntimeconfig.cache +++ b/ClientCollector/obj/Debug/net5.0/ClientCollector.genruntimeconfig.cache @@ -1 +1 @@ -3059e59609f09ef6cd06323054f8ca266f28c046 +846560ec7c1e16455a5ab89cc5fed101f9ef4aea diff --git a/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb b/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb index 844f4b3..aa5324b 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb and b/ClientCollector/obj/Debug/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/obj/Debug/net5.0/apphost.exe b/ClientCollector/obj/Debug/net5.0/apphost.exe index 579b8cc..750a361 100644 Binary files a/ClientCollector/obj/Debug/net5.0/apphost.exe and b/ClientCollector/obj/Debug/net5.0/apphost.exe differ diff --git a/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll b/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll index c61ad8d..a1a0689 100644 Binary files a/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll and b/ClientCollector/obj/Debug/net5.0/ref/ClientCollector.dll differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache index 347fca8..ae735ec 100644 Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache and b/ClientCollector/obj/Release/net5.0/ClientCollector.assets.cache differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache index 949835e..9237baf 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -381935b869564bcce9839e36dd6b31f277b4f257 +5e9419778287ec5b4cc0bdffcb19831a1be63478 diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt index 73dd0c4..687bb22 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.csproj.FileListAbsolute.txt @@ -29,3 +29,34 @@ D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.dll D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ref\ClientCollector.dll D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.pdb D:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.genruntimeconfig.cache +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.exe +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Config\analog\default.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Config\config.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.deps.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.runtimeconfig.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.runtimeconfig.dev.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ref\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\ClientCollector.pdb +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Configuration.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Logging.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Options.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Microsoft.Extensions.Primitives.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\NLog.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.GeneratedMSBuildEditorConfig.editorconfig +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.AssemblyInfo.cs +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.csproj.CopyComplete +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ref\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.pdb +F:\GIT\ASCKU_PC\ClientCollector\obj\Release\net5.0\ClientCollector.genruntimeconfig.cache diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.dll b/ClientCollector/obj/Release/net5.0/ClientCollector.dll index ecedb0b..50ad41c 100644 Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.dll and b/ClientCollector/obj/Release/net5.0/ClientCollector.dll differ diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache b/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache index e06a85e..abc5d0f 100644 --- a/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache +++ b/ClientCollector/obj/Release/net5.0/ClientCollector.genruntimeconfig.cache @@ -1 +1 @@ -3059e59609f09ef6cd06323054f8ca266f28c046 +846560ec7c1e16455a5ab89cc5fed101f9ef4aea diff --git a/ClientCollector/obj/Release/net5.0/ClientCollector.pdb b/ClientCollector/obj/Release/net5.0/ClientCollector.pdb index 1890a32..fdb8019 100644 Binary files a/ClientCollector/obj/Release/net5.0/ClientCollector.pdb and b/ClientCollector/obj/Release/net5.0/ClientCollector.pdb differ diff --git a/ClientCollector/obj/Release/net5.0/PublishOutputs.9ab9d0f8b6.txt b/ClientCollector/obj/Release/net5.0/PublishOutputs.9ab9d0f8b6.txt new file mode 100644 index 0000000..73cb15f --- /dev/null +++ b/ClientCollector/obj/Release/net5.0/PublishOutputs.9ab9d0f8b6.txt @@ -0,0 +1,19 @@ +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Config\analog\default.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Config\config.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.exe +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.deps.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.runtimeconfig.json +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\ClientCollector.pdb +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Configuration.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.DependencyInjection.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Logging.Abstractions.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Options.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Microsoft.Extensions.Primitives.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\Newtonsoft.Json.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\NLog.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\NLog.Extensions.Logging.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\DataClient.dll +F:\GIT\ASCKU_PC\ClientCollector\bin\Release\DataClient.pdb diff --git a/ClientCollector/obj/Release/net5.0/apphost.exe b/ClientCollector/obj/Release/net5.0/apphost.exe index 579b8cc..750a361 100644 Binary files a/ClientCollector/obj/Release/net5.0/apphost.exe and b/ClientCollector/obj/Release/net5.0/apphost.exe differ diff --git a/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll b/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll index 6addea6..954da53 100644 Binary files a/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll and b/ClientCollector/obj/Release/net5.0/ref/ClientCollector.dll differ diff --git a/ClientCollector/obj/project.assets.json b/ClientCollector/obj/project.assets.json index 35a9a2b..29ac99e 100644 --- a/ClientCollector/obj/project.assets.json +++ b/ClientCollector/obj/project.assets.json @@ -381,27 +381,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", "projectName": "ClientCollector", - "projectPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -417,8 +415,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -457,7 +455,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/ClientCollector/obj/project.nuget.cache b/ClientCollector/obj/project.nuget.cache index fbd02f0..8df6942 100644 --- a/ClientCollector/obj/project.nuget.cache +++ b/ClientCollector/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "4epxhxxqM5SAn5/9F6/bGIHXw5/ScXkV3Fnpxx1s5LXd8HLEicu36cn+HzGRnZuZrclSVkG7GSGYyc/b7S5lXA==", + "dgSpecHash": "zF3L4tiiP+J2PsAQ6ScS+0E49qIZFCv/pk/XinbS4FwOvm9eJ1+n3dvcrV6Ft+awfch4iiwEQEzKcRUdwv7vKA==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\ClientCollector\\ClientCollector.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file diff --git a/DataClient/bin/Debug/net5.0/DataClient.dll b/DataClient/bin/Debug/net5.0/DataClient.dll index 3716908..9671c62 100644 Binary files a/DataClient/bin/Debug/net5.0/DataClient.dll and b/DataClient/bin/Debug/net5.0/DataClient.dll differ diff --git a/DataClient/bin/Debug/net5.0/DataClient.pdb b/DataClient/bin/Debug/net5.0/DataClient.pdb index 2b4f6f7..3f3ff98 100644 Binary files a/DataClient/bin/Debug/net5.0/DataClient.pdb and b/DataClient/bin/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/bin/Release/net5.0/DataClient.dll b/DataClient/bin/Release/net5.0/DataClient.dll index 117ed48..4e3dc96 100644 Binary files a/DataClient/bin/Release/net5.0/DataClient.dll and b/DataClient/bin/Release/net5.0/DataClient.dll differ diff --git a/DataClient/bin/Release/net5.0/DataClient.pdb b/DataClient/bin/Release/net5.0/DataClient.pdb index 6ca4778..4da4ec6 100644 Binary files a/DataClient/bin/Release/net5.0/DataClient.pdb and b/DataClient/bin/Release/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/DataClient.csproj.nuget.dgspec.json b/DataClient/obj/DataClient.csproj.nuget.dgspec.json index e0d1429..4b1431a 100644 --- a/DataClient/obj/DataClient.csproj.nuget.dgspec.json +++ b/DataClient/obj/DataClient.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {} + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { "version": "0.0.3", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "F:\\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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -75,7 +74,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/DataClient.csproj.nuget.g.props b/DataClient/obj/DataClient.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/DataClient/obj/DataClient.csproj.nuget.g.props +++ b/DataClient/obj/DataClient.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/DataClient/obj/Debug/net5.0/DataClient.assets.cache b/DataClient/obj/Debug/net5.0/DataClient.assets.cache index 520dc20..aa7337b 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.assets.cache and b/DataClient/obj/Debug/net5.0/DataClient.assets.cache differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache b/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache index f6d27af..9a8b63a 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache and b/DataClient/obj/Debug/net5.0/DataClient.csproj.AssemblyReference.cache differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache b/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache index 614f848..de38ea1 100644 --- a/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache +++ b/DataClient/obj/Debug/net5.0/DataClient.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -dd97bd7f2ddb5e6bfbcd5e8344f0cae7dc566df2 +0f2e1ea3576304fbcc337f0bbd4183051ce17da1 diff --git a/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt b/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt index 75e1237..90f06a2 100644 --- a/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt +++ b/DataClient/obj/Debug/net5.0/DataClient.csproj.FileListAbsolute.txt @@ -13,3 +13,18 @@ D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.CoreCompileInputs. D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.dll D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\ref\DataClient.dll D:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\Config\analog\default.json +F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\Config\config.json +F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.deps.json +F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\ref\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\DataClient\bin\Debug\net5.0\DataClient.xml +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.AssemblyInfo.cs +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\ref\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\obj\Debug\net5.0\DataClient.pdb diff --git a/DataClient/obj/Debug/net5.0/DataClient.dll b/DataClient/obj/Debug/net5.0/DataClient.dll index 3716908..9671c62 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.dll and b/DataClient/obj/Debug/net5.0/DataClient.dll differ diff --git a/DataClient/obj/Debug/net5.0/DataClient.pdb b/DataClient/obj/Debug/net5.0/DataClient.pdb index 2b4f6f7..3f3ff98 100644 Binary files a/DataClient/obj/Debug/net5.0/DataClient.pdb and b/DataClient/obj/Debug/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/Release/net5.0/DataClient.assets.cache b/DataClient/obj/Release/net5.0/DataClient.assets.cache index ce3aa84..b1b6a35 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.assets.cache and b/DataClient/obj/Release/net5.0/DataClient.assets.cache differ diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache b/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache index f6d27af..fcb89c0 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache and b/DataClient/obj/Release/net5.0/DataClient.csproj.AssemblyReference.cache differ diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache b/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache index 42d4b32..4ddde6e 100644 --- a/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache +++ b/DataClient/obj/Release/net5.0/DataClient.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -85eae5e91d48b2b6604876303fc37a94b53d66ee +db412880e1fb8cee75e62101cd5b42d093035d00 diff --git a/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt b/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt index aaa8b72..acc7111 100644 --- a/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt +++ b/DataClient/obj/Release/net5.0/DataClient.csproj.FileListAbsolute.txt @@ -12,3 +12,17 @@ D:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.pdb D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.dll D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\ref\DataClient.dll D:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\Config\analog\default.json +F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\Config\config.json +F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.deps.json +F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\ref\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\bin\Release\net5.0\DataClient.pdb +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.AssemblyReference.cache +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.GeneratedMSBuildEditorConfig.editorconfig +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfoInputs.cache +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.AssemblyInfo.cs +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.csproj.CoreCompileInputs.cache +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\ref\DataClient.dll +F:\GIT\ASCKU_PC\DataClient\obj\Release\net5.0\DataClient.pdb diff --git a/DataClient/obj/Release/net5.0/DataClient.dll b/DataClient/obj/Release/net5.0/DataClient.dll index 117ed48..4e3dc96 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.dll and b/DataClient/obj/Release/net5.0/DataClient.dll differ diff --git a/DataClient/obj/Release/net5.0/DataClient.pdb b/DataClient/obj/Release/net5.0/DataClient.pdb index 6ca4778..4da4ec6 100644 Binary files a/DataClient/obj/Release/net5.0/DataClient.pdb and b/DataClient/obj/Release/net5.0/DataClient.pdb differ diff --git a/DataClient/obj/project.assets.json b/DataClient/obj/project.assets.json index b9d5841..1a0a914 100644 --- a/DataClient/obj/project.assets.json +++ b/DataClient/obj/project.assets.json @@ -361,27 +361,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "0.0.3", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "F:\\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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -437,7 +435,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/project.nuget.cache b/DataClient/obj/project.nuget.cache index 933b234..78d73f4 100644 --- a/DataClient/obj/project.nuget.cache +++ b/DataClient/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "Mbw4RYYlxmi+1Fh8rOiFVGe3aL09yjgvcEKpwC6SozQbKvlr1nwGK/Xx++SUKdbH/3Ze+xbOpcEh4lNVnAV66Q==", + "dgSpecHash": "lCVOnkDSpCDkY6mFU39PPTK/8UioIwkzLSm5l9U0BI9kmvrQU3GBEeKlZLkvo3I3Vmgv8BfwOMFxbII4ikrnzA==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file diff --git a/DataClients/obj/DataClients.csproj.nuget.dgspec.json b/DataClients/obj/DataClients.csproj.nuget.dgspec.json index 97a63ee..f713d96 100644 --- a/DataClients/obj/DataClients.csproj.nuget.dgspec.json +++ b/DataClients/obj/DataClients.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": {} + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -35,8 +34,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -76,26 +75,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -140,7 +138,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/DataClients.csproj.nuget.g.props b/DataClients/obj/DataClients.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/DataClients/obj/DataClients.csproj.nuget.g.props +++ b/DataClients/obj/DataClients.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/DataClients/obj/DataClients.csproj.nuget.g.targets b/DataClients/obj/DataClients.csproj.nuget.g.targets index f09823b..8f2d2d6 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 bfe4fad..02bae86 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/Release/netstandard2.0/DataClients.assets.cache b/DataClients/obj/Release/netstandard2.0/DataClients.assets.cache index c94224e..4fdc7b8 100644 Binary files a/DataClients/obj/Release/netstandard2.0/DataClients.assets.cache and b/DataClients/obj/Release/netstandard2.0/DataClients.assets.cache differ diff --git a/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache b/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache index 75d709b..1cc11da 100644 Binary files a/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache and b/DataClients/obj/Release/netstandard2.0/DataClients.csproj.AssemblyReference.cache differ diff --git a/DataClients/obj/project.assets.json b/DataClients/obj/project.assets.json index 7f0a2b3..64f2ee8 100644 --- a/DataClients/obj/project.assets.json +++ b/DataClients/obj/project.assets.json @@ -321,27 +321,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -357,8 +355,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -398,7 +396,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/project.nuget.cache b/DataClients/obj/project.nuget.cache index 9571376..c9f07a8 100644 --- a/DataClients/obj/project.nuget.cache +++ b/DataClients/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "pIGoDNRw4g3M23UekRPQOqZYtyeiyOf0EGgpw3FVGJT1W7fl8hQS+OlXtyeyHLp8bSurx/2g3YUcez1H9nO2Wg==", + "dgSpecHash": "Jx4UMAAsvJkZ+kUms9DHtVovb0p8Xu9CiAkFm801/gOSfERupzhTpmCqqA3eJA4Kluy6pj25MIa0rsKqVEe+DQ==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "expectedPackageFiles": [ - "C:\\Users\\google\\.nuget\\packages\\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" + "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" ], "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 874c649..cfa5733 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.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache index 835abb5..ec4bf63 100644 Binary files a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache and b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json index c0b33bf..4bed0d5 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": {} + "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -35,8 +34,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -76,26 +75,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": { + "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "projectName": "Korp90TimePasport", - "projectPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -111,8 +109,8 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" } } } @@ -147,26 +145,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -211,7 +208,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache index d6d7fcb..9549f55 100644 Binary files a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.assets.cache differ diff --git a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache index 317828f..cf83b4c 100644 Binary files a/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache and b/Korp90TimePasport/obj/Release/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache differ diff --git a/Korp90TimePasport/obj/project.assets.json b/Korp90TimePasport/obj/project.assets.json index 8f97393..00388ce 100644 --- a/Korp90TimePasport/obj/project.assets.json +++ b/Korp90TimePasport/obj/project.assets.json @@ -224,27 +224,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "projectName": "Korp90TimePasport", - "projectPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -260,8 +258,8 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" } } } @@ -296,7 +294,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/project.nuget.cache b/Korp90TimePasport/obj/project.nuget.cache index a7f6e8c..801d03a 100644 --- a/Korp90TimePasport/obj/project.nuget.cache +++ b/Korp90TimePasport/obj/project.nuget.cache @@ -1,13 +1,13 @@ { "version": 2, - "dgSpecHash": "hZRsYyq01MA93QfAePzOdPT2Snr9D/DYN608PxE1lsA6xsKuDldSyLDoJbQp7s9aR2OSeNpNDuiI3pXfiJOktA==", + "dgSpecHash": "tizkZ0Ysdd44pdYZUmokM3n1pLd+X36F8QIbewGPbBzcEE9AOxiJJ7sw+9GeXazssgleO65MTrKw5IrjzxgfSg==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.assets.cache index 4473545..58084fc 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.csproj.AssemblyReference.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache index 0c8b88c..f5e894a 100644 Binary files a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache and b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache differ diff --git a/Mailing/obj/Mailing.csproj.nuget.dgspec.json b/Mailing/obj/Mailing.csproj.nuget.dgspec.json index 03113a1..b0b4f86 100644 --- a/Mailing/obj/Mailing.csproj.nuget.dgspec.json +++ b/Mailing/obj/Mailing.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": {} + "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -35,8 +34,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -76,26 +75,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -111,20 +109,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -159,26 +157,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -227,26 +224,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -262,14 +258,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -305,26 +301,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -340,8 +335,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -377,26 +372,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -445,26 +439,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -509,7 +502,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/Mailing.csproj.nuget.g.props b/Mailing/obj/Mailing.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/Mailing/obj/Mailing.csproj.nuget.g.props +++ b/Mailing/obj/Mailing.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache b/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache index 9d6715f..145b5c0 100644 Binary files a/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache and b/Mailing/obj/Release/netcoreapp3.1/Mailing.assets.cache differ diff --git a/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache b/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache index 1682a0f..9b473e1 100644 Binary files a/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache and b/Mailing/obj/Release/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache differ diff --git a/Mailing/obj/project.assets.json b/Mailing/obj/project.assets.json index 146c4d7..b4a69a2 100644 --- a/Mailing/obj/project.assets.json +++ b/Mailing/obj/project.assets.json @@ -334,27 +334,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -370,20 +368,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -418,7 +416,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/project.nuget.cache b/Mailing/obj/project.nuget.cache index 811ff9d..bb3fe7f 100644 --- a/Mailing/obj/project.nuget.cache +++ b/Mailing/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "hCrXyQzrKUms6Wsbk21d9ZwTlw48VmF+P/endtztYFWwilgdxHKUrICOnOC0wLX1wufERLCT2R22q4m1nYIm6w==", + "dgSpecHash": "LJqCrJsyNB9LytCuT4dE39e7zbLIz6i/iKg/2yMtD+s0rFsro9NxxBVHLDsZsfBhQhHHeVcucr71wz0QRgMzUw==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file 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 241954e..12ffc88 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/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json index 3a657b7..dddbc15 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": {} + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -68,7 +67,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\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 efa942a..b7eb83f 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.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 f09823b..8f2d2d6 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/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache index 526f1be..58abf52 100644 Binary files a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.assets.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache new file mode 100644 index 0000000..f5e894a Binary files /dev/null and b/PrintPDF/MigraDoc.DocumentObjectModel/obj/Release/netstandard2.0/MigraDoc.DocumentObjectModel.csproj.AssemblyReference.cache differ diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json index 5af78bc..28aff03 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json @@ -222,27 +222,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -291,7 +289,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache index 92b0205..7132270 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "MUDhIjgexTf+6GbOY9N44CpOukt4UnZBlCMcsLDT77+qJtJ+6xH8YVAWm8R3Bxvw5wUlz5wXXv2oE6bHGNBzlg==", + "dgSpecHash": "IgtSa87a30hTEmvSKc+YQUdo7hLh+f0kinWAqI2x9y/d+BBwf6XycPkqhLgTg4VSidlGyKRIhW8xK0qIaHTsZw==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "expectedPackageFiles": [ - "C:\\Users\\google\\.nuget\\packages\\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" + "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" ], "logs": [] } \ No newline at end of file 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 6c6e3cc..d05f6cb 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/MigraDoc.Rendering.csproj.nuget.dgspec.json b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json index ebed55a..693aed0 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": {} + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -68,26 +67,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -103,14 +101,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -146,26 +144,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -181,8 +178,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -218,26 +215,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -286,7 +282,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\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 efa942a..b7eb83f 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.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 f09823b..8f2d2d6 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/Release/netstandard2.0/MigraDoc.Rendering.assets.cache b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.assets.cache index fcd49b0..0b1d017 100644 Binary files a/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.assets.cache and b/PrintPDF/MigraDoc.Rendering/obj/Release/netstandard2.0/MigraDoc.Rendering.assets.cache differ diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json index 5c28fc4..ad0fce5 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json +++ b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json @@ -280,27 +280,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -316,14 +314,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -359,7 +357,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache index fda1c17..af473d7 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "qNDXMcX1KM5nFiWVZKJvCHYB3cSFIooDp4QTAFWaQLPsPXGoj+6xR69FoS6fnh4A9zrAmtFvgxx3coZkfkfuMA==", + "dgSpecHash": "bDTnwokcp6TbOaajNaz0yXvVZ+HofXm9vgS5aE2/RwCzyNFEoATOOr89cFUsNtZBwCBijeGQWTYX9RAThLxU1A==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "expectedPackageFiles": [ - "C:\\Users\\google\\.nuget\\packages\\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" + "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" ], "logs": [] } \ No newline at end of file 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 7b0f304..84a0a65 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/PdfSharp.Charting.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json index b8f86d7..c9bf13d 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": {} + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -35,8 +34,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -72,26 +71,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -140,7 +138,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\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 efa942a..b7eb83f 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.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 f09823b..8f2d2d6 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/Release/netstandard2.0/PdfSharp.Charting.assets.cache b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.assets.cache index 9970db3..09fbad7 100644 Binary files a/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.assets.cache and b/PrintPDF/PdfSharp.Charting/obj/Release/netstandard2.0/PdfSharp.Charting.assets.cache differ diff --git a/PrintPDF/PdfSharp.Charting/obj/project.assets.json b/PrintPDF/PdfSharp.Charting/obj/project.assets.json index ef5da0f..97ad74d 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.assets.json +++ b/PrintPDF/PdfSharp.Charting/obj/project.assets.json @@ -241,27 +241,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -277,8 +275,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -314,7 +312,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache index 9f5d288..f0c350a 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "g0H1COJWrSNLDBy0dgwOYJXIh4ie3VdE9BLigtM6nd3El9zA7TPlczS+4C/c91iQrTE85/LDZ/tTHwondj3YOw==", + "dgSpecHash": "w6ImBakjanJ2rg89haorn71y5kBxVm6Ng5vEtZkR5Gjcg1UvrsoJk0aw86WoEzmJw76Uv7kaYT82eTMiYaQwgg==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "expectedPackageFiles": [ - "C:\\Users\\google\\.nuget\\packages\\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" + "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" ], "logs": [] } \ No newline at end of file diff --git a/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache b/PrintPDF/PdfSharp/obj/Debug/netstandard2.0/PdfSharp.assets.cache index 233265e..ab0fd11 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/PdfSharp.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json index dc43c77..f7a5cf8 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": {} + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -68,7 +67,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.targets index f09823b..8f2d2d6 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/Release/netstandard2.0/PdfSharp.assets.cache b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.assets.cache index 01161dc..7ff90b7 100644 Binary files a/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.assets.cache and b/PrintPDF/PdfSharp/obj/Release/netstandard2.0/PdfSharp.assets.cache differ diff --git a/PrintPDF/PdfSharp/obj/project.assets.json b/PrintPDF/PdfSharp/obj/project.assets.json index e6f04e8..f306a2b 100644 --- a/PrintPDF/PdfSharp/obj/project.assets.json +++ b/PrintPDF/PdfSharp/obj/project.assets.json @@ -222,27 +222,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -291,7 +289,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/project.nuget.cache b/PrintPDF/PdfSharp/obj/project.nuget.cache index 3dfa5d8..6cab9dd 100644 --- a/PrintPDF/PdfSharp/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp/obj/project.nuget.cache @@ -1,12 +1,12 @@ { "version": 2, - "dgSpecHash": "waRcxjc+cPubrMDdlTfuOZKTe2+oij45Dq89Q8rAEnAtdbj3lovKbNLyxiVy3cDMrAFlCVDUXF6D+GtWiecS6g==", + "dgSpecHash": "IBl924vmWiOYYnST8LHVzZeTj/m3S0bcbDhnrLu1O6YE4OWnIlS0w51gKWDAYci7lQVioY/598FEC/7aL1FmQg==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "expectedPackageFiles": [ - "C:\\Users\\google\\.nuget\\packages\\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" + "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" ], "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 0779812..f92b8ed 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/Release/netstandard2.0/SupportClasses.assets.cache b/SupportClasses/obj/Release/netstandard2.0/SupportClasses.assets.cache index ded4df4..7c32a34 100644 Binary files a/SupportClasses/obj/Release/netstandard2.0/SupportClasses.assets.cache and b/SupportClasses/obj/Release/netstandard2.0/SupportClasses.assets.cache differ diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json index 9dbb492..0c7564a 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": {} + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -64,7 +63,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets b/SupportClasses/obj/SupportClasses.csproj.nuget.g.targets index f09823b..8f2d2d6 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 f5202e7..05faccc 100644 --- a/SupportClasses/obj/project.assets.json +++ b/SupportClasses/obj/project.assets.json @@ -179,27 +179,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -244,7 +242,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/project.nuget.cache b/SupportClasses/obj/project.nuget.cache index 4f6d5cc..74ac946 100644 --- a/SupportClasses/obj/project.nuget.cache +++ b/SupportClasses/obj/project.nuget.cache @@ -1,11 +1,11 @@ { "version": 2, - "dgSpecHash": "DqE6H4mE9c0hWaSguBa6HoE1eCrl4TLsWHAJUThL98hOifgxJCw5vdRYNsBE3LJhvneLLAuh/TfSkGDCOVl+9A==", + "dgSpecHash": "BElZgcPGbiVwCCfXyLaJeUQgG/0stzHf7tJtt01Xw8l8kVI4Rl4V7heHc8pb/6oay3uMAySkdY5xvl544GQRoQ==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "expectedPackageFiles": [ - "C:\\Users\\google\\.nuget\\packages\\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\\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" ], "logs": [] } \ No newline at end of file diff --git a/Test2/obj/Debug/net5.0/Test2.assets.cache b/Test2/obj/Debug/net5.0/Test2.assets.cache index abb7629..198aec8 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.csproj.AssemblyReference.cache b/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache index ce25299..b58ce0d 100644 Binary files a/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache and b/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache differ diff --git a/Test2/obj/Release/net5.0/Test2.assets.cache b/Test2/obj/Release/net5.0/Test2.assets.cache index 55a5fe3..b67b109 100644 Binary files a/Test2/obj/Release/net5.0/Test2.assets.cache and b/Test2/obj/Release/net5.0/Test2.assets.cache differ diff --git a/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache b/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache index f6d27af..787c773 100644 Binary files a/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache and b/Test2/obj/Release/net5.0/Test2.csproj.AssemblyReference.cache differ diff --git a/Test2/obj/Test2.csproj.nuget.dgspec.json b/Test2/obj/Test2.csproj.nuget.dgspec.json index 1ee2bae..9e38287 100644 --- a/Test2/obj/Test2.csproj.nuget.dgspec.json +++ b/Test2/obj/Test2.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": {} + "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { "version": "0.0.3", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "F:\\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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -75,26 +74,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": { + "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "projectName": "Test2", - "projectPath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Test2\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -110,8 +108,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -150,7 +148,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/Test2.csproj.nuget.g.props b/Test2/obj/Test2.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/Test2/obj/Test2.csproj.nuget.g.props +++ b/Test2/obj/Test2.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Test2/obj/project.assets.json b/Test2/obj/project.assets.json index 674c65d..5a87004 100644 --- a/Test2/obj/project.assets.json +++ b/Test2/obj/project.assets.json @@ -381,27 +381,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "projectName": "Test2", - "projectPath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Test2\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -417,8 +415,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -457,7 +455,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/project.nuget.cache b/Test2/obj/project.nuget.cache index cd4b50c..6ed787b 100644 --- a/Test2/obj/project.nuget.cache +++ b/Test2/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "IURIdhZOA8rlzalHxvlaU2SWYWMZeEr0nmC36OnrsEwPri7Bk6BrfzxqANxqdpz3XjnY53gcFsBqITghSrDPdA==", + "dgSpecHash": "MPBroNfspZ1mtm2ln8dtFWS2ZmiLY7b8ztiR6Jg/ldi+wsG5wKDi1MIiI9GlsMyEiFtM5zNJzJdHDD4DfTO1gw==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.assets.cache index f7fba33..04133ca 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.csproj.AssemblyReference.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.csproj.AssemblyReference.cache index 1682a0f..8b013be 100644 Binary files a/Tests/obj/Debug/netcoreapp3.1/Tests.csproj.AssemblyReference.cache and b/Tests/obj/Debug/netcoreapp3.1/Tests.csproj.AssemblyReference.cache differ diff --git a/Tests/obj/Release/netcoreapp3.1/Tests.assets.cache b/Tests/obj/Release/netcoreapp3.1/Tests.assets.cache index 274cb66..a31f547 100644 Binary files a/Tests/obj/Release/netcoreapp3.1/Tests.assets.cache and b/Tests/obj/Release/netcoreapp3.1/Tests.assets.cache differ diff --git a/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache b/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache index 1392607..f5e894a 100644 Binary files a/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache and b/Tests/obj/Release/netcoreapp3.1/Tests.csproj.AssemblyReference.cache differ diff --git a/Tests/obj/Tests.csproj.nuget.dgspec.json b/Tests/obj/Tests.csproj.nuget.dgspec.json index 3420cc0..4a42649 100644 --- a/Tests/obj/Tests.csproj.nuget.dgspec.json +++ b/Tests/obj/Tests.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": {} + "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "projectName": "DataClients", - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\DataClients\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -35,8 +34,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj" } } } @@ -76,26 +75,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "projectName": "Mailing", - "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Mailing\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -111,20 +109,20 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -159,26 +157,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "projectName": "MigraDoc.DocumentObjectModel", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -227,26 +224,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "projectName": "MigraDoc.Rendering", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -262,14 +258,14 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -305,26 +301,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "projectName": "PdfSharp.Charting", - "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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -340,8 +335,8 @@ "netstandard2.0": { "targetAlias": "netstandard2.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -377,26 +372,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { "version": "3.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "projectName": "PdfSharp", - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -445,26 +439,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { + "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "projectName": "SupportClasses", - "projectPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -509,26 +502,25 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": { + "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "projectName": "Tests", - "projectPath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Tests\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -544,23 +536,23 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" + "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -599,7 +591,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/Tests.csproj.nuget.g.props b/Tests/obj/Tests.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/Tests/obj/Tests.csproj.nuget.g.props +++ b/Tests/obj/Tests.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/Tests/obj/project.assets.json b/Tests/obj/project.assets.json index 50cf513..5726389 100644 --- a/Tests/obj/project.assets.json +++ b/Tests/obj/project.assets.json @@ -359,27 +359,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "projectName": "Tests", - "projectPath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\Tests\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -395,23 +393,23 @@ "netcoreapp3.1": { "targetAlias": "netcoreapp3.1", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" + "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj" }, - "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" + "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj" }, - "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" + "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj" } } } @@ -450,7 +448,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/project.nuget.cache b/Tests/obj/project.nuget.cache index 3970f04..87152ef 100644 --- a/Tests/obj/project.nuget.cache +++ b/Tests/obj/project.nuget.cache @@ -1,14 +1,14 @@ { "version": 2, - "dgSpecHash": "2s4poUhkggsKl4knSgc2Gsu503QqjaOq+Mm2ZSXVkecmYegY7ZY34Mq9870zW26I03RalNC+aQG/T+QgLqOVIw==", + "dgSpecHash": "zK/4dC8hKqmLq51tC8l8/0202gukmtzSZfNBg4AgicoMz8gJJbvvmn/ofJMvJvVdR0W99DmmDNeS+DE5PcI1og==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "expectedPackageFiles": [ - "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" + "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" ], "logs": [] } \ No newline at end of file diff --git a/WebApplication1/obj/Debug/net5.0/WebApplication1.assets.cache b/WebApplication1/obj/Debug/net5.0/WebApplication1.assets.cache index c11d67b..f1b9e45 100644 Binary files a/WebApplication1/obj/Debug/net5.0/WebApplication1.assets.cache and b/WebApplication1/obj/Debug/net5.0/WebApplication1.assets.cache differ diff --git a/WebApplication1/obj/Debug/net5.0/WebApplication1.csproj.AssemblyReference.cache b/WebApplication1/obj/Debug/net5.0/WebApplication1.csproj.AssemblyReference.cache index 5966ae5..a475988 100644 Binary files a/WebApplication1/obj/Debug/net5.0/WebApplication1.csproj.AssemblyReference.cache and b/WebApplication1/obj/Debug/net5.0/WebApplication1.csproj.AssemblyReference.cache differ diff --git a/WebApplication1/obj/Release/net5.0/WebApplication1.assets.cache b/WebApplication1/obj/Release/net5.0/WebApplication1.assets.cache index 9f2e02c..6daa023 100644 Binary files a/WebApplication1/obj/Release/net5.0/WebApplication1.assets.cache and b/WebApplication1/obj/Release/net5.0/WebApplication1.assets.cache differ diff --git a/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache b/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache index 903b1cc..3faf0de 100644 Binary files a/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache and b/WebApplication1/obj/Release/net5.0/WebApplication1.csproj.AssemblyReference.cache differ diff --git a/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json b/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json index ade666f..60175ef 100644 --- a/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json +++ b/WebApplication1/obj/WebApplication1.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj": {} + "F:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj": { + "F:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", "projectName": "WebApplication1", - "projectPath": "D:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\WebApplication1\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\WebApplication1\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -64,7 +63,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/WebApplication1/obj/WebApplication1.csproj.nuget.g.props b/WebApplication1/obj/WebApplication1.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/WebApplication1/obj/WebApplication1.csproj.nuget.g.props +++ b/WebApplication1/obj/WebApplication1.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) diff --git a/WebApplication1/obj/project.assets.json b/WebApplication1/obj/project.assets.json index e4169f6..4361be6 100644 --- a/WebApplication1/obj/project.assets.json +++ b/WebApplication1/obj/project.assets.json @@ -8,27 +8,25 @@ "net5.0": [] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", "projectName": "WebApplication1", - "projectPath": "D:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\WebApplication1\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\WebApplication1\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -73,7 +71,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/WebApplication1/obj/project.nuget.cache b/WebApplication1/obj/project.nuget.cache index 595787c..4727bf9 100644 --- a/WebApplication1/obj/project.nuget.cache +++ b/WebApplication1/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "dnZAc8jsrigwNrd8Yop1w/1wjXMZ4WurncKTiR2/VWBqWxkO8DYtSnD+Q40PnvtuLW8AKR/KWC3c9VvVoyukwA==", + "dgSpecHash": "LUJ1qhSlkd2gtUUON4jJ/lPkMsK32YMqQNEI9okkFGvOsD0VaeYkaAkslzZ1NszrHkR7lRkVyrI+cwVI6z5wrg==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\WebApplication1\\WebApplication1.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/test3/obj/Debug/net5.0/apphost.exe b/test3/obj/Debug/net5.0/apphost.exe index 7d323fa..f83d39d 100644 Binary files a/test3/obj/Debug/net5.0/apphost.exe and b/test3/obj/Debug/net5.0/apphost.exe differ diff --git a/test3/obj/Debug/net5.0/test3.assets.cache b/test3/obj/Debug/net5.0/test3.assets.cache index 33cbec5..cd22340 100644 Binary files a/test3/obj/Debug/net5.0/test3.assets.cache and b/test3/obj/Debug/net5.0/test3.assets.cache differ diff --git a/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache b/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache index e769972..57849e8 100644 Binary files a/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache and b/test3/obj/Debug/net5.0/test3.csproj.AssemblyReference.cache differ diff --git a/test3/obj/Release/net5.0/test3.assets.cache b/test3/obj/Release/net5.0/test3.assets.cache index c7720ed..f35d492 100644 Binary files a/test3/obj/Release/net5.0/test3.assets.cache and b/test3/obj/Release/net5.0/test3.assets.cache differ diff --git a/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache b/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache index bca5f25..04ca5a5 100644 Binary files a/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache and b/test3/obj/Release/net5.0/test3.csproj.AssemblyReference.cache differ diff --git a/test3/obj/project.assets.json b/test3/obj/project.assets.json index 3c22f6a..0fdf704 100644 --- a/test3/obj/project.assets.json +++ b/test3/obj/project.assets.json @@ -381,27 +381,25 @@ ] }, "packageFolders": { - "C:\\Users\\google\\.nuget\\packages\\": {}, + "C:\\Users\\Admin\\.nuget\\packages\\": {}, "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}, - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {}, - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\test3\\test3.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\test3\\test3.csproj", "projectName": "test3", - "projectPath": "D:\\GIT\\ASCKU_PC\\test3\\test3.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\test3\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\test3\\test3.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\test3\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -417,8 +415,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -457,7 +455,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/test3/obj/project.nuget.cache b/test3/obj/project.nuget.cache index 93abda2..5d47dbc 100644 --- a/test3/obj/project.nuget.cache +++ b/test3/obj/project.nuget.cache @@ -1,19 +1,19 @@ { "version": 2, - "dgSpecHash": "EBG4XTpF2XCEoZqMT/a4MlQQQTh9bL8x5U2KslrcIG19yhGAiHvB2djQFsEKMZ3X1d2htCutf2Oey2RI12uq9w==", + "dgSpecHash": "KZErowuH6QLCf2CclmKNigm7a1reEbOYrNVcwLaeAQTwFNlsWqrotUjerJF4iNXc0zt2eLYUtmg2Awi+25rKCg==", "success": true, - "projectFilePath": "D:\\GIT\\ASCKU_PC\\test3\\test3.csproj", + "projectFilePath": "F:\\GIT\\ASCKU_PC\\test3\\test3.csproj", "expectedPackageFiles": [ - "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.3\\nlog.extensions.logging.1.7.3.nupkg.sha512" + "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.3\\nlog.extensions.logging.1.7.3.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/test3/obj/test3.csproj.nuget.dgspec.json b/test3/obj/test3.csproj.nuget.dgspec.json index 89b4b85..eb53726 100644 --- a/test3/obj/test3.csproj.nuget.dgspec.json +++ b/test3/obj/test3.csproj.nuget.dgspec.json @@ -1,25 +1,24 @@ { "format": 1, "restore": { - "D:\\GIT\\ASCKU_PC\\test3\\test3.csproj": {} + "F:\\GIT\\ASCKU_PC\\test3\\test3.csproj": {} }, "projects": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { "version": "0.0.3", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "projectUniqueName": "F:\\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\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\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\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -75,26 +74,25 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } }, - "D:\\GIT\\ASCKU_PC\\test3\\test3.csproj": { + "F:\\GIT\\ASCKU_PC\\test3\\test3.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\GIT\\ASCKU_PC\\test3\\test3.csproj", + "projectUniqueName": "F:\\GIT\\ASCKU_PC\\test3\\test3.csproj", "projectName": "test3", - "projectPath": "D:\\GIT\\ASCKU_PC\\test3\\test3.csproj", - "packagesPath": "C:\\Users\\google\\.nuget\\packages\\", - "outputPath": "D:\\GIT\\ASCKU_PC\\test3\\obj\\", + "projectPath": "F:\\GIT\\ASCKU_PC\\test3\\test3.csproj", + "packagesPath": "C:\\Users\\Admin\\.nuget\\packages\\", + "outputPath": "F:\\GIT\\ASCKU_PC\\test3\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages", - "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\", - "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + "C:\\Program Files (x86)\\Microsoft\\Xamarin\\NuGet\\" ], "configFilePaths": [ - "C:\\Users\\google\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Admin\\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" @@ -110,8 +108,8 @@ "net5.0": { "targetAlias": "net5.0", "projectReferences": { - "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { - "projectPath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" + "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj": { + "projectPath": "F:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj" } } } @@ -150,7 +148,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.300\\RuntimeIdentifierGraph.json" } } } diff --git a/test3/obj/test3.csproj.nuget.g.props b/test3/obj/test3.csproj.nuget.g.props index efa942a..b7eb83f 100644 --- a/test3/obj/test3.csproj.nuget.g.props +++ b/test3/obj/test3.csproj.nuget.g.props @@ -5,15 +5,14 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.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\dotnet\sdk\NuGetFallbackFolder + C:\Users\Admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages;C:\Program Files (x86)\Microsoft\Xamarin\NuGet\ PackageReference 5.10.0 - + - $(MSBuildAllProjects);$(MSBuildThisFileFullPath)