diff --git a/.github/workflows/test-libplctagNativeImport.yml b/.github/workflows/test-libplctagNativeImport.yml deleted file mode 100644 index bae2812..0000000 --- a/.github/workflows/test-libplctagNativeImport.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Test libplctag.NativeImport - -on: [workflow_dispatch,push] - -jobs: - build: - - runs-on: windows-latest - - steps: - - uses: actions/checkout@v4 - with: - lfs: true - - - name: Build all and run tests - run: .\build.cmd TestLibplctagNativeImport diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index c2bce52..e42dbb1 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -87,7 +87,6 @@ "PackLibplctagNativeImport", "ReleaseAll", "TestLibplctag", - "TestLibplctagNativeImport", "UpdateCoreBinaries" ] } @@ -108,7 +107,6 @@ "PackLibplctagNativeImport", "ReleaseAll", "TestLibplctag", - "TestLibplctagNativeImport", "UpdateCoreBinaries" ] } diff --git a/build/Build.cs b/build/Build.cs index dc6d486..3af7e54 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -29,7 +29,6 @@ class Build : NukeBuild AbsolutePath SourceDirectory => RootDirectory / "src"; AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts"; - AbsolutePath PackageRestoreDirectory => SourceDirectory / "packages"; Project libplctag => Solution.GetProject("libplctag"); Project libplctag_NativeImport => Solution.GetProject("libplctag.NativeImport"); @@ -39,7 +38,6 @@ class Build : NukeBuild { SourceDirectory.GlobDirectories("**/bin", "**/obj") .Concat(ArtifactsDirectory) - .Concat(PackageRestoreDirectory) .ForEach(dir => { Log.Debug("Deleting {0}", dir); @@ -73,92 +71,8 @@ class Build : NukeBuild }); - Target TestLibplctagNativeImport => _ => _ - .DependsOn(PackLibplctagNativeImport) - .DependsOn(PackLibplctag) - .Executes(() => - { - - // This nuget.config file ensures that libplctag and libplctag.NativeImport are restored from the - // newly created and packed packages on disk, but still allows all other packages to be - // downloaded from the remote nuget feed. - var nuget_config_contents = $""" - - - - - - - - - - - - - - - - - - - - - - - - - -"""; - - var netCoreDirect = Solution.GetProject("libplctag.NativeImport.Tests.NetCore.DirectDependency"); - var netCoreTransitive = Solution.GetProject("libplctag.NativeImport.Tests.NetCore.TransitiveDependency"); - var netFrameworkDirect = Solution.GetProject("libplctag.NativeImport.Tests.NetFramework.DirectDependency"); - var netFrameworkTransitive = Solution.GetProject("libplctag.NativeImport.Tests.NetFramework.TransitiveDependency"); - - var nugetConfigPath = Path.GetTempFileName() + ".nuget.config"; - File.WriteAllText(nugetConfigPath, nuget_config_contents); - - NetCoreInstallRestoreBuildTest(netCoreDirect, isTransitive: false, nugetConfigPath); - NetCoreInstallRestoreBuildTest(netCoreTransitive, isTransitive: true, nugetConfigPath); - // Future - figure out how to test for packges.config projects - // The issue I ran into is that there is no way to add packages using the CLI - // dotnet CLI does not work for packages.config projects - https://github.com/dotnet/sdk/issues/7922 - // Nuget does not modify project/solution files - https://learn.microsoft.com/en-us/nuget/consume-packages/install-use-packages-nuget-cli#install-a-package - // And this is known to not be supported - https://github.com/NuGet/Home/issues/1512 - - File.Delete(nugetConfigPath); - - }); - - void NetCoreInstallRestoreBuildTest(Project proj, bool isTransitive, string nugetConfigPath) - { - DotNetRestore(s => s - .SetProjectFile(proj) - .SetPackageDirectory(PackageRestoreDirectory) - .SetConfigFile(nugetConfigPath) - ); - - var libplctagVersion = libplctag.GetProperty("version"); - var libplctagNativeImportVersion = libplctag_NativeImport.GetProperty("version"); - - DotNet($"add {proj.Path} package {libplctag_NativeImport.Name} -s {ArtifactsDirectory} --version {libplctagNativeImportVersion} --package-directory {PackageRestoreDirectory}"); - - if (isTransitive) - DotNet($"add {proj.Path} package {libplctag.Name} -s {ArtifactsDirectory} --version {libplctagVersion} --package-directory {PackageRestoreDirectory}"); - - DotNetBuild(s => s - .SetProjectFile(proj) - .SetConfiguration(Configuration) - .SetNoRestore(true) - ); - - DotNetTest(s => s - .SetProjectFile(proj) - .SetNoRestore(true) - ); - } - Target PackLibplctag => _ => _ + .DependsOn(Compile) .Executes(() => { DotNetPack(s => s @@ -186,7 +100,8 @@ void NetCoreInstallRestoreBuildTest(Project proj, bool isTransitive, string nuge Target ReleaseAll => _ => _ .DependsOn(TestLibplctag) - .DependsOn(TestLibplctagNativeImport) + .DependsOn(PackLibplctagNativeImport) + .DependsOn(PackLibplctag) .Requires(() => NugetApiUrl) .Requires(() => NugetApiKey) .Requires(() => Configuration.Equals(Configuration.Release)) diff --git a/src/libplctag.NativeImport.Tests.NetCore.DirectDependency/Test.cs b/src/libplctag.NativeImport.Tests.NetCore.DirectDependency/Test.cs deleted file mode 100644 index 2d10015..0000000 --- a/src/libplctag.NativeImport.Tests.NetCore.DirectDependency/Test.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) libplctag.NET contributors -// https://github.com/libplctag/libplctag.NET -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -namespace libplctag.NativeImport.Tests.NetCore.DirectDependency -{ - public class Test - { - [Fact] - public void Can_execute_native_methods() - { - // The test is succesful if this does not throw - var output = plctag.plc_tag_check_lib_version(0, 0, 0); - - // The below is redundant but is used to prove to the reader that the test works - Assert.True(true); - } - } -} diff --git a/src/libplctag.NativeImport.Tests.NetCore.DirectDependency/libplctag.NativeImport.Tests.NetCore.DirectDependency.csproj b/src/libplctag.NativeImport.Tests.NetCore.DirectDependency/libplctag.NativeImport.Tests.NetCore.DirectDependency.csproj deleted file mode 100644 index 144457b..0000000 --- a/src/libplctag.NativeImport.Tests.NetCore.DirectDependency/libplctag.NativeImport.Tests.NetCore.DirectDependency.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - net8.0 - enable - enable - - false - true - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - diff --git a/src/libplctag.NativeImport.Tests.NetCore.TransitiveDependency/Test.cs b/src/libplctag.NativeImport.Tests.NetCore.TransitiveDependency/Test.cs deleted file mode 100644 index a0d9877..0000000 --- a/src/libplctag.NativeImport.Tests.NetCore.TransitiveDependency/Test.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) libplctag.NET contributors -// https://github.com/libplctag/libplctag.NET -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -namespace libplctag.NativeImport.Tests.NetCore.TransitiveDependency -{ - public class Test - { - [Fact] - public void Can_execute_native_methods() - { - // The test is succesful if this does not throw - var output = LibPlcTag.IsRequiredVersion(0, 0, 0); - - // The below is redundant but is used to prove to the reader that the test works - Assert.True(true); - } - } -} \ No newline at end of file diff --git a/src/libplctag.NativeImport.Tests.NetCore.TransitiveDependency/libplctag.NativeImport.Tests.NetCore.TransitiveDependency.csproj b/src/libplctag.NativeImport.Tests.NetCore.TransitiveDependency/libplctag.NativeImport.Tests.NetCore.TransitiveDependency.csproj deleted file mode 100644 index ba07b08..0000000 --- a/src/libplctag.NativeImport.Tests.NetCore.TransitiveDependency/libplctag.NativeImport.Tests.NetCore.TransitiveDependency.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - net8.0 - enable - enable - - false - true - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - diff --git a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/Properties/AssemblyInfo.cs b/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/Properties/AssemblyInfo.cs deleted file mode 100644 index 4905f44..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("libplctag.NativeImport.Tests.NetFramework")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("libplctag.NativeImport.Tests.NetFramework")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("b8584170-3d77-4a0f-bd89-56c49aff6069")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/Test.cs b/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/Test.cs deleted file mode 100644 index 66bbdc2..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/Test.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) libplctag.NET contributors -// https://github.com/libplctag/libplctag.NET -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace libplctag.NativeImport.Tests.NetFramework.DirectDependency -{ - [TestClass] - public class Test - { - [TestMethod] - public void Can_execute_native_methods() - { - // The test is succesful if this does not throw - var output = plctag.plc_tag_check_lib_version(0, 0, 0); - - // The below is redundant but is used to prove to the reader that the test works - Assert.IsTrue(true); - } - } -} diff --git a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/app.config b/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/app.config deleted file mode 100644 index dfb9dea..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/app.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/libplctag.NativeImport.Tests.NetFramework.DirectDependency.csproj b/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/libplctag.NativeImport.Tests.NetFramework.DirectDependency.csproj deleted file mode 100644 index 472807e..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/libplctag.NativeImport.Tests.NetFramework.DirectDependency.csproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - Debug - AnyCPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069} - Library - Properties - libplctag.NativeImport.Tests.NetFramework.DirectDependency - libplctag.NativeImport.Tests.NetFramework.DirectDependency - v4.7.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Microsoft.ApplicationInsights.2.22.0\lib\net46\Microsoft.ApplicationInsights.dll - - - - ..\packages\Microsoft.Testing.Extensions.Telemetry.1.2.1\lib\netstandard2.0\Microsoft.Testing.Extensions.Telemetry.dll - - - ..\packages\Microsoft.Testing.Extensions.TrxReport.Abstractions.1.2.1\lib\netstandard2.0\Microsoft.Testing.Extensions.TrxReport.Abstractions.dll - - - ..\packages\Microsoft.Testing.Extensions.VSTestBridge.1.2.1\lib\netstandard2.0\Microsoft.Testing.Extensions.VSTestBridge.dll - - - ..\packages\Microsoft.Testing.Platform.1.2.1\lib\netstandard2.0\Microsoft.Testing.Platform.dll - - - ..\packages\Microsoft.Testing.Platform.MSBuild.1.2.1\lib\netstandard2.0\Microsoft.Testing.Platform.MSBuild.dll - - - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.CoreUtilities.dll - - - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.PlatformAbstractions.dll - - - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - - - ..\packages\MSTest.TestFramework.3.4.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.3.4.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\NuGet.Frameworks.6.10.1\lib\net472\NuGet.Frameworks.dll - - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll - - - - - ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll - - - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - - - - - - - - - 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}. - - - - - - - - - - - \ No newline at end of file diff --git a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/packages.config b/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/packages.config deleted file mode 100644 index 155230c..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.DirectDependency/packages.config +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/Properties/AssemblyInfo.cs b/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/Properties/AssemblyInfo.cs deleted file mode 100644 index 4905f44..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("libplctag.NativeImport.Tests.NetFramework")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("libplctag.NativeImport.Tests.NetFramework")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("b8584170-3d77-4a0f-bd89-56c49aff6069")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/Test.cs b/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/Test.cs deleted file mode 100644 index 3b1fbda..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/Test.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) libplctag.NET contributors -// https://github.com/libplctag/libplctag.NET -// -// This Source Code Form is subject to the terms of the Mozilla Public -// License, v. 2.0. If a copy of the MPL was not distributed with this -// file, You can obtain one at https://mozilla.org/MPL/2.0/. - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace libplctag.NativeImport.Tests.NetFramework.TransitiveDependency -{ - [TestClass] - public class Test - { - [TestMethod] - public void Can_execute_native_methods() - { - // The test is succesful if this does not throw - var output = LibPlcTag.IsRequiredVersion(0, 0, 0); - - // The below is redundant but is used to prove to the reader that the test works - Assert.IsTrue(true); - } - } -} diff --git a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/app.config b/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/app.config deleted file mode 100644 index dfb9dea..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/app.config +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency.csproj b/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency.csproj deleted file mode 100644 index 5c531a8..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency.csproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - Debug - AnyCPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D} - Library - Properties - libplctag.NativeImport.Tests.NetFramework.TransitiveDependency - libplctag.NativeImport.Tests.NetFramework.TransitiveDependency - v4.7.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Microsoft.ApplicationInsights.2.22.0\lib\net46\Microsoft.ApplicationInsights.dll - - - - ..\packages\Microsoft.Testing.Extensions.Telemetry.1.2.1\lib\netstandard2.0\Microsoft.Testing.Extensions.Telemetry.dll - - - ..\packages\Microsoft.Testing.Extensions.TrxReport.Abstractions.1.2.1\lib\netstandard2.0\Microsoft.Testing.Extensions.TrxReport.Abstractions.dll - - - ..\packages\Microsoft.Testing.Extensions.VSTestBridge.1.2.1\lib\netstandard2.0\Microsoft.Testing.Extensions.VSTestBridge.dll - - - ..\packages\Microsoft.Testing.Platform.1.2.1\lib\netstandard2.0\Microsoft.Testing.Platform.dll - - - ..\packages\Microsoft.Testing.Platform.MSBuild.1.2.1\lib\netstandard2.0\Microsoft.Testing.Platform.MSBuild.dll - - - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.CoreUtilities.dll - - - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.PlatformAbstractions.dll - - - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - - - ..\packages\MSTest.TestFramework.3.4.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.3.4.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\NuGet.Frameworks.6.10.1\lib\net472\NuGet.Frameworks.dll - - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll - - - - - ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll - - - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - - - - - - - - - - - - - - - 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}. - - - - - - - - - - - \ No newline at end of file diff --git a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/packages.config b/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/packages.config deleted file mode 100644 index 6aa9650..0000000 --- a/src/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency/packages.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/libplctag.sln b/src/libplctag.sln index 2283c9e..1730b36 100644 --- a/src/libplctag.sln +++ b/src/libplctag.sln @@ -9,14 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libplctag.NativeImport", "l EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libplctag.Tests", "libplctag.Tests\libplctag.Tests.csproj", "{2FCB9157-85F9-4631-838D-89CAC323397E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libplctag.NativeImport.Tests.NetCore.DirectDependency", "libplctag.NativeImport.Tests.NetCore.DirectDependency\libplctag.NativeImport.Tests.NetCore.DirectDependency.csproj", "{F61BD0F4-A382-48EC-B586-3E02466BE98A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "libplctag.NativeImport.Tests.NetCore.TransitiveDependency", "libplctag.NativeImport.Tests.NetCore.TransitiveDependency\libplctag.NativeImport.Tests.NetCore.TransitiveDependency.csproj", "{4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libplctag.NativeImport.Tests.NetFramework.DirectDependency", "libplctag.NativeImport.Tests.NetFramework.DirectDependency\libplctag.NativeImport.Tests.NetFramework.DirectDependency.csproj", "{B8584170-3D77-4A0F-BD89-56C49AFF6069}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libplctag.NativeImport.Tests.NetFramework.TransitiveDependency", "libplctag.NativeImport.Tests.NetFramework.TransitiveDependency\libplctag.NativeImport.Tests.NetFramework.TransitiveDependency.csproj", "{E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -63,54 +55,6 @@ Global {2FCB9157-85F9-4631-838D-89CAC323397E}.Release|x64.Build.0 = Release|Any CPU {2FCB9157-85F9-4631-838D-89CAC323397E}.Release|x86.ActiveCfg = Release|Any CPU {2FCB9157-85F9-4631-838D-89CAC323397E}.Release|x86.Build.0 = Release|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Debug|x64.ActiveCfg = Debug|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Debug|x64.Build.0 = Debug|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Debug|x86.ActiveCfg = Debug|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Debug|x86.Build.0 = Debug|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Release|Any CPU.Build.0 = Release|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Release|x64.ActiveCfg = Release|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Release|x64.Build.0 = Release|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Release|x86.ActiveCfg = Release|Any CPU - {F61BD0F4-A382-48EC-B586-3E02466BE98A}.Release|x86.Build.0 = Release|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Debug|x64.ActiveCfg = Debug|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Debug|x64.Build.0 = Debug|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Debug|x86.ActiveCfg = Debug|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Debug|x86.Build.0 = Debug|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Release|Any CPU.Build.0 = Release|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Release|x64.ActiveCfg = Release|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Release|x64.Build.0 = Release|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Release|x86.ActiveCfg = Release|Any CPU - {4D7DA60C-2B66-4E12-986F-F2A901B2F7E0}.Release|x86.Build.0 = Release|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Debug|x64.ActiveCfg = Debug|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Debug|x64.Build.0 = Debug|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Debug|x86.ActiveCfg = Debug|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Debug|x86.Build.0 = Debug|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Release|Any CPU.Build.0 = Release|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Release|x64.ActiveCfg = Release|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Release|x64.Build.0 = Release|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Release|x86.ActiveCfg = Release|Any CPU - {B8584170-3D77-4A0F-BD89-56C49AFF6069}.Release|x86.Build.0 = Release|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Debug|x64.Build.0 = Debug|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Debug|x86.Build.0 = Debug|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Release|Any CPU.Build.0 = Release|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Release|x64.ActiveCfg = Release|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Release|x64.Build.0 = Release|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Release|x86.ActiveCfg = Release|Any CPU - {E5CA2CC4-D572-4606-8C7F-CE14B6A5BA4D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE