From: WonYoung Choi Date: Wed, 31 May 2017 10:43:32 +0000 (+0900) Subject: Remove GenAPI Tasks X-Git-Tag: submit/tizen/20170531.104434^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fdfccffade22481139d74a766fa0a03eaf02255f;p=platform%2Fcore%2Fdotnet%2Fbuild-tools.git Remove GenAPI Tasks ReferenceAssemblies of Tizen API packages will be generated in other project. Change-Id: Iba697793909b05ce43b8efd2e88051879bae96be --- diff --git a/GenAPI/GenAPI.exe b/GenAPI/GenAPI.exe deleted file mode 100755 index 10564374..00000000 Binary files a/GenAPI/GenAPI.exe and /dev/null differ diff --git a/GenAPI/GenAPI.runtimeconfig.json b/GenAPI/GenAPI.runtimeconfig.json deleted file mode 100644 index 9b04e483..00000000 --- a/GenAPI/GenAPI.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "netcoreapp2.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "2.0.0-*" - } - } -} diff --git a/GenAPI/LICENSE b/GenAPI/LICENSE deleted file mode 100644 index 56e51b1c..00000000 --- a/GenAPI/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) .NET Foundation and Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/GenAPI/Microsoft.Cci.Extensions.dll b/GenAPI/Microsoft.Cci.Extensions.dll deleted file mode 100755 index ca41b9fe..00000000 Binary files a/GenAPI/Microsoft.Cci.Extensions.dll and /dev/null differ diff --git a/GenAPI/Microsoft.Cci.dll b/GenAPI/Microsoft.Cci.dll deleted file mode 100755 index 0956d9a9..00000000 Binary files a/GenAPI/Microsoft.Cci.dll and /dev/null differ diff --git a/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets b/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets index 0cdb5168..a78744bd 100644 --- a/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets +++ b/Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets @@ -1,10 +1,5 @@ - - - <__ToolsDir>/usr/share/dotnet-build-tools - - false @@ -28,8 +23,6 @@ $(BuildDependsOn); - __CheckTizenPlatformPackages; - __GenerateReferenceAssembly; __AppendNuGetAssemblyFiles; @@ -39,16 +32,6 @@ $(OutputPath)$(AssemblyName).xml - - - <_GenAPITargetDir>_ref - <_GenAPITargetSourcePath>$(_GenAPITargetDir)/$(TargetName).cs - <_GenAPITargetAssemblyInfoPath>$(_GenAPITargetDir)/$(TargetName).AssemblyInfo.cs - <_GenAPITargetAssemblyPath>$(_GenAPITargetDir)/$(TargetName).dll - <_GenAPIPath Condition="'$(_GenAPIPath)' == ''">$(__ToolsDir)/GenAPI/GenAPI.exe - <_GenAPICommand>dotnet $(_GenAPIPath) - - $(MSBuildProjectDirectory)/$(AssemblyName).nuspec @@ -64,118 +47,9 @@ - - - - - - - true - - - - - - - - - - <_referencePathDirectoriesWithDuplicates Include="%(ReferencePath.RootDir)%(ReferencePath.Directory)" /> - <_referencePathDirectories Include="%(_referencePathDirectoriesWithDuplicates.Identity)" /> - - - - - - <__RefCompile Include="$(_GenAPITargetSourcePath)"/> - - - - - - - - - - - - - - - - - - - - - - - <__RefCompile Include="$(_GenAPITargetAssemblyInfoPath)" /> - - - - - - - - - - - ref/$(TargetFramework) - - - ref/$(TargetFramework) - - - - - - - - - - - - - - diff --git a/Tools/TizenPlatformPackages.txt b/Tools/TizenPlatformPackages.txt deleted file mode 100644 index 97bedcf7..00000000 --- a/Tools/TizenPlatformPackages.txt +++ /dev/null @@ -1,58 +0,0 @@ -ElmSharp -Tizen -Tizen.Account.AccountManager -Tizen.Account.FidoClient -Tizen.Account.OAuth2 -Tizen.Applications -Tizen.Applications.Alarm -Tizen.Applications.Badge -Tizen.Applications.Common -Tizen.Applications.DataControl -Tizen.Applications.MessagePort -Tizen.Applications.Notification -Tizen.Applications.NotificationEventListener -Tizen.Applications.PackageManager -Tizen.Applications.Preference -Tizen.Applications.RemoteView -Tizen.Applications.Service -Tizen.Applications.ToastMessage -Tizen.Applications.UI -Tizen.Applications.WidgetApplication -Tizen.Applications.WidgetControl -Tizen.Content.Download -Tizen.Content.MediaContent -Tizen.Content.MimeType -Tizen.Location -Tizen.Location.Geofence -Tizen.Log -Tizen.Maps -Tizen.Messaging -Tizen.Messaging.Push -Tizen.Multimedia -Tizen.Network.Bluetooth -Tizen.Network.Connection -Tizen.Network.IoTConnectivity -Tizen.Network.Nfc -Tizen.Network.Smartcard -Tizen.Network.WiFi -Tizen.Network.WiFiDirect -Tizen.NUI -Tizen.PhonenumberUtils -Tizen.Pims.Calendar -Tizen.Pims.Contacts -Tizen.Security -Tizen.Security.SecureRepository -Tizen.Sensor -Tizen.System -Tizen.System.Feedback -Tizen.System.Information -Tizen.System.MediaKey -Tizen.System.Storage -Tizen.System.SystemSettings -Tizen.Telephony -Tizen.Tracer -Tizen.Uix.InputMethodManager -Tizen.Uix.Stt -Tizen.Uix.Tts -Tizen.Uix.VoiceControl -Tizen.WebView \ No newline at end of file diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec index d05c36ab..c8fbfe3a 100644 --- a/packaging/dotnet-build-tools.spec +++ b/packaging/dotnet-build-tools.spec @@ -3,7 +3,7 @@ Name: dotnet-build-tools Summary: Tools for building C# API projects -Version: 1.2.4 +Version: 1.2.5 Release: 1 Group: Development/Libraries License: MIT and Apache-2.0 @@ -32,7 +32,6 @@ C# Deivce API with xbuild in GBS environment. %define NUGET_PATH %{_datadir}/NuGet %define TOOLS_PATH %{_datadir}/dotnet-build-tools %define CLI_PATH %{TOOLS_PATH}/cli -%define GENAPI_PATH %{TOOLS_PATH}/GenAPI %prep %setup -q @@ -65,10 +64,6 @@ mkdir -p %{buildroot}%{CLI_PATH} cp -fr ./dotnet/* %{buildroot}%{CLI_PATH} ln -s %{CLI_PATH}/dotnet %{buildroot}%{_bindir}/dotnet -# GenAPI -mkdir -p %{buildroot}%{GENAPI_PATH} -install -p -m 644 GenAPI/* %{buildroot}%{GENAPI_PATH} - # Tizen.GBS.BuildTasks mkdir -p %{buildroot}%{XBUILD_PATH}/14.0/Microsoft.Common.targets/ImportAfter install -p -m 644 Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets %{buildroot}%{XBUILD_PATH}/14.0/Microsoft.Common.targets/ImportAfter @@ -91,7 +86,7 @@ mkdir -p %{buildroot}%{XBUILD_PATH}/14.0/Microsoft.Common.targets/ImportAfter install -p -m 644 NuGet.BuildTasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets %{buildroot}%{XBUILD_PATH}/14.0/Microsoft.Common.targets/ImportAfter %files -%license NuGet/LICENSE GenAPI/LICENSE +%license NuGet/LICENSE %config(noreplace) %{_sysconfdir}/rpm/macros.dotnet-build-tools %{_bindir}/* %{NUGET_PATH}/*