From 1394910cdd53da7e0d4d283b322ef9d092f52700 Mon Sep 17 00:00:00 2001 From: Junghoon Park Date: Tue, 6 Sep 2016 16:59:24 +0900 Subject: [PATCH] Fix project files to support netstandard 1.6 Change-Id: I14b5c227943fb05b35deda39be442c35c09bb644 Signed-off-by: Junghoon Park --- .gitignore | 7 + packaging/csapi-widget-application.spec | 77 ++++-- .../CoreFx.References.targets | 265 --------------------- .../CustomDictionary.xml | 1 - .../GlobalSuppressions.cs | Bin 974 -> 0 bytes ...zen.Applications.WidgetApplication.Net45.csproj | 78 ++++++ ...plications.WidgetApplication.Net45.project.json | 13 + .../Tizen.Applications.WidgetApplication.csproj | 144 +++++------ .../Tizen.Applications.WidgetApplication.nuspec | 14 ++ ...zen.Applications.WidgetApplication.project.json | 19 ++ .../Tizen.Applications.WidgetApplication.sln | 12 +- 11 files changed, 265 insertions(+), 365 deletions(-) create mode 100644 .gitignore delete mode 100644 src/Tizen.Applications.WidgetApplication/CoreFx.References.targets delete mode 100755 src/Tizen.Applications.WidgetApplication/CustomDictionary.xml delete mode 100755 src/Tizen.Applications.WidgetApplication/GlobalSuppressions.cs create mode 100644 src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.csproj create mode 100644 src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.project.json create mode 100644 src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.nuspec create mode 100755 src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.project.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..46619d5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +bin/ +obj/ +*.exe +*.dll +*.csproj.user +*.lock.json +.vs/ diff --git a/packaging/csapi-widget-application.spec b/packaging/csapi-widget-application.spec index 05502b0..8a082bb 100755 --- a/packaging/csapi-widget-application.spec +++ b/packaging/csapi-widget-application.spec @@ -1,4 +1,4 @@ -%{!?dotnet_assembly_path: %define dotnet_assembly_path %{_datadir}/assembly} +%{!?dotnet_assembly_path: %define dotnet_assembly_path /opt/usr/share/dotnet.tizen/framework} %{!?dotnet_core_path: %define dotnet_core_path %{_datadir}/tizen.net/ref} %if 0%{?tizen_build_devel_mode} @@ -8,7 +8,7 @@ %endif Name: csapi-widget-application -Summary: Tizen Widget Application API for C# +Summary: Tizen widget application API for C# Version: 1.0.0 Release: 1 Group: Development/Libraries @@ -27,13 +27,16 @@ AutoReqProv: no BuildRequires: corefx-managed-32b-ref %endif +BuildRequires: dotnet-build-tools + # C# API Requries -BuildRequires: csapi-tizen -BuildRequires: csapi-uifw -BuildRequires: csapi-application +BuildRequires: csapi-tizen-devel +BuildRequires: csapi-application-devel +BuildRequires: csapi-uifw-devel + %description -Tizen Widget Application API for C# +Tizen widget application API for C# %prep %setup -q @@ -42,25 +45,69 @@ cp %{SOURCE1} . %define Assemblies Tizen.Applications.WidgetApplication %build +# Build for Net45 for ASM in %{Assemblies}; do -xbuild $ASM/$ASM.csproj \ +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 %if 0%{?_with_corefx} - /p:NoStdLib=True \ - /p:TargetFrameworkVersion=v5.0 \ - /p:AddAdditionalExplicitAssemblyReferences=False \ - /p:CoreFxPath=%{dotnet_core_path} \ +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 %endif - /p:Configuration=%{BUILDCONF} \ - /p:ReferencePath=%{dotnet_assembly_path} + +# Make NuGet package +dotnet-gbs pack $ASM/$ASM.nuspec --PackageVersion=%{version} --PackageFiles=$ASM/bin + done %install -mkdir -p %{buildroot}%{dotnet_assembly_path} +mkdir -p %{buildroot}%{dotnet_assembly_path}/devel for ASM in %{Assemblies}; do -install -p -m 644 $ASM/bin/%{BUILDCONF}/$ASM.dll %{buildroot}%{dotnet_assembly_path} + 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 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.Applications.WidgetApplication/CoreFx.References.targets b/src/Tizen.Applications.WidgetApplication/CoreFx.References.targets deleted file mode 100644 index dab29ec..0000000 --- a/src/Tizen.Applications.WidgetApplication/CoreFx.References.targets +++ /dev/null @@ -1,265 +0,0 @@ - - - - - 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.Applications.WidgetApplication/CustomDictionary.xml b/src/Tizen.Applications.WidgetApplication/CustomDictionary.xml deleted file mode 100755 index 8b13789..0000000 --- a/src/Tizen.Applications.WidgetApplication/CustomDictionary.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/Tizen.Applications.WidgetApplication/GlobalSuppressions.cs b/src/Tizen.Applications.WidgetApplication/GlobalSuppressions.cs deleted file mode 100755 index cceb7cd432aceffae84473d70c0b05624ff19ceb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 974 zcmaJ=(MrQW5S(Yhe>n1N?Kg-Z_#g=O#m6&^ZM02FlL+~Fb!NB6r723GcblEvotvBc z`Cej)fEBi=(Q)_Ab%%;Oj|YCOux9**k^lE-87Y5<29em22*>u!1?>5?X0AW20WTPE z;P1$~j=!hV8nLlX*SI1J@rbPIiK{tn;7<6!b!!>r)kCZL?TB-3K3OQB7c0C)P=ic9xz|Yna4z!%ATrW-^P& zsN)I5uQtugi$0Mx(!C?5HLM~(sp_Tvo*mRD5>w&E@}pt3S9VV&#aeO2>T;q+=CiVM zM9$L;XLo*Qu0@)kl}>(9f8E=L>hxG}j&7&KC%?OL&PVs3?p-d)+05oYkGY2icJJ9q zQxD|seoO3%3&(|-=L)M#3QxIa76l%S-`u@Pi3d*AODQIb2E3BZKvrv0RQ`}B8ser- ZO-ldmxVfW~&i=j{&d}S_>vMOD_b(Txrkwx) diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.csproj b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.csproj new file mode 100644 index 0000000..dbc42f7 --- /dev/null +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.csproj @@ -0,0 +1,78 @@ + + + + Debug + AnyCPU + {07A0D110-3092-4A09-BF85-95555C7E7DFF} + Library + Properties + + + Tizen.Applications.WidgetApplication + 512 + v4.5 + + + true + full + false + bin\Debug\Net45\ + DEBUG;TRACE + prompt + 4 + true + bin\Debug\Tizen.Applications.WidgetApplication.XML + ExtendedDesignGuidelineRules.ruleset + + + pdbonly + true + bin\Release\Net45\ + TRACE + prompt + 4 + true + + + true + + + Tizen.Applications.WidgetApplication.snk + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.project.json b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.project.json new file mode 100644 index 0000000..51bd736 --- /dev/null +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.Net45.project.json @@ -0,0 +1,13 @@ +{ + "dependencies": { + "Tizen": "1.0.0", + "Tizen.Applications": "1.0.0", + "Tizen.UI": "1.0.0" + }, + "frameworks": { + "net45": {} + }, + "runtimes": { + "win": {} + } +} diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj index 6fda119..ba98e70 100755 --- a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.csproj @@ -1,29 +1,37 @@  - - + + 14.0 Debug AnyCPU - {663C5A3D-E631-4987-AEE7-F498C56A40FC} + 8.0.30703 + 2.0 + {B96DCE41-7A6D-45A5-8BB8-E035186B5092} Library Properties - - + Tizen.Applications.WidgetApplication Tizen.Applications.WidgetApplication - v4.5 512 + en-US + + + .NETStandard + v1.6 + .NETStandard,Version=v1.6 + .NETStandard,Version=v1.6 + false + true + $(NoWarn);1701 + false true full - true + false bin\Debug\ DEBUG;TRACE prompt 4 - true - bin\Debug\Tizen.Applications.WidgetApplication.XML - ExtendedDesignGuidelineRules.ruleset pdbonly @@ -32,83 +40,63 @@ TRACE prompt 4 - true - - - true - - - Tizen.Applications.WidgetApplication.snk - - - - - - - - - - - + + - - - + + - - - - - - - - - ..\..\tizen\Tizen\bin\Debug\Tizen.dll - - - ..\..\tizen\Tizen.Internals\bin\Debug\Tizen.Internals.dll - - - ..\..\uifw\Tizen.UI\bin\Debug\Tizen.UI.dll - - - ..\..\task\application\Tizen.Applications\obj\Debug\Tizen.Applications.dll - - - - - {b9aa1cb2-f72d-4a30-a33b-a20c850a38a0} - Tizen.Internals - - - {7659ca59-410d-41a1-9841-586e88bc78c9} - Tizen - - - {d34841f9-046b-4dbf-9698-143386c24f78} - Tizen.UI - - - {d2d1a3ce-000e-4ab3-81c4-a8a44a008989} - Tizen.Applications - - - - - + - + + + + <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory) + <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory) + true + + + + $(MSBuildExtensionsPath)\Tizen + $(TizenBuildPath)\bin + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.nuspec b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.nuspec new file mode 100644 index 0000000..3fd846c --- /dev/null +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.nuspec @@ -0,0 +1,14 @@ + + + + Tizen.Applications.WidgetApplication + $version$ + Tizen Developers + Widget application API for Tizen.Net + + + + + + + diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.project.json b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.project.json new file mode 100755 index 0000000..6da012f --- /dev/null +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.project.json @@ -0,0 +1,19 @@ +{ + "buildOptions": { + "debugType": "portable", + "platform": "AnyCPU", + "preserveCompilationContext": true + }, + "dependencies": { + "NETStandard.Library": "1.6.0", + "Tizen": "1.0.0", + "Tizen.Applications": "1.0.0", + "Tizen.UI": "1.0.0" + }, + "runtimes": { + "win": {} + }, + "frameworks": { + "netstandard1.6": {} + } +} \ No newline at end of file diff --git a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.sln b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.sln index 715c3a5..2f85e10 100755 --- a/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.sln +++ b/src/Tizen.Applications.WidgetApplication/Tizen.Applications.WidgetApplication.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Applications.WidgetApplication", "Tizen.Applications.WidgetApplication.csproj", "{663C5A3D-E631-4987-AEE7-F498C56A40FC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tizen.Applications.WidgetApplication", "Tizen.Applications.WidgetApplication.csproj", "{B96DCE41-7A6D-45A5-8BB8-E035186B5092}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {663C5A3D-E631-4987-AEE7-F498C56A40FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {663C5A3D-E631-4987-AEE7-F498C56A40FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {663C5A3D-E631-4987-AEE7-F498C56A40FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {663C5A3D-E631-4987-AEE7-F498C56A40FC}.Release|Any CPU.Build.0 = Release|Any CPU + {B96DCE41-7A6D-45A5-8BB8-E035186B5092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B96DCE41-7A6D-45A5-8BB8-E035186B5092}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B96DCE41-7A6D-45A5-8BB8-E035186B5092}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B96DCE41-7A6D-45A5-8BB8-E035186B5092}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- 2.7.4