Merge pull request #53 from technosoftware/master

Merged repositories and updated license

CHANGELOG.md

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------------------------------------------------
+## OPC DA/AE/HDA Solution .NET - 1.4.0
+
+###	Changes
+- Merged https://github.com/technosoftware-gmbh/opcua-solution-net-samples into this repository
+- NuGet packages are now also GPL 3.0 or SCLA 1.0
+
 -------------------------------------------------------------------------------------------------------------
 ## OPC DA/AE/HDA Solution .NET - 1.3.0
 

DaAeHdaNetStandard.sln

@@ -1,14 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.452
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Technosoftware.DaAeHdaClient", "src\Technosoftware\DaAeHdaClient\Technosoftware.DaAeHdaClient.csproj", "{EEFD269C-B83E-4C9B-8F96-432FAD558B98}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FD919B47-42CE-49AA-8BE9-E0FD272CCEF2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaConsole", "examples\Workshop\DaConsole\DaConsole.csproj", "{0B246B20-DD7C-430D-A36D-FDC04AFEFA56}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,10 +15,6 @@ Global
 		{EEFD269C-B83E-4C9B-8F96-432FAD558B98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EEFD269C-B83E-4C9B-8F96-432FAD558B98}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EEFD269C-B83E-4C9B-8F96-432FAD558B98}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B246B20-DD7C-430D-A36D-FDC04AFEFA56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B246B20-DD7C-430D-A36D-FDC04AFEFA56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B246B20-DD7C-430D-A36D-FDC04AFEFA56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B246B20-DD7C-430D-A36D-FDC04AFEFA56}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

README.md

@@ -23,8 +23,14 @@ We provide an online help for the current version: [OPC DA/AE/HDA Solution NET O
 
 ## Getting started
 
+### Examples using the latest NuGet package
+
 Examples can be found in the solution [WorkshopClientSamples.sln](/WorkshopClientSamples.sln).
 
+### Examples using the source code
+
+Examples can be found in the solution [SampleClients.sln](/SampleClients.sln).
+
 ### Licenses
 TECHNOSOFTWARE provides different licenses depending on the component and on the ownership of a purchased license of the user of the sources. A single ZIP file or a single repository can contain multiple components where the sources have different license models. The valid license is in the header of each source file.
 
@@ -38,7 +44,7 @@ The OPC DA/AE/HDA Client Solution .NET One-time fee for lifetime SCLA 1.0 licens
 
 ### Get Support for the Solution under GPL 3.0 or SCLA 1.0
 
-Support for the Solution under the GPL 3.0 or SCLA 1.0 is available [here](https://github.com/technosoftware-gmbh/opcdaaehda-solution-net-src/issues).
+Support for the Solution under the GPL 3.0 or SCLA 1.0 is available [here](https://github.com/technosoftware-gmbh/opcdaaehda-solution-net/issues).
 
 ### Contribution
 

WorkshopClientSamples.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29102.190
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32901.215
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{857A6774-6F49-4220-AC55-D53D60FCCB3B}"
 EndProject
@@ -10,10 +10,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AeConsole", "examples\Works
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HdaConsole", "examples\Workshop\HdaConsole\HdaConsole.csproj", "{4FD4F439-0C2F-4282-BE5E-1ED004192FB7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Technosoftware.DaAeHdaClient", "src\Technosoftware\DaAeHdaClient\Technosoftware.DaAeHdaClient.csproj", "{C517FB7E-E2B8-4490-8A71-2C724B628025}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Library", "Library", "{17BB3E48-680C-44E7-9F11-D0960DA927F3}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -32,10 +28,6 @@ Global
 		{4FD4F439-0C2F-4282-BE5E-1ED004192FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FD4F439-0C2F-4282-BE5E-1ED004192FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FD4F439-0C2F-4282-BE5E-1ED004192FB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C517FB7E-E2B8-4490-8A71-2C724B628025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C517FB7E-E2B8-4490-8A71-2C724B628025}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C517FB7E-E2B8-4490-8A71-2C724B628025}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C517FB7E-E2B8-4490-8A71-2C724B628025}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -44,7 +36,6 @@ Global
 		{473E5F43-2EDA-47EE-B7DD-0FB685831A4D} = {857A6774-6F49-4220-AC55-D53D60FCCB3B}
 		{6D1550B3-28B1-492B-8D33-F063CA4A68A7} = {857A6774-6F49-4220-AC55-D53D60FCCB3B}
 		{4FD4F439-0C2F-4282-BE5E-1ED004192FB7} = {857A6774-6F49-4220-AC55-D53D60FCCB3B}
-		{C517FB7E-E2B8-4490-8A71-2C724B628025} = {17BB3E48-680C-44E7-9F11-D0960DA927F3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {33FA5BCB-C827-4D44-AECF-F51342DFE64A}

examples/Workshop/AeConsole/AeConsole.csproj

@@ -13,13 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Properties\**" />
-    <EmbeddedResource Remove="Properties\**" />
-    <None Remove="Properties\**" />
+    <Folder Include="Properties\" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Technosoftware\DaAeHdaClient\Technosoftware.DaAeHdaClient.csproj" />
+    <PackageReference Include="Technosoftware.DaAeHdaSolution.DaAeHdaClient" Version="1.4.0" />
   </ItemGroup>
 
 </Project>

examples/Workshop/DaConsole/DaConsole.csproj

@@ -13,13 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Properties\**" />
-    <EmbeddedResource Remove="Properties\**" />
-    <None Remove="Properties\**" />
+    <Folder Include="Properties\" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Technosoftware\DaAeHdaClient\Technosoftware.DaAeHdaClient.csproj" />
+    <PackageReference Include="Technosoftware.DaAeHdaSolution.DaAeHdaClient" Version="1.4.0" />
   </ItemGroup>
 
 </Project>

examples/Workshop/HdaConsole/HdaConsole.csproj

@@ -13,13 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Properties\**" />
-    <EmbeddedResource Remove="Properties\**" />
-    <None Remove="Properties\**" />
+    <Folder Include="Properties\" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Technosoftware\DaAeHdaClient\Technosoftware.DaAeHdaClient.csproj" />
+    <PackageReference Include="Technosoftware.DaAeHdaSolution.DaAeHdaClient" Version="1.4.0" />
   </ItemGroup>
 
 </Project>

nuget/Technosoftware.DaAeHdaSolution.DaAeHdaClient.nuspec

@@ -2,13 +2,13 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata>
     <id>Technosoftware.DaAeHdaSolution.DaAeHdaClient</id>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <title>OPC DA/AE/HDA Solution .NET Client Library</title>
     <description>OPC DA/AE/HDA .NET Client Library</description>
     <readme>README.md</readme>
     <authors>Technosoftware GmbH</authors>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <license type="file">licenses/LICENSE.txt</license>
+    <license type="file">LICENSE.md</license>
     <projectUrl>https://github.com/technosoftware-gmbh/opcdaaehda-solution-net-samples</projectUrl>
     <icon>images/TechnosoftwareGmbH.png</icon>
     <releaseNotes>https://github.com/technosoftware-gmbh/opcdaaehda-solution-net-samples/releases</releaseNotes>
@@ -50,8 +50,7 @@
     <file src="../README.md" target="/" />
     <file src="../CHANGELOG.md" target="/" />
     <file src="../nuget/TechnosoftwareGmbH.png" target="images/" />
-    <file src="../licenses/LICENSE.txt" target="licenses/LICENSE.txt"/>
-    <file src="../licenses/Technosoftware_SLA.pdf" target="licenses/Technosoftware_SLA.pdf"/>
+    <file src="../LICENSE.md" target="/"/>
     <file src="../lib/netstandard2.1/Technosoftware.DaAeHdaClient.dll" target="lib/netstandard2.1/" />
     <file src="../lib/netstandard2.1/Technosoftware.DaAeHdaClient.xml" target="lib/netstandard2.1/" />
     <file src="../lib/net6.0-windows/Technosoftware.DaAeHdaClient.dll" target="lib/net6.0-windows7.0/" />

targets.props

@@ -1,19 +1,21 @@
 <Project>
   <Choose>
-    <!-- Visual Studio 2022 -->
+    <!-- Note: .NET 5.0 and .NET Core 2.x is end of life. -->
+    <!-- Visual Studio 2022, supports .NET Framework 4.6.2, .NET Core 3.1 and .NET 6 -->
     <When  Condition="'$(VisualStudioVersion)' == '17.0'">
       <PropertyGroup>
         <AppTargetFrameworks>net462;net472;net48;net6.0-windows</AppTargetFrameworks>
         <LibTargetFrameworks>net462;net472;net48;netstandard2.1;net6.0-windows</LibTargetFrameworks>
       </PropertyGroup>
     </When>
-    <!-- Visual Studio 2019 -->
+    <!-- Visual Studio 2019, supports .NET Framework 4.6.2 and .NET Core 3.1 -->
     <When Condition="'$(VisualStudioVersion)' == '16.0'">
       <PropertyGroup>
         <AppTargetFrameworks>net462;net472;net48</AppTargetFrameworks>
         <LibTargetFrameworks>net462;net472;net48;netstandard2.1</LibTargetFrameworks>
       </PropertyGroup>
     </When>
+    <!-- Visual Studio 2017 and earlier, support only .NET Framework 4.6.2. -->
     <Otherwise>
       <PropertyGroup>
         <AppTargetFrameworks>net462</AppTargetFrameworks>

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "versionHeightOffset": 0,
   "nugetPackageVersion": {
     "semVer": 2