From 019c8a94029c538a805aeec8f7b92d3eb7484a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=BCffel?= <andreas.kueffel@praewema.de>
Date: Wed, 25 Nov 2020 13:13:30 +0100
Subject: [PATCH] target frameworks net461 and netstandard2.0

---
 src/Ctrl2MqttBridge/Ctrl2MqttBridge.csproj    |   6 +++---
 src/Ctrl2MqttBridge/OperateNetService.cs      |   1 -
 .../SetupCreatorTools/SetupCreator.exe        | Bin 6656 -> 6656 bytes
 src/Ctrl2MqttClient/Ctrl2MqttClient.csproj    |  10 +++++++---
 src/SetupCreator/SetupCreator.csproj          |  12 ++++++++----
 ...ens.Sinumerik.Operate.Services.Stub.csproj |   4 ++--
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Ctrl2MqttBridge/Ctrl2MqttBridge.csproj b/src/Ctrl2MqttBridge/Ctrl2MqttBridge.csproj
index d0c8aca..8881e41 100644
--- a/src/Ctrl2MqttBridge/Ctrl2MqttBridge.csproj
+++ b/src/Ctrl2MqttBridge/Ctrl2MqttBridge.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <Version>2.0.1</Version>
     <Authors>Andreas Küffel</Authors>
     <Company>Präwema Antriebstechnik GmbH</Company>
@@ -10,7 +10,7 @@
     <PackageLicenseExpression></PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/andreaskueffel/Ctrl2MqttBridge</PackageProjectUrl>
     <RepositoryUrl>https://github.com/andreaskueffel/Ctrl2MqttBridge</RepositoryUrl>
-    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>mqtt opc ua opcua iot controller s7 sinumerik siemens operate operatenet rexroth</PackageTags>
     <Description>Ctrl2MqttBridge is a Bridge between a control connection (to either OPC UA or Sinumerik Operate) and an easy to implement Mqtt protocol. For client implementation use Ctrl2MqttClient</Description>
   </PropertyGroup>
@@ -40,7 +40,7 @@
     </None>
   </ItemGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(TargetFramework)'=='net461'">
     <Exec Command="if not $(ConfigurationName)==Release goto :endcreatesetup&#xD;&#xA; $(ProjectDir)\SetupCreatorTools\SetupCreator.exe $(TargetDir)&#xD;&#xA;rem D:\Source\References\MT\mt.exe -manifest &quot;$(TargetDir)Ctrl2MqttBridgeSetup.exe.manifest&quot;  -outputresource:&quot;$(TargetDir)Ctrl2MqttBridgeSetup.exe&quot;;1&#xD;&#xA;:endcreatesetup" />
   </Target>
 
diff --git a/src/Ctrl2MqttBridge/OperateNetService.cs b/src/Ctrl2MqttBridge/OperateNetService.cs
index ec06511..881a56d 100644
--- a/src/Ctrl2MqttBridge/OperateNetService.cs
+++ b/src/Ctrl2MqttBridge/OperateNetService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data.OleDb;
 using System.Threading.Tasks;
 using Ctrl2MqttBridge.Classes;
 using Ctrl2MqttBridge.Interfaces;
diff --git a/src/Ctrl2MqttBridge/SetupCreatorTools/SetupCreator.exe b/src/Ctrl2MqttBridge/SetupCreatorTools/SetupCreator.exe
index ab79e710cbf50b1f9ee8ffd8fa30726b666b9d7f..9375de313de5fe8a19e6067e763742b3a3ac2166 100644
GIT binary patch
delta 280
zcmZoLX)u}4q4=@dbO!?zJYY~_;AS*nU=RQba6kn0Caw%;ygiwbv7XUnawCxBpUlW4
z&cO(j1!A_zjsgao1DH&>1)Rg*Dr#<*@tprAX}9%(th1A+@P1-6oZQZ*3naJlS@S-P
zn!1L8(KmnzsI_GBUp{%(ExHU0TP7>=D+{QGRP1Wxd+ObyU|smuX93UT5PpZqpwyhy
z#NyPLywnmCGsBqR)RNKy=c3falKdjQf|MkNU=K$lQ!@sr-f9=9UZ6cXSEc&ovaM<g
wdifsIFzZ2l0wQHWY=w!6VvPKoIRx04CK|A8<`eqG%4jgTP<+DX0D*Ky0P71+Q2+n{

delta 281
zcmZoLX)u}4p(vL9V-5opJYZmA<YqKrU=RQba6kl&Caw%;yg!+dv7XUlawCuwp3KN3
z&cO_nWn^Gro9rlHusMLqgj+yPtNE`+fxW|GrlooA%GVSpPvQN<Xf(N<PZvmT<+JAX
zO?$hafzdaB38=MV@?SoA)*ZSG3_B((@+%8)RccJz@8RmPR#Ic*S*C5OlSB9&Vk<1n
zVuDh0QWJ|)WAai<Ow5d8f>TRM3!IBm6HD@o^a@gv7=k?<jZDoLp!!e1^n>hL$J@00
x<qy7@)*;(W+4Ug40g;Lzw!%b3F-GCdECOsyoB4!(u`-%WE)<`zIY1zt5dekFPFw&0

diff --git a/src/Ctrl2MqttClient/Ctrl2MqttClient.csproj b/src/Ctrl2MqttClient/Ctrl2MqttClient.csproj
index 9f84ebb..069a33a 100644
--- a/src/Ctrl2MqttClient/Ctrl2MqttClient.csproj
+++ b/src/Ctrl2MqttClient/Ctrl2MqttClient.csproj
@@ -2,14 +2,18 @@
 
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <Version>2.0.1</Version>
     <Authors>Andreas Küffel</Authors>
     <Company>Präwema Antriebstechnik GmbH</Company>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>2018-2020</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/andreaskueffel/Ctrl2MqttBridge</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/andreaskueffel/Ctrl2MqttBridge</RepositoryUrl>
+    <PackageLicenseFile></PackageLicenseFile>
+    <PackageTags>mqtt opc ua opcua iot controller s7 sinumerik siemens operate operatenet rexroth</PackageTags>
+    <Description>Ctrl2MqttClient is the client to the Ctrl2MqttBridge, bridging between a control connection (to either OPC UA or Sinumerik Operate) and an easy to implement Mqtt protocol. Needs a running Ctrl2MqttBridge instance.</Description>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.12" />
   </ItemGroup>
diff --git a/src/SetupCreator/SetupCreator.csproj b/src/SetupCreator/SetupCreator.csproj
index 3d0b934..1fd4422 100644
--- a/src/SetupCreator/SetupCreator.csproj
+++ b/src/SetupCreator/SetupCreator.csproj
@@ -1,15 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>net461</TargetFrameworks>
     <Platforms>AnyCPU;x86</Platforms>
+    <StartupObject>SetupCreator.Program</StartupObject>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net461'">
     <PackageReference Include="DotNetZip" Version="1.14.0" />
   </ItemGroup>
-
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+    <PackageReference Include="DotNetZip" Version="1.15.0" />
+  </ItemGroup>
+  
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="if not $(ConfigurationName)==Release goto :endcreatesetup&#xD;&#xA;copy $(OutDir)*.exe ..\..\src\Ctrl2MqttBridge\SetupCreatorTools\*.*&#xD;&#xA;copy $(OutDir)*.dll ..\..\src\Ctrl2MqttBridge\SetupCreatorTools\*.*&#xD;&#xA;:endcreatesetup" />
   </Target>
diff --git a/src/Siemens.Sinumerik.Operate.Services.Stub/Siemens.Sinumerik.Operate.Services.Stub.csproj b/src/Siemens.Sinumerik.Operate.Services.Stub/Siemens.Sinumerik.Operate.Services.Stub.csproj
index 372fbe5..1762f19 100644
--- a/src/Siemens.Sinumerik.Operate.Services.Stub/Siemens.Sinumerik.Operate.Services.Stub.csproj
+++ b/src/Siemens.Sinumerik.Operate.Services.Stub/Siemens.Sinumerik.Operate.Services.Stub.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>