diff --git a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 index c83d7aa..afcb0da 100644 Binary files a/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 and b/.vs/ASCKU Projects/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/ASCKU Projects/v16/.suo b/.vs/ASCKU Projects/v16/.suo index aa0ea87..eefbb0c 100644 Binary files a/.vs/ASCKU Projects/v16/.suo and b/.vs/ASCKU Projects/v16/.suo differ diff --git a/DataClient/ByteConverter.cs b/DataClient/ByteConverter.cs index a62bab0..0d48a35 100644 --- a/DataClient/ByteConverter.cs +++ b/DataClient/ByteConverter.cs @@ -11,7 +11,7 @@ namespace DataClient public static class ByteConverter { public static TechCycle[] BytesToTechcycles(byte[] arr) - { + { var res = new List(); try { @@ -26,7 +26,7 @@ namespace DataClient str.Add(arr[i]); } catch { throw; } return res.ToArray(); - } + } public static TechCycle BytesToTechcycle(byte[] arr) { Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); @@ -66,5 +66,13 @@ namespace DataClient } catch { throw; } } + public static (DateTime date, byte[] bytes)[] BytesToTimeLine(byte[] arr, DateTime date) + { + var res = new List<(DateTime date, byte[] bytes)>(); + + + + return res.ToArray(); + } } } diff --git a/DataClient/NETClient.cs b/DataClient/NETClient.cs index 65f77d8..918a84f 100644 --- a/DataClient/NETClient.cs +++ b/DataClient/NETClient.cs @@ -587,5 +587,6 @@ namespace DataClient finally { My_Close(needCloseConeection); } return pasp; } + } } diff --git a/DataClient/STPClient.cs b/DataClient/STPClient.cs index 4f0a86a..18ff7a7 100644 --- a/DataClient/STPClient.cs +++ b/DataClient/STPClient.cs @@ -228,6 +228,12 @@ namespace DataClient Config(); } + public TechCycle[] GetTechCycle(int vdp, DateTime tS, DateTime tE) + { + //Use File with ID = 3 + var res = new List(); + return res.ToArray(); + } diff --git a/DataClient/Struct/Analog.cs b/DataClient/Struct/Analog.cs index ab1d970..5e87c8a 100644 --- a/DataClient/Struct/Analog.cs +++ b/DataClient/Struct/Analog.cs @@ -6,7 +6,23 @@ using System.Threading.Tasks; namespace DataClient.Struct { - class Analog + public class ConfAnalog { + public int id = 0; + public string name = null; + public string sname = null; + public string measure = null; + public double min = double.MinValue; + public double max = double.MaxValue; + public double norm = 0; + public int precision = 0; + public double mul = 1; + public bool log = false; + public int[] byteId = Array.Empty(); + } + public class Analog + { + public double? value = null; + public DateTime date = DateTime.Now; } } diff --git a/DataClient/obj/DataClient.csproj.nuget.dgspec.json b/DataClient/obj/DataClient.csproj.nuget.dgspec.json index 912f7b5..e0d1429 100644 --- a/DataClient/obj/DataClient.csproj.nuget.dgspec.json +++ b/DataClient/obj/DataClient.csproj.nuget.dgspec.json @@ -75,7 +75,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/DataClient.csproj.nuget.g.props b/DataClient/obj/DataClient.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/DataClient/obj/DataClient.csproj.nuget.g.props +++ b/DataClient/obj/DataClient.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/DataClient/obj/project.assets.json b/DataClient/obj/project.assets.json index 2656e41..b9d5841 100644 --- a/DataClient/obj/project.assets.json +++ b/DataClient/obj/project.assets.json @@ -437,7 +437,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClient/obj/project.nuget.cache b/DataClient/obj/project.nuget.cache index 1486ebf..933b234 100644 --- a/DataClient/obj/project.nuget.cache +++ b/DataClient/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "fLzCMyL0TTYR6ScHYw8lseE4tuHRjlfRhsrbzgdqw/qeVRrQYigyT797G0cUiPOmrt1GVD0KWz3n3AZIE22bzQ==", + "dgSpecHash": "Mbw4RYYlxmi+1Fh8rOiFVGe3aL09yjgvcEKpwC6SozQbKvlr1nwGK/Xx++SUKdbH/3Ze+xbOpcEh4lNVnAV66Q==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClient\\DataClient.csproj", "expectedPackageFiles": [ diff --git a/DataClients/obj/DataClients.csproj.nuget.dgspec.json b/DataClients/obj/DataClients.csproj.nuget.dgspec.json index 834aa6e..97a63ee 100644 --- a/DataClients/obj/DataClients.csproj.nuget.dgspec.json +++ b/DataClients/obj/DataClients.csproj.nuget.dgspec.json @@ -76,7 +76,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -140,7 +140,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/DataClients.csproj.nuget.g.props b/DataClients/obj/DataClients.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/DataClients/obj/DataClients.csproj.nuget.g.props +++ b/DataClients/obj/DataClients.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/DataClients/obj/project.assets.json b/DataClients/obj/project.assets.json index 35350d4..7f0a2b3 100644 --- a/DataClients/obj/project.assets.json +++ b/DataClients/obj/project.assets.json @@ -398,7 +398,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/DataClients/obj/project.nuget.cache b/DataClients/obj/project.nuget.cache index 9f967c1..cedfe6d 100644 --- a/DataClients/obj/project.nuget.cache +++ b/DataClients/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "uA9rgRXaUEUYoOTmuecMN9sEzQQ9h4wmOmVaX+dlb8QuS5RVxDdEJxCv+xV1gZk+Klv90ZG2LpnZBC8Qo/W4FA==", + "dgSpecHash": "pIGoDNRw4g3M23UekRPQOqZYtyeiyOf0EGgpw3FVGJT1W7fl8hQS+OlXtyeyHLp8bSurx/2g3YUcez1H9nO2Wg==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\DataClients\\DataClients.csproj", "expectedPackageFiles": [ diff --git a/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache b/Korp90TimePasport/obj/Debug/netcoreapp3.1/Korp90TimePasport.csproj.AssemblyReference.cache index d306b47..ec95065 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 14b9b41..c0b33bf 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.dgspec.json @@ -76,7 +76,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -147,7 +147,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -211,7 +211,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props +++ b/Korp90TimePasport/obj/Korp90TimePasport.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/Korp90TimePasport/obj/project.assets.json b/Korp90TimePasport/obj/project.assets.json index 980ee1e..8f97393 100644 --- a/Korp90TimePasport/obj/project.assets.json +++ b/Korp90TimePasport/obj/project.assets.json @@ -296,7 +296,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Korp90TimePasport/obj/project.nuget.cache b/Korp90TimePasport/obj/project.nuget.cache index 9ece160..a7f6e8c 100644 --- a/Korp90TimePasport/obj/project.nuget.cache +++ b/Korp90TimePasport/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "AqbvvkDwL7rcBYkLzhlGt3MNX9HhqeqsJEu5ffbVRs0+3TsQS/BVQ91hVOf+q+SExRT+Ex2NuehhNNw64BSdsA==", + "dgSpecHash": "hZRsYyq01MA93QfAePzOdPT2Snr9D/DYN608PxE1lsA6xsKuDldSyLDoJbQp7s9aR2OSeNpNDuiI3pXfiJOktA==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\Korp90TimePasport\\Korp90TimePasport.csproj", "expectedPackageFiles": [ diff --git a/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache b/Mailing/obj/Debug/netcoreapp3.1/Mailing.csproj.AssemblyReference.cache index 835a15e..1203d93 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 ed2730a..03113a1 100644 --- a/Mailing/obj/Mailing.csproj.nuget.dgspec.json +++ b/Mailing/obj/Mailing.csproj.nuget.dgspec.json @@ -76,7 +76,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -159,7 +159,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -227,7 +227,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -305,7 +305,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -377,7 +377,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -445,7 +445,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -509,7 +509,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/Mailing.csproj.nuget.g.props b/Mailing/obj/Mailing.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/Mailing/obj/Mailing.csproj.nuget.g.props +++ b/Mailing/obj/Mailing.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/Mailing/obj/project.assets.json b/Mailing/obj/project.assets.json index 164179a..146c4d7 100644 --- a/Mailing/obj/project.assets.json +++ b/Mailing/obj/project.assets.json @@ -418,7 +418,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Mailing/obj/project.nuget.cache b/Mailing/obj/project.nuget.cache index 0195330..811ff9d 100644 --- a/Mailing/obj/project.nuget.cache +++ b/Mailing/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "Fq2IpnyHMNBQTnMq0ZCrHwoCRgbhW2V3rILfncJWwkSpZ1dRVvNmfB6O7vhaEKYd5vbV0iFcMdt415hrQJ6Sog==", + "dgSpecHash": "hCrXyQzrKUms6Wsbk21d9ZwTlw48VmF+P/endtztYFWwilgdxHKUrICOnOC0wLX1wufERLCT2R22q4m1nYIm6w==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\Mailing\\Mailing.csproj", "expectedPackageFiles": [ 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 bb20f34..3a657b7 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.dgspec.json @@ -68,7 +68,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\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 471ec1a..efa942a 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/MigraDoc.DocumentObjectModel.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json index 8757008..5af78bc 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.assets.json @@ -291,7 +291,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache index 1a7310a..e6c73ce 100644 --- a/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.DocumentObjectModel/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "sBm+civ/y30T28G19ksOeAZSL5HnW74LwApvyScSK1Z25T7B9Gkr9fA+YnAY/upXXLbBJADGkxTQ3draLrfiTQ==", + "dgSpecHash": "MUDhIjgexTf+6GbOY9N44CpOukt4UnZBlCMcsLDT77+qJtJ+6xH8YVAWm8R3Bxvw5wUlz5wXXv2oE6bHGNBzlg==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.DocumentObjectModel\\MigraDoc.DocumentObjectModel.csproj", "expectedPackageFiles": [ 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 c651205..ebed55a 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.dgspec.json @@ -68,7 +68,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -146,7 +146,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -218,7 +218,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -286,7 +286,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\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 471ec1a..efa942a 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props +++ b/PrintPDF/MigraDoc.Rendering/obj/MigraDoc.Rendering.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json index 0860442..5c28fc4 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.assets.json +++ b/PrintPDF/MigraDoc.Rendering/obj/project.assets.json @@ -359,7 +359,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache index 76a4196..e14c75b 100644 --- a/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache +++ b/PrintPDF/MigraDoc.Rendering/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "TxR9xRD7C2qxgn4+fmYYQ80yeu7RmqNvCRhmxCD1mxKyia2AoKu19WCJNH7gSVRBpw5yNVgRJYXvflrC/gST+A==", + "dgSpecHash": "qNDXMcX1KM5nFiWVZKJvCHYB3cSFIooDp4QTAFWaQLPsPXGoj+6xR69FoS6fnh4A9zrAmtFvgxx3coZkfkfuMA==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\MigraDoc.Rendering\\MigraDoc.Rendering.csproj", "expectedPackageFiles": [ 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 1d5cad6..b8f86d7 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.dgspec.json @@ -72,7 +72,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -140,7 +140,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\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 471ec1a..efa942a 100644 --- a/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp.Charting/obj/PdfSharp.Charting.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/PrintPDF/PdfSharp.Charting/obj/project.assets.json b/PrintPDF/PdfSharp.Charting/obj/project.assets.json index 7dd8dab..ef5da0f 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.assets.json +++ b/PrintPDF/PdfSharp.Charting/obj/project.assets.json @@ -314,7 +314,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache index 144e274..1f0ea71 100644 --- a/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp.Charting/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "ylFR2pFfHruJfLgzgidtqc3YfADHj/7nw+tQ1nHK/jI7pRvAVQTnBsGvB/IdLnxMQFZVD+HIjX9oz6WxWvfZqQ==", + "dgSpecHash": "g0H1COJWrSNLDBy0dgwOYJXIh4ie3VdE9BLigtM6nd3El9zA7TPlczS+4C/c91iQrTE85/LDZ/tTHwondj3YOw==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp.Charting\\PdfSharp.Charting.csproj", "expectedPackageFiles": [ diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json index 99cbd8b..dc43c77 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.dgspec.json @@ -68,7 +68,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props +++ b/PrintPDF/PdfSharp/obj/PdfSharp.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/PrintPDF/PdfSharp/obj/project.assets.json b/PrintPDF/PdfSharp/obj/project.assets.json index 9015a39..e6f04e8 100644 --- a/PrintPDF/PdfSharp/obj/project.assets.json +++ b/PrintPDF/PdfSharp/obj/project.assets.json @@ -291,7 +291,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/PrintPDF/PdfSharp/obj/project.nuget.cache b/PrintPDF/PdfSharp/obj/project.nuget.cache index fa5de92..8f9b734 100644 --- a/PrintPDF/PdfSharp/obj/project.nuget.cache +++ b/PrintPDF/PdfSharp/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "gAA+4olGjjwVeZQSmw/Z0DOTpvSV4fy+dgVMwmTj80c7nXa8OCdrFx82JQ+RJR4CtrbDPW55iyjFjOyll2at+A==", + "dgSpecHash": "waRcxjc+cPubrMDdlTfuOZKTe2+oij45Dq89Q8rAEnAtdbj3lovKbNLyxiVy3cDMrAFlCVDUXF6D+GtWiecS6g==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\PrintPDF\\PdfSharp\\PdfSharp.csproj", "expectedPackageFiles": [ diff --git a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache index 0664a97..057cfd5 100644 Binary files a/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache and b/SupportClasses/obj/Debug/netstandard2.0/SupportClasses.csproj.AssemblyReference.cache differ diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json index 93d56da..9dbb492 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.dgspec.json @@ -64,7 +64,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/SupportClasses/obj/SupportClasses.csproj.nuget.g.props +++ b/SupportClasses/obj/SupportClasses.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/SupportClasses/obj/project.assets.json b/SupportClasses/obj/project.assets.json index 0a0315d..f5202e7 100644 --- a/SupportClasses/obj/project.assets.json +++ b/SupportClasses/obj/project.assets.json @@ -244,7 +244,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/SupportClasses/obj/project.nuget.cache b/SupportClasses/obj/project.nuget.cache index b008c15..b024f18 100644 --- a/SupportClasses/obj/project.nuget.cache +++ b/SupportClasses/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "4z8iakRemDHltW/xazDzU5cngA0Pqip9r1fUiMe+4pEedLlKbRR2y7psVjUGx9IEupBfp4Gj7OPOyPOJ/OLgqQ==", + "dgSpecHash": "DqE6H4mE9c0hWaSguBa6HoE1eCrl4TLsWHAJUThL98hOifgxJCw5vdRYNsBE3LJhvneLLAuh/TfSkGDCOVl+9A==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\SupportClasses\\SupportClasses.csproj", "expectedPackageFiles": [ diff --git a/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache b/Test2/obj/Debug/net5.0/Test2.csproj.AssemblyReference.cache index 322acb5..2c27a0c 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/Test2.csproj.nuget.dgspec.json b/Test2/obj/Test2.csproj.nuget.dgspec.json index f6dc323..1ee2bae 100644 --- a/Test2/obj/Test2.csproj.nuget.dgspec.json +++ b/Test2/obj/Test2.csproj.nuget.dgspec.json @@ -75,7 +75,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -150,7 +150,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/Test2.csproj.nuget.g.props b/Test2/obj/Test2.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/Test2/obj/Test2.csproj.nuget.g.props +++ b/Test2/obj/Test2.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/Test2/obj/project.assets.json b/Test2/obj/project.assets.json index ff54544..674c65d 100644 --- a/Test2/obj/project.assets.json +++ b/Test2/obj/project.assets.json @@ -457,7 +457,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Test2/obj/project.nuget.cache b/Test2/obj/project.nuget.cache index 903f4de..cd4b50c 100644 --- a/Test2/obj/project.nuget.cache +++ b/Test2/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "HhmSRaWdg6GJzveREREh4I6l8jtRdUwLBMWV/9wd89PVj6NuodYu7Nx5js8D/6uwoLtiRHDPF6/kAFeVHlQ5pg==", + "dgSpecHash": "IURIdhZOA8rlzalHxvlaU2SWYWMZeEr0nmC36OnrsEwPri7Bk6BrfzxqANxqdpz3XjnY53gcFsBqITghSrDPdA==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\Test2\\Test2.csproj", "expectedPackageFiles": [ diff --git a/Tests/obj/Debug/netcoreapp3.1/Tests.csproj.AssemblyReference.cache b/Tests/obj/Debug/netcoreapp3.1/Tests.csproj.AssemblyReference.cache index 1e24b09..bda8ee0 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/Tests.csproj.nuget.dgspec.json b/Tests/obj/Tests.csproj.nuget.dgspec.json index 038c3eb..3420cc0 100644 --- a/Tests/obj/Tests.csproj.nuget.dgspec.json +++ b/Tests/obj/Tests.csproj.nuget.dgspec.json @@ -76,7 +76,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -159,7 +159,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -227,7 +227,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -305,7 +305,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -377,7 +377,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -445,7 +445,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -509,7 +509,7 @@ ], "assetTargetFallback": true, "warn": true, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } }, @@ -599,7 +599,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/Tests.csproj.nuget.g.props b/Tests/obj/Tests.csproj.nuget.g.props index 471ec1a..efa942a 100644 --- a/Tests/obj/Tests.csproj.nuget.g.props +++ b/Tests/obj/Tests.csproj.nuget.g.props @@ -7,7 +7,7 @@ $(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 PackageReference - 5.9.0 + 5.10.0 diff --git a/Tests/obj/project.assets.json b/Tests/obj/project.assets.json index bcb6a0e..50cf513 100644 --- a/Tests/obj/project.assets.json +++ b/Tests/obj/project.assets.json @@ -450,7 +450,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.201\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\5.0.301\\RuntimeIdentifierGraph.json" } } } diff --git a/Tests/obj/project.nuget.cache b/Tests/obj/project.nuget.cache index d1c05b3..3970f04 100644 --- a/Tests/obj/project.nuget.cache +++ b/Tests/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "+JVwZP7/0pLNGuHgZlzASiN8JWedGIGhi98le9dVNBxqkkn0YIfoy1/t55ebd/PW/fwEUZP6BzK0vbkfIdOJQw==", + "dgSpecHash": "2s4poUhkggsKl4knSgc2Gsu503QqjaOq+Mm2ZSXVkecmYegY7ZY34Mq9870zW26I03RalNC+aQG/T+QgLqOVIw==", "success": true, "projectFilePath": "D:\\GIT\\ASCKU_PC\\Tests\\Tests.csproj", "expectedPackageFiles": [