From a427b52d92a2c7f8ddeeed1e404f8605b0c76fb7 Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Tue, 6 Sep 2016 16:14:08 +0900 Subject: [PATCH] Revert "Fix project files to support netstandard 1.6" This reverts commit 920b0ec17158b3ebe551566243f96032d81917f0. Change-Id: I52bc66fbdac7a6eb880f8f17927a8882ae7baa57 --- .gitignore | 1 - packaging/csapi-network-iotconnectivity.spec | 68 +----- .../CoreFx.References.targets | 265 +++++++++++++++++++++ .../Tizen.Network.IoTConnectivity.Net45.csproj | 99 -------- ...izen.Network.IoTConnectivity.Net45.project.json | 11 - .../Tizen.Network.IoTConnectivity.csproj | 221 +++++++++-------- .../Tizen.Network.IoTConnectivity.nuspec | 12 - .../Tizen.Network.IoTConnectivity.project.json | 12 - 8 files changed, 395 insertions(+), 294 deletions(-) create mode 100644 src/Tizen.Network.IoTConnectivity/CoreFx.References.targets delete mode 100644 src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.csproj delete mode 100644 src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.project.json delete mode 100644 src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec delete mode 100644 src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json diff --git a/.gitignore b/.gitignore index 46619d5..17dd954 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ obj/ *.exe *.dll *.csproj.user -*.lock.json .vs/ diff --git a/packaging/csapi-network-iotconnectivity.spec b/packaging/csapi-network-iotconnectivity.spec index c7e525f..1d8a412 100644 --- a/packaging/csapi-network-iotconnectivity.spec +++ b/packaging/csapi-network-iotconnectivity.spec @@ -1,4 +1,4 @@ -%{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework} +%{!?dotnet_assembly_path: %define dotnet_assembly_path %{_datadir}/assembly} %{!?dotnet_core_path: %define dotnet_core_path %{_datadir}/tizen.net/ref} %if 0%{?tizen_build_devel_mode} @@ -27,10 +27,8 @@ AutoReqProv: no BuildRequires: corefx-managed-32b-ref %endif -BuildRequires: dotnet-build-tools - # C# API Requires -BuildRequires: csapi-tizen-devel +BuildRequires: csapi-tizen %description Tizen IoTConnectivity API for C# @@ -42,69 +40,25 @@ cp %{SOURCE1} . %define Assemblies Tizen.Network.IoTConnectivity %build -# Build for Net45 for ASM in %{Assemblies}; do -if [ -e $ASM/$ASM.Net45.csproj ]; then - xbuild $ASM/$ASM.Net45.csproj \ - /p:Configuration=%{BUILDCONF} \ - /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/net45 \ - /p:OutputPath=bin/net45 -fi - -# Build for Dotnet +xbuild $ASM/$ASM.csproj \ %if 0%{?_with_corefx} -if [ -e $ASM/$ASM.csproj ]; then - xbuild $ASM/$ASM.csproj \ - /p:Configuration=%{BUILDCONF} \ - /p:DotnetAssemblyPath=%{dotnet_assembly_path}/devel/netstandard1.6 \ - /p:CoreFxPath=%{dotnet_core_path} \ - /p:OutputPath=bin/netstandard1.6 -fi + /p:NoStdLib=True \ + /p:TargetFrameworkVersion=v5.0 \ + /p:AddAdditionalExplicitAssemblyReferences=False \ + /p:CoreFxPath=%{dotnet_core_path} \ %endif - -# Make NuGet package -dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin - + /p:Configuration=%{BUILDCONF} \ + /p:ReferencePath=%{dotnet_assembly_path} done %install -mkdir -p %{buildroot}%{dotnet_assembly_path}/devel +mkdir -p %{buildroot}%{dotnet_assembly_path} for ASM in %{Assemblies}; do - cp -fr $ASM/bin/* %{buildroot}%{dotnet_assembly_path}/devel -%if 0%{?_with_corefx} - install -p -m 644 $ASM/bin/netstandard1.6/$ASM.dll %{buildroot}%{dotnet_assembly_path} -%else - install -p -m 644 $ASM/bin/net45/$ASM.dll %{buildroot}%{dotnet_assembly_path} -%endif +install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path} done -mkdir -p %{buildroot}/nuget -install -p -m 644 *.nupkg %{buildroot}/nuget - %files %manifest %{name}.manifest %license LICENSE %attr(644,root,root) %{dotnet_assembly_path}/*.dll - -%package devel -Summary: Development package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -AutoReqProv: no - -%description devel -Development package for %{name} - -%files devel -%{dotnet_assembly_path}/devel/* - -%package nuget -Summary: NuGet package for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description nuget -NuGet package for %{name} - -%files nuget -/nuget/*.nupkg diff --git a/src/Tizen.Network.IoTConnectivity/CoreFx.References.targets b/src/Tizen.Network.IoTConnectivity/CoreFx.References.targets new file mode 100644 index 0000000..dab29ec --- /dev/null +++ b/src/Tizen.Network.IoTConnectivity/CoreFx.References.targets @@ -0,0 +1,265 @@ + + + + + False + $(CoreFxPath)/Microsoft.Win32.Primitives.dll + + + False + $(CoreFxPath)/System.AppContext.dll + + + False + $(CoreFxPath)/System.Collections.Concurrent.dll + + + False + $(CoreFxPath)/System.Collections.dll + + + False + $(CoreFxPath)/System.ComponentModel.Annotations.dll + + + False + $(CoreFxPath)/System.ComponentModel.dll + + + False + $(CoreFxPath)/System.Console.dll + + + False + $(CoreFxPath)/System.Diagnostics.Debug.dll + + + False + $(CoreFxPath)/System.Diagnostics.Process.dll + + + False + $(CoreFxPath)/System.Diagnostics.Tools.dll + + + False + $(CoreFxPath)/System.Diagnostics.TraceSource.dll + + + False + $(CoreFxPath)/System.Diagnostics.Tracing.dll + + + False + $(CoreFxPath)/System.Dynamic.Runtime.dll + + + False + $(CoreFxPath)/System.Globalization.Calendars.dll + + + False + $(CoreFxPath)/System.Globalization.dll + + + False + $(CoreFxPath)/System.Globalization.Extensions.dll + + + False + $(CoreFxPath)/System.IO.Compression.dll + + + False + $(CoreFxPath)/System.IO.Compression.ZipFile.dll + + + False + $(CoreFxPath)/System.IO.dll + + + False + $(CoreFxPath)/System.IO.FileSystem.dll + + + False + $(CoreFxPath)/System.IO.FileSystem.Primitives.dll + + + False + $(CoreFxPath)/System.IO.FileSystem.Watcher.dll + + + False + $(CoreFxPath)/System.IO.MemoryMappedFiles.dll + + + False + $(CoreFxPath)/System.IO.UnmanagedMemoryStream.dll + + + False + $(CoreFxPath)/System.Linq.dll + + + False + $(CoreFxPath)/System.Linq.Expressions.dll + + + False + $(CoreFxPath)/System.Linq.Parallel.dll + + + False + $(CoreFxPath)/System.Linq.Queryable.dll + + + False + $(CoreFxPath)/System.Net.Http.dll + + + False + $(CoreFxPath)/System.Net.NameResolution.dll + + + False + $(CoreFxPath)/System.Net.Primitives.dll + + + False + $(CoreFxPath)/System.Net.Requests.dll + + + False + $(CoreFxPath)/System.Net.Security.dll + + + False + $(CoreFxPath)/System.Net.Sockets.dll + + + False + $(CoreFxPath)/System.Net.WebHeaderCollection.dll + + + False + $(CoreFxPath)/System.Numerics.Vectors.dll + + + False + $(CoreFxPath)/System.ObjectModel.dll + + + False + $(CoreFxPath)/System.Reflection.DispatchProxy.dll + + + False + $(CoreFxPath)/System.Reflection.dll + + + False + $(CoreFxPath)/System.Reflection.Extensions.dll + + + False + $(CoreFxPath)/System.Reflection.Primitives.dll + + + False + $(CoreFxPath)/System.Reflection.TypeExtensions.dll + + + False + $(CoreFxPath)/System.Resources.ResourceManager.dll + + + False + $(CoreFxPath)/System.Runtime.dll + + + False + $(CoreFxPath)/System.Runtime.Extensions.dll + + + False + $(CoreFxPath)/System.Runtime.Handles.dll + + + False + $(CoreFxPath)/System.Runtime.InteropServices.dll + + + False + $(CoreFxPath)/System.Runtime.InteropServices.RuntimeInformation.dll + + + False + $(CoreFxPath)/System.Runtime.Loader.dll + + + False + $(CoreFxPath)/System.Runtime.Numerics.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.Algorithms.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.Encoding.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.Primitives.dll + + + False + $(CoreFxPath)/System.Security.Cryptography.X509Certificates.dll + + + False + $(CoreFxPath)/System.Text.Encoding.dll + + + False + $(CoreFxPath)/System.Text.Encoding.Extensions.dll + + + False + $(CoreFxPath)/System.Text.RegularExpressions.dll + + + False + $(CoreFxPath)/System.Threading.dll + + + False + $(CoreFxPath)/System.Threading.Tasks.dll + + + False + $(CoreFxPath)/System.Threading.Tasks.Parallel.dll + + + False + $(CoreFxPath)/System.Threading.Thread.dll + + + False + $(CoreFxPath)/System.Threading.ThreadPool.dll + + + False + $(CoreFxPath)/System.Threading.Timer.dll + + + False + $(CoreFxPath)/System.Xml.ReaderWriter.dll + + + False + $(CoreFxPath)/System.Xml.XDocument.dll + + + \ No newline at end of file diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.csproj b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.csproj deleted file mode 100644 index 43c8cf4..0000000 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.csproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - Debug - AnyCPU - {CBA7E5E8-8A24-446F-91C0-0FF2B198705E} - Library - Properties - Tizen.Network.IoTConnectivity - Tizen.Network.IoTConnectivity - 512 - v4.5 - - - true - full - true - bin\Debug\Net45\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\Net45\ - TRACE - prompt - 4 - - - true - - - Tizen.Network.IoTConnectivity.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.project.json b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.project.json deleted file mode 100644 index d9af4f0..0000000 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.Net45.project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "Tizen": "1.0.0" - }, - "frameworks": { - "net45": {} - }, - "runtimes": { - "win": {} - } -} diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj index 78554c0..0eb151d 100644 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj +++ b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.csproj @@ -1,108 +1,125 @@ - - - - Debug - AnyCPU - {3577EAE8-B409-4BAE-A5DA-C6340BE1DBC2} - Library - Properties - Tizen.Network.IoTConnectivity - Tizen.Network.IoTConnectivity - 512 - - - .NETStandard - v1.6 - .NETStandard,Version=v1.6 - false - true - $(NoWarn);1701;1702 - - - true - full - true - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - - - Tizen.Network.IoTConnectivity.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {3577EAE8-B409-4BAE-A5DA-C6340BE1DBC2} + Library + Properties + Tizen.Network.IoTConnectivity + Tizen.Network.IoTConnectivity + v4.5 + 512 + + 8.0.30703 + 2.0 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + + + Tizen.Network.IoTConnectivity.snk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + csapi-tizen + ..\..\tizen\Tizen\obj\Debug\Tizen.dll + + + csapi-tizen + ..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll + + + + + {B9AA1CB2-F72D-4A30-A33B-A20C850A38A0} + Tizen.Internals + True + + + {7659CA59-410D-41A1-9841-586E88BC78C9} + Tizen + True + + + - - - - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) - true - - \ No newline at end of file + --> + diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec deleted file mode 100644 index cf6cc06..0000000 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.nuspec +++ /dev/null @@ -1,12 +0,0 @@ - - - - Tizen.Network.IoTConnectivity - $version$ - Tizen Developers - IoTConnectivity API for Tizen.Net - - - - - diff --git a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json b/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json deleted file mode 100644 index beb9e15..0000000 --- a/src/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity.project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.0", - "Tizen": "1.0.0" - }, - "frameworks": { - "netstandard1.6": {} - }, - "runtimes": { - "win": {} - } -} -- 2.7.4