From dfeb2c9398115bdab0c8cc16f8c6a9c260cacf04 Mon Sep 17 00:00:00 2001 From: Abhijeet Date: Wed, 30 May 2018 19:26:24 -0700 Subject: [PATCH] Updating build files to accomodate latest updates of separating build files out of main branch. Adding signed build tasks binaries. Updating bash script for similar changes needed for travis. (#4394) --- Directory.Build.props | 59 +++++------------- Directory.Build.targets | 3 +- build.proj | 15 +---- test.props | 21 +------ testSdkOnLinux.sh | 15 +++-- .../Microsoft.Azure.Build.BootstrapTasks.dll | Bin 17272 -> 17272 bytes 6 files changed, 29 insertions(+), 84 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index aaa03058d2131..f5f3ec75627ee 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,47 +1,16 @@  - - $(MSBuildThisFileDirectory) - $(LibraryRoot)src - $(LibraryRoot)tools - $(LibraryRoot)restoredPackages - Microsoft Azure Management Libraries - src\Authentication\Authentication.sln - AzureManagementLibraries.sln - $(LibraryRoot)binaries - $(LibraryToolsFolder)\BuildAssets - $(LibraryRoot)PolicheckOutput - $(BinariesFolder)\packages - false - false - All - "$(LibraryToolsFolder)\nuget.exe" - 1234 - true - $(LibraryToolsFolder)\SdkBuildTools - - true - - - $(OnPremiseBuildTasks) - true - false - - - - $(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime - $(LibraryRoot)src\UpgradeVS17\SdkCommon\ClientRuntime - - - - $(BuildAssetsDir)\targets - $(SdkBuildToolsDir)\targets - - - $(BuildAssetsDir) - $(SdkBuildToolsDir) - - - - - + + $(MSBuildThisFileDirectory) + $(LibraryRoot)tools + $(LibraryToolsFolder)\BuildAssets + $(LibraryToolsFolder)\SdkBuildTools + + + $(BuildAssetsDir)\targets + $(SdkBuildToolsDir)\targets + $(BuildAssetsDir) + $(SdkBuildToolsDir) + + + diff --git a/Directory.Build.targets b/Directory.Build.targets index 09112c92b0e44..553ea5170d7e3 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,4 @@  - - + \ No newline at end of file diff --git a/build.proj b/build.proj index 3de0c40fa1e67..31c962f8b14b8 100644 --- a/build.proj +++ b/build.proj @@ -1,16 +1,7 @@ - + - - - - - - - - - - - + + \ No newline at end of file diff --git a/test.props b/test.props index cfe451d0e3804..7c8c0f72e514a 100644 --- a/test.props +++ b/test.props @@ -1,22 +1,3 @@ - - Debug - $(LibraryNugetPackageFolder) - - $(BuiltPackageOutputDir) - false - true - false - true - true - $(LibraryToolsFolder)\MSSharedLibKey.snk - - - - - - - - - + \ No newline at end of file diff --git a/testSdkOnLinux.sh b/testSdkOnLinux.sh index 036f5ecbc7f08..b13222014000a 100755 --- a/testSdkOnLinux.sh +++ b/testSdkOnLinux.sh @@ -169,7 +169,7 @@ skip_Rps() { } getBuildTools() { - copyFromRootDir="https://raw.githubusercontent.com/Azure/azure-sdk-for-net/NetSdkBuild" + copyFromRootDir="https://raw.githubusercontent.com/Azure/azure-sdk-for-net/SdkBuildTools" printf "Updating Build tools .....\n" if [ ! -d ./tools/SdkBuildTools ]; then @@ -179,6 +179,10 @@ getBuildTools() { mkdir ./tools/SdkBuildTools/targets fi + if [ ! -d ./tools/SdkBuildTools/targets/core ]; then + mkdir ./tools/SdkBuildTools/targets/core + fi + if [ ! -d ./tools/SdkBuildTools/tasks ]; then mkdir ./tools/SdkBuildTools/tasks fi @@ -193,12 +197,13 @@ getBuildTools() { curl -s $copyFromRootDir/tools/BuildAssets/targets/common.targets > ./tools/SdkBuildTools/targets/common.targets curl -s $copyFromRootDir/tools/BuildAssets/targets/signing.targets > ./tools/SdkBuildTools/targets/signing.targets curl -s $copyFromRootDir/tools/BuildAssets/targets/ideCmd.targets > ./tools/SdkBuildTools/targets/ideCmd.targets + curl -s $copyFromRootDir/tools/BuildAssets/targets/core/_AzSdk.props > ./tools/SdkBuildTools/targets/core/_AzSdk.props + curl -s $copyFromRootDir/tools/BuildAssets/targets/core/_build.proj > ./tools/SdkBuildTools/targets/core/_build.proj + curl -s $copyFromRootDir/tools/BuildAssets/targets/core/_Directory.Build.props > ./tools/SdkBuildTools/targets/core/_Directory.Build.props + curl -s $copyFromRootDir/tools/BuildAssets/targets/core/_Directory.Build.targets > ./tools/SdkBuildTools/targets/core/_Directory.Build.targets + curl -s $copyFromRootDir/tools/BuildAssets/targets/core/_test.props > ./tools/SdkBuildTools/targets/core/_test.props curl -s $copyFromRootDir/tools/BuildAssets/tasks/common.tasks > ./tools/SdkBuildTools/tasks/common.tasks - #curl $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.dll > ./tools/SdkBuildTools/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.dll - #curl $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.runtimeconfig.dev.json > ./tools/SdkBuildTools/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.runtimeconfig.dev.json - #curl $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.runtimeconfig.json > ./tools/SdkBuildTools/tasks/net46/Microsoft.Azure.Build.BootstrapTasks.runtimeconfig.json curl -s $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.dll > ./tools/SdkBuildTools/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.dll - #curl -s $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.runtimeconfig.dev.json > ./tools/SdkBuildTools/tasks/net46/Microsoft.Azure.Sdk.Build.Tasks.runtimeconfig.dev.json curl -s $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Build.dll > ./tools/SdkBuildTools/tasks/net46/Microsoft.Build.dll curl -s $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Build.Framework.dll > ./tools/SdkBuildTools/tasks/net46/Microsoft.Build.Framework.dll curl -s $copyFromRootDir/tools/BuildAssets/tasks/net46/Microsoft.Build.Tasks.Core.dll > ./tools/SdkBuildTools/tasks/net46/Microsoft.Build.Tasks.Core.dll diff --git a/tools/bootstrapTools/taskBinaries/Microsoft.Azure.Build.BootstrapTasks.dll b/tools/bootstrapTools/taskBinaries/Microsoft.Azure.Build.BootstrapTasks.dll index 482fd6e60a3785b64a618d271cf724a69c82ac5b..1a98006f0822273ddd8f8f765bac695a17d46672 100644 GIT binary patch delta 2115 zcmZY83piBU9suyQHe;I6 z0fsoDYr$EivH5UI-nkVB{nQX@8^ELk0R2t6gsg868V z?1Xg5L!2`#K$pw0VZ9_=&H!rvfdHVtXBY5S20&4IKYiCd?pvhiBhp+$BE|9ot^-}dgE8+mw zORolE#$yUG8!!hkhcE$Ls)U$iOkGR|Oa^8kCL1$;Nv=!+mIyH$FdH!;va}rqv5^X7 zmSQp{1F!)HAOHdxK$LdGkV}-lOd@6#CKuC5c4>YE=4vEa8W-SFr9Q?9q^e;vmjFzb zl#!f>P=KCY6@`|nYe_g7>!G6Qq0(|_MECqVzjDN^Fz1V;TC)YhwEq;L%U1t`YyWiH zTPKI)(rwkby7Cd{(Qj;z>q#%I*9TWthUbe$+*;bBi@3iP7OwC)Hj`%(#{Ma($ld%* z>&v{Rin_^x^krw|2_0ofT#L>O?SbA`N_W_oQP##zQ~0=jbx>k-s)Up&K{X>S+1$V81IFuJN>};2ip+oIb{l zUHutyj6D9~5XL;cQysc_RGpAFyr{Mas;Gd$eI=g(R^WE!TSyHDxxEFjaR&u*+gntB@ zyYbxp#%+U{r_*;EHy^GMR*p<=i!J5q^%n#Vb;UnbSKwnKgnJf5sTc-G(QR=PFXjoNBwMCv@h`r08=DlNx ze4@MW3AE$(Nu0l>*{3y(bGDkMylo@hJoi;} zEk%(Xw70s4{V|=;6Jgk-xUerIitFeDE>3Run(8EVpRD=RcH@Zs`4hLPT`%Go$yZ)I zJAS)zs==FiP4}_`FJRNWBd>kLjB@AA%-N_#*ssrZj2u`uUVJ0xuF^^7vBx_cGz=-e zXF_gHT?;%tx}W;ymj^Lja{dh)2>FBV)b^5h)q;n)w+1ZuX5~LR<_>Nau3YO?W&3wh|YE>BD zbpCA$n0~D$n!%sFyN#PgdTC_no6*th5ndb{QbpMlq zcPMcClv%T@R>ja(Zrbf#1=XW{{;&5jM=y^(dA-2a(d+Z#Hx0*5l#B{o#Nm|j?l|9G zTmU<@_fB?TgZbgPg+=RAb57P?F29BcSOod?UfNxw6;6ejA+;i168vW+23K74j zncuV7znIl!&s5gV%d1&F6PTUFCTqbTA!`w^Zwg?x?Xr@wK&)* z;h!}ZU(*`dW1K=ezdhYY6YLT<7f(_6_XWrH-B_4Qev!Ha4m=*eS#N=B|PlglAW8q2cAcL%}C(>$_@a4}?Y6r(_$W@85b^eff4= JMaV1#e*vT~J^}y$ delta 2150 zcmZ|O2~-nF8UWy`&VfWi0E66@L69RckU+vU5)gx2Dh{Zia-#?`x_AsC36~HBN1$;K z958^&?SNULU{K@|)(PXN;0TDWq96`l$N)y%4ZZvJy?y((-s`XHuloP$u6o_`*>FA^ z=8N!WQ(#s>o*^tRs9lTHF$;z*;6@ZeOM;&Z09>@$*cROZE#XBp9SUJ83Xv6h$F%`a z1^?ZCaRwj_wSzRtX5=J&!h2!Hm+CR_bOwmq*)~l zssthsTq6XdI;v||gedzrL4?wan8P3f-JyEhC>l`#cTAVwH*;AfAr4sv7XBUe6B1Dl z$qOc-sU!|18X<#L^QF9OU7!+;c9E=LvSgan1%+gs6<`4}jscc~LWBWUfb&WXK$}t; z=tA6qjdC^|GYwOW*@5{C^Y54dE@eVYQ%o~VcT65;IA#Q9+LA(CIu?jAJ1}o!LS$(< zbHqg{z%BJnF?k>Yqyhv$fCD7uj(Eg0Dp7qch&B7BuBni5Lf%STL@wc zcZNi+PjWb9IJK~iq0>t&DY<2PNd$}r1HLH}25dCxH= z?R#Xu=QjC-TShQ$3;h1ko)~$xP3-_hxW8%cXR}CozDaEkaZ7w=7SA~*tfuUbZ`*>8 zsa+9?uTOi-8khw8X~xTgoFd&a#SR${%sP`xPDPY?0%As)EPOP$=(4_`!L~vy+AJGR zss7V=yz-l`u|+vrq02k9^F=Yis@l;XP=n-O>$2b7`gELiIB@%S=>v%gWO7|?Ei#>g znpx>mMFiR#&326+6uCcM*0zY>y%;pM8TGgNEIhy!6gm~ltR^+yx*znqP<>`THM~wl zUHqoo%us6S+~Lz0Ru}#=n2qlHe0DST0<)ot3d&cQ$D{ zDqpz3GAN58nOcV0Jsc#r;uh(>*L@>d`)QeT!u6kSer*kFdkpgClDoCOc&|POo_cJW zX}C_RDLxq8aINLg4TT_SRnu7dJ(b@RpNzS5I&g=jEh$M_ISXeO#lD2%U5uPr*HN*f zhqY^ec;?y!iqn#+A5yR7!>gN&r}(GbsJ>wA+1!fth#g9=Im*s zp`qskHo7ldnUp=W`csM`y1x9cH+ISOCRh2<4+fZj%HM4JVbHTc%Y!WLCYM*vj#2FB zyS(C9`A+wwc>VK&aO>omAJu0v?moM}0HmyjP(Db>q7oIA^W@?><3QRFqzDci@!CLop-p zwLzFu@O8sDfuhCgn!GpXR?|=8!Ec5X%_S3=QP$bhHRS{HQ>CHtipFDpC8@gJg(|Ul zhG;#~*M<7>#Q*aTe&)Fd*>+5OrURG74q?)Ws@B=w*>hy5inm*dr+QAw!;ZMJQt~ZB zXCyuj-g=-jgGv5R5+o1+J_7=iv}Q!(BR(mCEf6mRkIL-B4}0ZSeX-Nz$F?;IGB^+K zbe^mj4Jti~+wds;%`K4Te8XbUCehHBtfr?fe9CnUewLND$z6X;UGSkw zZk!gzCrMb(#E0)mN-i~?C-y;=CJKF|R3xo^p0DTycYaKYda(0&uETQu361_acICE& z6C=b;FDIVYIyW|M?9b|+iY0`--i>^I5K{MB8MQ5OqAV}wbn<08IVE>wi`uuJiWiIA)&CZyNgvILlX4y_(nrs_H#mma1JeN-;Q^bD+cMTt{e&-LpKRQIg+|$r WqQ9-}Ts!rAGVzZ8sN82?2KXoEO)Sd*