target frameworks net461 and netstandard2.0

andreaskueffel · Nov 25, 2020 · 019c8a9 · 019c8a9
1 parent b68f743
commit 019c8a9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/src/Ctrl2MqttBridge/Ctrl2MqttBridge.csproj b/src/Ctrl2MqttBridge/Ctrl2MqttBridge.csproj
@@ -2,15 +2,15 @@
 
   <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>
     <Copyright>2018-2020</Copyright>
     <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
@@ -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
diff --git 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
@@ -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
@@ -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>