diff --git a/.gitignore b/.gitignore index 4b2c8ff..e77b9b1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ S7.Net.UnitTest/obj *.v11 *.user *.suo -*.ncrunchproject \ No newline at end of file +*.ncrunchproject +*.nupkg +.vs \ No newline at end of file diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config new file mode 100644 index 0000000..67f8ea0 --- /dev/null +++ b/.nuget/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe new file mode 100644 index 0000000..8dd7e45 Binary files /dev/null and b/.nuget/NuGet.exe differ diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets new file mode 100644 index 0000000..3f8c37b --- /dev/null +++ b/.nuget/NuGet.targets @@ -0,0 +1,144 @@ + + + + $(MSBuildProjectDirectory)\..\ + + + false + + + false + + + true + + + false + + + + + + + + + + + $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) + + + + + $(SolutionDir).nuget + + + + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config + $(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config + + + + $(MSBuildProjectDirectory)\packages.config + $(PackagesProjectConfig) + + + + + $(NuGetToolsPath)\NuGet.exe + @(PackageSource) + + "$(NuGetExePath)" + mono --runtime=v4.0.30319 "$(NuGetExePath)" + + $(TargetDir.Trim('\\')) + + -RequireConsent + -NonInteractive + + "$(SolutionDir) " + "$(SolutionDir)" + + + $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) + $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols + + + + RestorePackages; + $(BuildDependsOn); + + + + + $(BuildDependsOn); + BuildPackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/NuGetPack.bat b/NuGetPack.bat new file mode 100644 index 0000000..8353a51 --- /dev/null +++ b/NuGetPack.bat @@ -0,0 +1,7 @@ +@echo off +set /p version="Version: " +msbuild S7.Net\S7.Net.csproj /P:Configuration=Release +rmdir /S /Q nuget-pack\lib +xcopy S7.Net\bin\Release\S7.Net.dll nuget-pack\lib\net45\ /Y +.nuget\nuget pack nuget-pack\S7.Net.nuspec -Version %version% +pause \ No newline at end of file diff --git a/README.md b/README.md index 4c230c0..0d6b269 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,10 @@ to my request for committing code, I decided to pick up where he left off here o + Compatible S7 PLC (S7-200, S7-300, S7-400, S7-1200) + .NET Framework 3.5 or higher +## Nuget + +PM> Install-Package S7netplus + ## Basic Usage ```C# diff --git a/nuget-pack/.gitignore b/nuget-pack/.gitignore new file mode 100644 index 0000000..c306553 --- /dev/null +++ b/nuget-pack/.gitignore @@ -0,0 +1 @@ ++lib/ \ No newline at end of file diff --git a/nuget-pack/S7.Net.nuspec b/nuget-pack/S7.Net.nuspec new file mode 100644 index 0000000..2c4cbae --- /dev/null +++ b/nuget-pack/S7.Net.nuspec @@ -0,0 +1,17 @@ + + + + S7netplus + $version$ + S7.Net Plus + Derek Heiser + Derek Heiser + https://github.com/killnine/s7netplus + false + A continuation of Juergen1969's Siemens communication library. + PLC Siemens Communication S7 + en-US + Derek Heiser 2015 + + + \ No newline at end of file diff --git a/nuget-pack/lib/net45/S7.Net.dll b/nuget-pack/lib/net45/S7.Net.dll new file mode 100644 index 0000000..9b6a326 Binary files /dev/null and b/nuget-pack/lib/net45/S7.Net.dll differ