From: Wonyoung Choi Date: Fri, 14 Dec 2018 10:54:25 +0000 (+0900) Subject: Update dotnet-sdk to 2.1.502 X-Git-Tag: accepted/tizen/unified/20181217.142337^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=87fb204f546fd498d477c065d6e8352a47ce2b88;p=platform%2Fcore%2Fdotnet%2Fbuild-tools.git Update dotnet-sdk to 2.1.502 Change-Id: Ib32dbf86f7b0db482b2f2204f945dea7cac1b4f1 --- diff --git a/Tools/dotnet-build.sh b/Tools/dotnet-build.sh index d33ecb1..ef9b020 100755 --- a/Tools/dotnet-build.sh +++ b/Tools/dotnet-build.sh @@ -59,7 +59,7 @@ cmd_install() { local DEST=$1; shift mkdir -p $DEST if [[ $TYPE == "assembly" ]]; then - find $PROJECT/bin -name $PROJECT.dll -exec install -p -m 644 {} $DEST \; + find $PROJECT/bin -name $PROJECT.dll -not -path "*/ref/*" -exec install -p -m 644 {} $DEST \; elif [[ $TYPE == "nupkg" ]]; then find . -name "$PROJECT.[0-9]*.nupkg" -exec install -p -m 644 {} $DEST \; fi diff --git a/Tools/dotnet-wrapper.sh b/Tools/dotnet-wrapper.sh new file mode 100644 index 0000000..027d7e7 --- /dev/null +++ b/Tools/dotnet-wrapper.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +DOTNET_CLI_PATH=/usr/share/dotnet-build-tools/cli/dotnet + +export DOTNET_CLI_TELEMETRY_OPTOUT=1 +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +export MSBUILDDISABLENODEREUSE=true + +$DOTNET_CLI_PATH $@ /nodeReuse:false /p:UseRazorBuildServer=false /p:UseSharedCompilation=false diff --git a/packaging/deps.tar.gz b/packaging/deps.tar.gz index ac78464..f9ba9bb 100644 Binary files a/packaging/deps.tar.gz and b/packaging/deps.tar.gz differ diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec index 6629c31..f514c9e 100644 --- a/packaging/dotnet-build-tools.spec +++ b/packaging/dotnet-build-tools.spec @@ -3,14 +3,14 @@ Name: dotnet-build-tools Summary: Tools for building C# API projects -Version: 2.1.500 +Version: 2.1.502 Release: 1 Group: Development/Libraries License: MIT and Apache-2.0 URL: https://www.tizen.org Source0: %{name}-%{version}.tar.gz Source1: macros.dotnet-build-tools -Source21: dotnet-sdk-2.1.500-linux-x64.tar.gz +Source21: dotnet-sdk-%{version}-linux-x64.tar.gz Source22: deps.tar.gz AutoReqProv: no @@ -23,7 +23,7 @@ Requires: corefx-managed-ref Build target files (.Targets) and Tools (including NuGet.exe) for building C# Deivce API with xbuild in GBS environment. -%define TOOLS_PATH %{_datadir}/dotnet-build-tools +%define TOOLS_PATH /usr/share/dotnet-build-tools %define CLI_PATH %{TOOLS_PATH}/cli %prep @@ -62,7 +62,7 @@ ln -s %{TOOLS_PATH}/dotnet-build.sh %{buildroot}%{_bindir}/dotnet-build # .NETCore SDK mkdir -p %{buildroot}%{CLI_PATH} cp -fr ./dotnet/* %{buildroot}%{CLI_PATH} -ln -s %{CLI_PATH}/dotnet %{buildroot}%{_bindir}/dotnet +ln -s %{TOOLS_PATH}/dotnet-wrapper.sh %{buildroot}%{_bindir}/dotnet # Tizen.GBS.BuildTasks install -p -m 644 Tizen.GBS.BuildTasks/Tizen.GBS.ImportAfter.targets %{buildroot}%{CLI_PATH}/sdk/*/15.0/Microsoft.Common.targets/ImportAfter diff --git a/packaging/dotnet-sdk-2.1.500-linux-x64.tar.gz b/packaging/dotnet-sdk-2.1.502-linux-x64.tar.gz similarity index 90% rename from packaging/dotnet-sdk-2.1.500-linux-x64.tar.gz rename to packaging/dotnet-sdk-2.1.502-linux-x64.tar.gz index 87f370f..4a969c2 100644 Binary files a/packaging/dotnet-sdk-2.1.500-linux-x64.tar.gz and b/packaging/dotnet-sdk-2.1.502-linux-x64.tar.gz differ