Merge pull request #1 from aersamkull/master

Move to new Project System
2024-05-18 16:32:36 +02:00 · 2018-01-29 09:17:00 -05:00 · 2018-01-29 09:17:00 -05:00 · 12cbcdd182
parent c2a9f6f237 f830c1f83d
commit 12cbcdd182
16 changed files with 150 additions and 112 deletions
--- a/build/net35/sandbox.dll
+++ b/build/net35/sandbox.dll
--- a/build/net35/xmlrpcwsc.dll
+++ b/build/net35/xmlrpcwsc.dll
--- a/build/net45/sandbox.dll
+++ b/build/net45/sandbox.dll
--- a/build/net45/xmlrpcwsc.dll
+++ b/build/net45/xmlrpcwsc.dll
--- a/build/netcoreapp2.0/sandbox.deps.json
+++ b/build/netcoreapp2.0/sandbox.deps.json
@ -0,0 +1,36 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v2.0",
+    "signature": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v2.0": {
+      "sandbox/1.0.0": {
+        "dependencies": {
+          "xmlrpcwsc": "1.0.0"
+        },
+        "runtime": {
+          "sandbox.dll": {}
+        }
+      },
+      "xmlrpcwsc/1.0.0": {
+        "runtime": {
+          "xmlrpcwsc.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "sandbox/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "xmlrpcwsc/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
--- a/build/netcoreapp2.0/sandbox.dll
+++ b/build/netcoreapp2.0/sandbox.dll
--- a/build/netcoreapp2.0/xmlrpcwsc.deps.json
+++ b/build/netcoreapp2.0/xmlrpcwsc.deps.json
@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v2.0",
+    "signature": "da39a3ee5e6b4b0d3255bfef95601890afd80709"
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v2.0": {
+      "xmlrpcwsc/1.0.0": {
+        "runtime": {
+          "xmlrpcwsc.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "xmlrpcwsc/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
--- a/build/netcoreapp2.0/xmlrpcwsc.dll
+++ b/build/netcoreapp2.0/xmlrpcwsc.dll
--- a/build/netstandard2.0/xmlrpcwsc.deps.json
+++ b/build/netstandard2.0/xmlrpcwsc.deps.json
@ -0,0 +1,47 @@
+{
+  "runtimeTarget": {
+    "name": ".NETStandard,Version=v2.0/",
+    "signature": "2468f8819b4e290b1a8667020137de51bd83af19"
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETStandard,Version=v2.0": {},
+    ".NETStandard,Version=v2.0/": {
+      "xmlrpcwsc/1.4.0": {
+        "dependencies": {
+          "NETStandard.Library": "2.0.1"
+        },
+        "runtime": {
+          "xmlrpcwsc.dll": {}
+        }
+      },
+      "Microsoft.NETCore.Platforms/1.1.0": {},
+      "NETStandard.Library/2.0.1": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.1.0"
+        }
+      }
+    }
+  },
+  "libraries": {
+    "xmlrpcwsc/1.4.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "Microsoft.NETCore.Platforms/1.1.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
+      "path": "microsoft.netcore.platforms/1.1.0",
+      "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
+    },
+    "NETStandard.Library/2.0.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-oA6nwv9MhEKYvLpjZ0ggSpb1g4CQViDVQjLUcDWg598jtvJbpfeP2reqwI1GLW2TbxC/Ml7xL6BBR1HmKPXlTg==",
+      "path": "netstandard.library/2.0.1",
+      "hashPath": "netstandard.library.2.0.1.nupkg.sha512"
+    }
+  }
+}
--- a/build/netstandard2.0/xmlrpcwsc.dll
+++ b/build/netstandard2.0/xmlrpcwsc.dll
--- a/build/xmlrpcwsc.dll
+++ b/build/xmlrpcwsc.dll
--- a/sandbox/Properties/AssemblyInfo.cs
+++ b/sandbox/Properties/AssemblyInfo.cs
@ -23,20 +23,8 @@ using System.Runtime.CompilerServices;
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.

-[assembly: AssemblyTitle("sandbox")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("sandbox")]
 [assembly: AssemblyCopyright("Copyright (c) 2016 Saúl Piña")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]

-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.0")]

 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.
--- a/sandbox/sandbox.csproj
+++ b/sandbox/sandbox.csproj
@ -1,43 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Label="Globals">
+    <SccProjectName>SAK</SccProjectName>
+    <SccProvider>SAK</SccProvider>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccLocalPath>SAK</SccLocalPath>
+    <AssemblyTitle>sandbox</AssemblyTitle>
+    <AssemblyCompany></AssemblyCompany>
+    <AssemblyVersion>1.1.0</AssemblyVersion>
+    <Product>sandbox</Product>
+  </PropertyGroup>
+
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{5B413D0A-0AC7-44BE-A4BF-0C824864C486}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>sandbox</RootNamespace>
-    <AssemblyName>sandbox</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\build\</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\build\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
+    <TargetFrameworks>netcoreapp2.0;net35;net45</TargetFrameworks>
+    <OutputPath>..\build</OutputPath>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xmlrpcwsc">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\build\xmlrpcwsc.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\xmlrpcwsc\xmlrpcwsc.csproj" />
  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
--- a/xmlrpcwsc/Properties/AssemblyInfo.cs
+++ b/xmlrpcwsc/Properties/AssemblyInfo.cs
@ -23,21 +23,11 @@ using System.Runtime.CompilerServices;
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.

-[assembly: AssemblyTitle("XmlRpc Web Service Client")]
 [assembly: AssemblyDescription("XmlRpc Web Service Client")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("xmlrpcwsc")]
 [assembly: AssemblyCopyright("Copyright (c) 2016 Saúl Piña")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.3.0")]
-
 // The following attributes are used to specify the signing key for the assembly,
 // if desired. See the Mono documentation for more information about signing.

--- a/xmlrpcwsc/XmlRpcRequest.cs
+++ b/xmlrpcwsc/XmlRpcRequest.cs
@ -88,32 +88,36 @@ namespace XmlRpc {
        /// Adds the parameter, if param is DateTime uses DateTime.UtcNow, for dateTime.iso8601 conversion
        /// </summary>
        /// <param name="param">Parameter</param>
-        public void AddParam(object param) {
+        public XmlRpcRequest AddParam(object param) {
            Params.Add(param);
+            return this;
        }

        /// <summary>
        /// Adds the parameters
        /// </summary>
        /// <param name="parameters">Parameters</param>
-        public void AddParams(params object[] list) {
+        public XmlRpcRequest AddParams(params object[] list) {
            Params.AddRange(list);
+            return this;
        }

        /// <summary>
        /// Adds the parameter array
        /// </summary>
        /// <param name="list">List</param>
-        public void AddParamArray(params object[] list) {
+        public XmlRpcRequest AddParamArray(params object[] list) {
            AddParam(XmlRpcParameter.AsArray(list));
+            return this;
        }

        /// <summary>
        /// Adds the parameter struct
        /// </summary>
        /// <param name="list">List</param>
-        public void AddParamStruct(params KeyValuePair<string,object>[] list) {
+        public XmlRpcRequest AddParamStruct(params KeyValuePair<string,object>[] list) {
            AddParam(XmlRpcParameter.AsStruct(list));
+            return this;
        }

        /// <summary>
--- a/xmlrpcwsc/xmlrpcwsc.csproj
+++ b/xmlrpcwsc/xmlrpcwsc.csproj
@ -1,49 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup Label="Globals">
+    <SccProjectName>SAK</SccProjectName>
+    <SccProvider>SAK</SccProvider>
+    <SccAuxPath>SAK</SccAuxPath>
+    <SccLocalPath>SAK</SccLocalPath>
+    <AssemblyTitle>XmlRpc Web Service Client</AssemblyTitle>
+    <AssemblyCompany></AssemblyCompany>
+    <AssemblyVersion>1.4.0</AssemblyVersion>
+    <Product>xmlrpcwsc</Product>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Version>1.4.0</Version>
+  </PropertyGroup>
+
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{B5FA7348-6454-4545-AC0C-5E94FE53FB6C}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>XmlRpc</RootNamespace>
-    <AssemblyName>xmlrpcwsc</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworks>netstandard2.0;net35;net45</TargetFrameworks>
+    <OutputPath>..\build</OutputPath>
  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\build\</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\build\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ComponentInfo.cs" />
-    <Compile Include="XmlRpcClient.cs" />
-    <Compile Include="XmlRpcParameter.cs" />
-    <Compile Include="XmlRpcRequest.cs" />
-    <Compile Include="XmlRpcResponse.cs" />
-    <Compile Include="WebServiceException.cs" />
-    <Compile Include="WebServiceTimeoutException.cs" />
-    <Compile Include="WebServiceConnection.cs" />
-    <Compile Include="RequestFactory.cs" />
-    <Compile Include="ResponseFactory.cs" />
-    <Compile Include="FactoryException.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+
+</Project>