Skip to content

Fixes to issue #415 and #416 #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpostol merged 2 commits into from
Mar 28, 2025
Merged

Fixes to issue #415 and #416 #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3526a71
NuGet package update, package version unification, solution maintenan…
Tycjan-Fortuna-IT Mar 27, 2025
9ca9555
Adding prefix TP.ExDM to namespaces within ExDataManagement solution …
Tycjan-Fortuna-IT Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ExDataManagement/DataStreams/DataStreams.UnitTest/CryptographyHelpersUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
using System.Text;
using System.Xml;

namespace TP.DataStreams.Cryptography
namespace TP.ExDM.DataStreams.Cryptography
{
[TestClass]
public class CryptographyHelpersUnitTest
Expand Down
107 changes: 59 additions & 48 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/DataStreams.UnitTest.csproj
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/FileStreamUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.IO;
using TP.DataStreams.FileAndStream;
using TP.ExDM.DataStreams.FileAndStream;

namespace TP.DataStreams
namespace TP.ExDM.DataStreams
{
[TestClass]
public class FileStreamUnitTest
Expand Down
8 changes: 8 additions & 0 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/ILLink/ILLink.Descriptors.LibraryBuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<linker>
<assembly fullname="System.Diagnostics.DiagnosticSource">
<type fullname="System.Diagnostics.Metrics.MetricsEventSource">
<!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
<method name="GetInstance" />
</type>
</assembly>
</linker>
5 changes: 3 additions & 2 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/Instrumentation/Catalog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
Expand All @@ -11,7 +11,8 @@
//
// This source code was auto-generated by xsd, Version=4.6.1055.0.
//
namespace TP.DataStreams.Instrumentation {
namespace TP.ExDM.DataStreams.Instrumentation
{
using System.Xml.Serialization;


Expand Down
6 changes: 3 additions & 3 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/Instrumentation/Catalog.xsd.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

using System.Diagnostics;
using System.Xml.Serialization;
using TP.DataStreams.Serialization;
using TP.ExDM.DataStreams.Serialization;

namespace TP.DataStreams.Instrumentation
namespace TP.ExDM.DataStreams.Instrumentation
{
/// <summary>
/// class catalog
Expand Down Expand Up @@ -65,7 +65,7 @@ partial class CatalogCD
}
public override bool Equals(object obj)
{
CatalogCD _catalogCD = obj as CatalogCD ?? throw new System.ArgumentException(nameof(obj), "wrong parameter type");
CatalogCD _catalogCD = obj as CatalogCD ?? throw new System.ArgumentException(nameof(obj), "wrong parameter type");
return ToString() == _catalogCD.ToString();
}
public override int GetHashCode()
Expand Down
2 changes: 1 addition & 1 deletion ExDataManagement/DataStreams/DataStreams.UnitTest/Instrumentation/GoCS.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REM convert the scheme Catalog.xsd to cs code
xsd.exe Catalog.xsd /N:TP.DataStreams.Instrumentation /c
xsd.exe Catalog.xsd /N:TP.ExDM.DataStreams.Instrumentation /c
2 changes: 1 addition & 1 deletion ExDataManagement/DataStreams/DataStreams.UnitTest/Instrumentation/GoXSD.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
xsd.exe ..\bin\Debug\TP.DataStreams.UnitTest.dll /t:TP.DataStreams.Instrumentation.Catalog
xsd.exe ..\bin\Debug\TP.ExDM.DataStreams.UnitTest.dll /t:TP.ExDM.DataStreams.Instrumentation.Catalog
2 changes: 1 addition & 1 deletion ...taManagement/DataStreams/DataStreams.UnitTest/Instrumentation/SelfControlSerialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
using System;
using System.Runtime.Serialization;

namespace TP.DataStreams.Instrumentation
namespace TP.ExDM.DataStreams.Instrumentation
{
/// <summary>
/// Class CustomSerialization - Demonstrates custom serialization approach
Expand Down
4 changes: 2 additions & 2 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/ReflectionUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using TP.DataStreams.Reflection;
using TP.ExDM.DataStreams.Reflection;

namespace TP.DataStreams
namespace TP.ExDM.DataStreams
{
[TestClass]
public class ReflectionUnitTest
Expand Down
6 changes: 3 additions & 3 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/SerializationUnitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
using System.IO;
using System.Runtime.Serialization;
using System.Text;
using TP.DataStreams.Instrumentation;
using TP.DataStreams.Serialization;
using TP.ExDM.DataStreams.Instrumentation;
using TP.ExDM.DataStreams.Serialization;

namespace TP.DataStreams
namespace TP.ExDM.DataStreams
{
[TestClass]
public class SerializationUnitTest
Expand Down
35 changes: 35 additions & 0 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.23.0.29" newVersion="2.23.0.29" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
36 changes: 19 additions & 17 deletions ExDataManagement/DataStreams/DataStreams.UnitTest/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.ApplicationInsights" version="2.22.0" targetFramework="net472" />
<package id="Microsoft.Testing.Extensions.Telemetry" version="1.2.1" targetFramework="net472" />
<package id="Microsoft.Testing.Extensions.TrxReport.Abstractions" version="1.2.1" targetFramework="net472" />
<package id="Microsoft.Testing.Extensions.VSTestBridge" version="1.2.1" targetFramework="net472" />
<package id="Microsoft.Testing.Platform" version="1.2.1" targetFramework="net472" />
<package id="Microsoft.Testing.Platform.MSBuild" version="1.2.1" targetFramework="net472" />
<package id="Microsoft.TestPlatform.ObjectModel" version="17.10.0" targetFramework="net472" />
<package id="MSTest.TestAdapter" version="3.4.3" targetFramework="net472" />
<package id="MSTest.TestFramework" version="3.4.3" targetFramework="net472" />
<package id="NuGet.Frameworks" version="6.10.1" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Collections.Immutable" version="8.0.0" targetFramework="net472" />
<package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net472" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Reflection.Metadata" version="8.0.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="Microsoft.ApplicationInsights" version="2.23.0" targetFramework="net472" />
<package id="Microsoft.Testing.Extensions.Telemetry" version="1.6.3" targetFramework="net472" />
<package id="Microsoft.Testing.Extensions.TrxReport.Abstractions" version="1.6.3" targetFramework="net472" />
<package id="Microsoft.Testing.Extensions.VSTestBridge" version="1.6.3" targetFramework="net472" />
<package id="Microsoft.Testing.Platform" version="1.6.3" targetFramework="net472" />
<package id="Microsoft.Testing.Platform.MSBuild" version="1.6.3" targetFramework="net472" />
<package id="Microsoft.TestPlatform.ObjectModel" version="17.13.0" targetFramework="net472" />
<package id="MSTest.Analyzers" version="3.8.3" targetFramework="net472" developmentDependency="true" />
<package id="MSTest.TestAdapter" version="3.8.3" targetFramework="net472" />
<package id="MSTest.TestFramework" version="3.8.3" targetFramework="net472" />
<package id="NuGet.Frameworks" version="6.13.2" targetFramework="net472" />
<package id="System.Buffers" version="4.6.1" targetFramework="net472" />
<package id="System.Collections.Immutable" version="9.0.3" targetFramework="net472" />
<package id="System.Diagnostics.DiagnosticSource" version="9.0.3" targetFramework="net472" />
<package id="System.Memory" version="4.6.2" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
<package id="System.Reflection.Metadata" version="9.0.3" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.1.1" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.6.2" targetFramework="net472" />
</packages>
2 changes: 1 addition & 1 deletion ExDataManagement/DataStreams/DataStreams/Cryptography/CryptographyHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using System.Text;
using System.Xml;

namespace TP.DataStreams.Cryptography
namespace TP.ExDM.DataStreams.Cryptography
{
public static class CryptographyHelpers
{
Expand Down
43 changes: 36 additions & 7 deletions ExDataManagement/DataStreams/DataStreams/DataStreams.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -7,8 +7,8 @@
<ProjectGuid>{173285CE-899A-4CAF-B423-04D11927EBBC}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TP.DataStreams</RootNamespace>
<AssemblyName>TP.DataStreams</AssemblyName>
<RootNamespace>TP.ExDM.DataStreams</RootNamespace>
<AssemblyName>TP.ExDM.DataStreams</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl>
Expand All @@ -27,6 +27,8 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -62,22 +64,41 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Bcl.Cryptography.9.0.3\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.DirectoryServices" />
<Reference Include="System.Drawing" />
<Reference Include="System.Formats.Asn1, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Formats.Asn1.9.0.3\lib\net462\System.Formats.Asn1.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Memory.4.6.2\lib\net462\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
<Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Xml, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.Cryptography.Xml.8.0.1\lib\net462\System.Security.Cryptography.Xml.dll</HintPath>
<Reference Include="System.Security.Cryptography.Xml, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.Cryptography.Xml.9.0.3\lib\net462\System.Security.Cryptography.Xml.dll</HintPath>
</Reference>
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
<Reference Include="System.Security.Permissions, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.Permissions.9.0.3\lib\net462\System.Security.Permissions.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
Expand All @@ -102,6 +123,7 @@
<Compile Include="Serialization\XmlFile.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="FileAndStream\README.md" />
<None Include="Key.snk" />
<None Include="packages.config" />
Expand All @@ -121,6 +143,13 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
2 changes: 1 addition & 1 deletion ExDataManagement/DataStreams/DataStreams/FileAndStream/FileExample.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using System.IO;
using System.Text;

namespace TP.DataStreams.FileAndStream
namespace TP.ExDM.DataStreams.FileAndStream
{
public class FileExample
{
Expand Down
Binary file modified ExDataManagement/DataStreams/DataStreams/GlobalSuppressions.cs
View file
Open in desktop
Binary file not shown.
Loading