From: Rui Marinho Date: Fri, 7 Dec 2018 11:31:41 +0000 (+0000) Subject: [Build] Don't build Tizen and Design projects on iPhone of iPhoneSimulator (#4646) X-Git-Tag: accepted/tizen/5.5/unified/20200421.150457~578^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fdbcfdde77a150d9ec33776fee0d58ce4fa6290;p=platform%2Fcore%2Fcsapi%2Fxsf.git [Build] Don't build Tizen and Design projects on iPhone of iPhoneSimulator (#4646) * [Build] Don't build Tizen and Design projects on iPhone of iPhoneSimulator * [Build] Update build --- diff --git a/Xamarin.Forms.Build b/Xamarin.Forms.Build index 1821d28..3ce5b3f 160000 --- a/Xamarin.Forms.Build +++ b/Xamarin.Forms.Build @@ -1 +1 @@ -Subproject commit 1821d28a3ae711cffb7721ff0d595bb0128e6036 +Subproject commit 3ce5b3fb2858ad3ab2792bf9d1aafaa6f52af118 diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln index d4a35ee..717b728 100644 --- a/Xamarin.Forms.sln +++ b/Xamarin.Forms.sln @@ -322,7 +322,6 @@ Global {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhone.ActiveCfg = Debug|Any CPU {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhone.Build.0 = Debug|Any CPU {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|x64.ActiveCfg = Debug|Any CPU {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|x64.Build.0 = Debug|Any CPU {4B14D295-C09B-4C38-B880-7CC768E50585}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1207,9 +1206,7 @@ Global {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|ARM.ActiveCfg = Debug|Any CPU {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|ARM.Build.0 = Debug|Any CPU {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|iPhone.Build.0 = Debug|Any CPU {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|x64.ActiveCfg = Debug|Any CPU {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|x64.Build.0 = Debug|Any CPU {699C79F6-1D91-4DBF-B817-E8CFFD6263BB}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1231,9 +1228,7 @@ Global {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|ARM.ActiveCfg = Debug|Any CPU {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|ARM.Build.0 = Debug|Any CPU {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|iPhone.Build.0 = Debug|Any CPU {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|x64.ActiveCfg = Debug|Any CPU {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|x64.Build.0 = Debug|Any CPU {83790029-272E-45AF-A41D-E7716684E5B8}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1362,9 +1357,7 @@ Global {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|ARM.ActiveCfg = Debug|Any CPU {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|ARM.Build.0 = Debug|Any CPU {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhone.Build.0 = Debug|Any CPU {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|x64.ActiveCfg = Debug|Any CPU {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|x64.Build.0 = Debug|Any CPU {AFF3AD0D-7181-4551-A29C-8701FE3E6753}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1384,9 +1377,7 @@ Global {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|ARM.ActiveCfg = Debug|Any CPU {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|ARM.Build.0 = Debug|Any CPU {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhone.Build.0 = Debug|Any CPU {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|x64.ActiveCfg = Debug|Any CPU {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|x64.Build.0 = Debug|Any CPU {8C7F0087-4031-4297-A651-6ED55F7B88BA}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1406,9 +1397,7 @@ Global {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|ARM.ActiveCfg = Debug|Any CPU {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|ARM.Build.0 = Debug|Any CPU {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhone.Build.0 = Debug|Any CPU {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|x64.ActiveCfg = Debug|Any CPU {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|x64.Build.0 = Debug|Any CPU {C5C1D2BE-DB01-4B2E-BCA5-2C9A9691E3F1}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1453,9 +1442,7 @@ Global {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|ARM.ActiveCfg = Debug|Any CPU {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|ARM.Build.0 = Debug|Any CPU {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhone.Build.0 = Debug|Any CPU {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x64.ActiveCfg = Debug|Any CPU {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x64.Build.0 = Debug|Any CPU {98637471-8E5C-4DDE-89CA-2EAA664FB0EF}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1477,9 +1464,7 @@ Global {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|ARM.ActiveCfg = Debug|Any CPU {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|ARM.Build.0 = Debug|Any CPU {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhone.Build.0 = Debug|Any CPU {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x64.ActiveCfg = Debug|Any CPU {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x64.Build.0 = Debug|Any CPU {C4340D4E-BDDB-4053-BFBC-CF4F043FAE87}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1501,9 +1486,7 @@ Global {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|ARM.ActiveCfg = Debug|Any CPU {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|ARM.Build.0 = Debug|Any CPU {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhone.Build.0 = Debug|Any CPU {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x64.ActiveCfg = Debug|Any CPU {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x64.Build.0 = Debug|Any CPU {65BC4888-CC59-428A-9B75-540CF1C09480}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -1537,9 +1520,7 @@ Global {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|ARM.ActiveCfg = Debug|Any CPU {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|ARM.Build.0 = Debug|Any CPU {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|iPhone.Build.0 = Debug|Any CPU {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|x64.ActiveCfg = Debug|Any CPU {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|x64.Build.0 = Debug|Any CPU {39B3457F-01D8-43D0-8E84-D8C4F73CF48E}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9af112d..c7f573d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,6 +7,24 @@ variables: value: '' - name: Suffix value: '' +- name: major + value: 4 +- name: minor + value: 0 +- name: patch + value: 1 +- name: buildversion + value: $[counter('versioncounter', 1000)] +- name: sign + value: 'false' +- name: provisioning + value: 'true' +- name: AppleCodesignIdentity + value: '' +- name: AppleCodesignIdentityUrl + value: '' +- name: AppleCodesignProfileUrl + value: '' - group: Xamarin.Forms - group: XQA Secrets @@ -14,8 +32,9 @@ trigger: branches: include: - master - - 3.4.0 - 3.3.0 + - 3.4.0 + - 3.5.0 paths: exclude: - README.md @@ -76,6 +95,9 @@ jobs: - sh - msbuild - Xamarin.iOS + variables: + provisioningOSX : true + provisioningSign : $(provisioning) steps: - template: build/steps/build-osx.yml @@ -95,9 +117,11 @@ jobs: - job: Phase_6 displayName: Sign Phase dependsOn: Phase_5 - condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))) + condition: and(succeeded(), eq(dependencies.Phase_1.outputs['prepare.sign'], 'true')) pool: name: VSEng-Xamarin-Forms + variables: + sign: $[dependencies.Phase_1.outputs['prepare.sign']] steps: - template: build/steps/build-sign.yml diff --git a/build/provisioning/provisioning.csx b/build/provisioning/provisioning.csx index ff939e8..e00754a 100644 --- a/build/provisioning/provisioning.csx +++ b/build/provisioning/provisioning.csx @@ -1,29 +1,8 @@ -if (!IsMac) - return; -Item (XreItem.Xcode_10_1_0).XcodeSelect (); +var channel = Env("PROVISIONATOR_XAMARIN_CHANNEL") ?? "Stable"; -AndroidSdk () - .ApiLevel (AndroidApiLevel.JellyBean) - .ApiLevel (AndroidApiLevel.JellyBean_4_2) - .ApiLevel (AndroidApiLevel.JellyBean_4_3) - .ApiLevel (AndroidApiLevel.KitKat) - .ApiLevel (AndroidApiLevel.Lollipop) - .ApiLevel (AndroidApiLevel.Lollipop_5_1) - .ApiLevel (AndroidApiLevel.Lollipop_5_2) - .ApiLevel (AndroidApiLevel.Marshmallow) - .ApiLevel (AndroidApiLevel.Nougat) - .ApiLevel (AndroidApiLevel.Nougat_7_1) - .ApiLevel (AndroidApiLevel.Oreo) - .ApiLevel (AndroidApiLevel.Oreo_8_1) - .SdkManagerPackage ("build-tools;25.0.0") - .SdkManagerPackage ("build-tools;27.0.0") - .SdkManagerPackage ("build-tools;28.0.0") - .SdkManagerPackage ("extras;google;m2repository"); - - -Item ("https://dl.xamarin.com/MonoFrameworkMDK/Macx86/MonoFramework-MDK-5.12.0.309.macos10.xamarin.universal.pkg"); -Item ("https://dl.xamarin.com/MonoTouch/Mac/xamarin.ios-12.1.0.15.pkg"); -Item ("https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-5.0.0.0.pkg"); -Item ("https://dl.xamarin.com/MonoforAndroid/Mac/xamarin.android-9.0.0-20.pkg"); -Item ("https://dl.xamarin.com/VsMac/VisualStudioForMac-7.6.11.9.dmg"); +if (IsMac) +{ + Item (XreItem.Xcode_10_1_0).XcodeSelect (); +} +XamarinChannel(channel); \ No newline at end of file diff --git a/build/provisioning/provisioning_sign.csx b/build/provisioning/provisioning_sign.csx new file mode 100644 index 0000000..263c925 --- /dev/null +++ b/build/provisioning/provisioning_sign.csx @@ -0,0 +1,12 @@ +using System; +using System.IO; +using System.Linq; +using Serilog; + +if (!IsMac) + return; + +Log.Information ("Identity : " + Env(""APPLECODESIGNIDENTITYURL"")); +Log.Information ("Profile : " + Env(""APPLECODESIGNPROFILEURL"")); +AppleCodesignIdentity("iPhone Developer: Xamarin QA (JP4JS5NR3R)",Env("APPLECODESIGNIDENTITYURL")); +AppleCodesignProfile(Env("APPLECODESIGNPROFILEURL")); diff --git a/build/provisioning/provisioning_windows.csx b/build/provisioning/provisioning_windows.csx deleted file mode 100644 index df48897..0000000 --- a/build/provisioning/provisioning_windows.csx +++ /dev/null @@ -1,26 +0,0 @@ -var arch = Is64Bit ? "x64" : "x86"; - -SetPowershellExecutionPolicy (PowershellExecutionPolicy.Bypass, PowershellScope.CurrentUser); - -SetUACBehavior (UACBehavior.ElevateWithoutConsentOrCredentials); - -InstallWindowsFeature ("NetFx3"); - -VisualStudio (VisualStudioChannel.Stable, VisualStudioTier.Enterprise, "15.8.9") - .Workload (VisualStudioWorkload.ManagedDesktop) - .Workload (VisualStudioWorkload.NetCrossPlat) - .Workload (VisualStudioWorkload.NativeDesktop) - .Workload (VisualStudioWorkload.Universal) - .Component (VisualStudioComponent.Microsoft_VisualStudio_Component_Windows81SDK) - .Component (VisualStudioComponent.Microsoft_VisualStudio_Component_Windows10SDK_16299_UWP) - .Component (VisualStudioComponent.Microsoft_VisualStudio_Component_Windows10SDK_16299_UWP_Native) - .Component (VisualStudioComponent.Component_Android_SDK23) - .Component (VisualStudioComponent.Component_Android_SDK25) - .Component (VisualStudioComponent.Component_JavaJDK) - .Component (VisualStudioComponent.Microsoft_Net_Component_4_5_1_TargetingPack) - .Component (VisualStudioComponent.Microsoft_Net_Component_4_5_2_TargetingPack) - .Component (VisualStudioComponent.Microsoft_Net_Component_4_5_TargetingPack) - .Component (VisualStudioComponent.Microsoft_Net_Component_4_6_2_SDK) - .Component (VisualStudioComponent.Microsoft_Net_Component_4_6_2_TargetingPack) - .Component (VisualStudioComponent.Microsoft_Net_Component_4_7_SDK) - .Component (VisualStudioComponent.Microsoft_Net_Component_4_7_TargetingPack); \ No newline at end of file diff --git a/build/steps/build-nuget.yml b/build/steps/build-nuget.yml index 8e3ab1a..55963cb 100644 --- a/build/steps/build-nuget.yml +++ b/build/steps/build-nuget.yml @@ -23,8 +23,7 @@ steps: - powershell: | - $buildConfiguration = "Release" - $formsNugetVersion = "" + $env:CURRENTSEMANTICVERSION + "." + ($env:BUILD_BUILDID - $env:MAGICNUMBER) + $formsNugetVersion = $env:major + "." + $env:minor + "." + $env:patch + "." + $env:buildversion if($env:SUFFIX) { $formsNugetVersion = $formsNugetVersion +"-"+$env:SUFFIX @@ -38,17 +37,11 @@ steps: displayName: 'Make NuGet Package' inputs: command: pack - feedsToUse: config - packagesToPack: '.nuspec/*.nuspec' - packDestination: '$(Build.ArtifactStagingDirectory)/nuget/debug' - versioningScheme: byEnvVar - versionEnvVar: XamarinFormsPackageVersion - buildProperties: 'IdAppend=$(FormsIdAppend)' @@ -56,11 +49,8 @@ steps: displayName: 'NuGet push' inputs: command: push - packagesToPush: '$(Build.ArtifactStagingDirectory)/nuget/debug/*.nupkg' - publishVstsFeed: '13fa23d7-5f2f-47f1-a87c-45a9f173dd74' - allowPackageConflicts: true @@ -77,7 +67,6 @@ steps: } | Set-Content $_ } failOnStderr: true - displayName: 'Update nuspecs' condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))) @@ -85,24 +74,16 @@ steps: displayName: 'Make NuGet Package Release' inputs: command: pack - feedsToUse: config - packagesToPack: '.nuspec/*.nuspec' - packDestination: '$(Build.ArtifactStagingDirectory)/nuget/release' - versioningScheme: byEnvVar - versionEnvVar: XamarinFormsPackageVersion - buildProperties: 'IdAppend=$(FormsIdAppend)' - condition: and(succeeded(), startsWith(variables['Build.SourceBranch'],'refs/tags/')) - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: nuget' inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/nuget' - ArtifactName: nuget \ No newline at end of file diff --git a/build/steps/build-osx.yml b/build/steps/build-osx.yml index 6bf310e..b8b140b 100644 --- a/build/steps/build-osx.yml +++ b/build/steps/build-osx.yml @@ -1,8 +1,10 @@ steps: - checkout: self submodules: true + - task: ms-devlabs.utilitytasks.task-Shellpp.Shell++@0 displayName: 'Add QA cert password to keychain' + condition: eq(variables['provisioningSign'], 'true') inputs: type: InlineScript script: '$(Build.Repository.LocalPath)/Xamarin.Forms.Build/provisionator.sh keychain set pb_dev_iphone.p12 $(.p12.Password)' @@ -10,9 +12,17 @@ steps: - bash: '$(Build.Repository.LocalPath)/$(ProvisionatorExecutablePath) keychain set github.com $(GitHub.Token) || echo "PAT already set"' displayName: 'Initialize PAT' + condition: eq(variables['provisioningSign'], 'true') + - - bash: '$(Build.Repository.LocalPath)/Xamarin.Forms.Build/provisionator.sh $(Build.Repository.LocalPath)/Xamarin.Forms.Build/provisioning.csx -v' + - bash: '$(Build.Repository.LocalPath)/Xamarin.Forms.Build/provisionator.sh $(Build.Repository.LocalPath)/Xamarin.Forms.Build/provisioning_sign.csx -v' displayName: Provisioning + condition: eq(variables['provisioningSign'], 'true') + env: + APPLECODESIGNIDENTITY: $(AppleCodesignIdentity) + APPLECODESIGNIDENTITYURL: $(AppleCodesignIdentityUrl) + APPLECODESIGNPROFILEURL: $(AppleCodesignProfileUrl) + - task: NuGetToolInstaller@0 displayName: 'Use NuGet 4.8.1' @@ -38,7 +48,6 @@ steps: inputs: solutionFile: Xamarin.Forms.sln configuration: '$(BuildConfiguration)' - runNugetRestore: true - task: MSBuild@1 @@ -111,6 +120,7 @@ steps: Contents: | **/$(IpaName) Xamarin.Forms.Core.iOS.UITests/bin/$(BuildConfiguration)/** + TargetFolder: '$(build.artifactstagingdirectory)/ios' CleanTargetFolder: true flattenFolders: true diff --git a/build/steps/build-prepare.yml b/build/steps/build-prepare.yml index c95f107..a260eac 100644 --- a/build/steps/build-prepare.yml +++ b/build/steps/build-prepare.yml @@ -1,6 +1,5 @@ steps: - powershell: | - Write-Host "Finding the right branch" $sourceBranchName = "" + $env:BUILD_SOURCEBRANCHNAME $sourceBranch = "" + $env:BUILD_SOURCEBRANCH $sourceVersion = "" + $env:BUILD_SOURCEVERSION @@ -25,13 +24,14 @@ steps: } displayName: 'Set Build Number' - powershell: | - Write-Host "Finding the right branch" - $sourceBranchName = ""+ $env:BUILD_SOURCEBRANCHNAME - $sourceBranch = ""+ $env:BUILD_SOURCEBRANCH - $publicTags = ""+ $env:PUBLICTAGS + $sourceBranchName = "" + $env:BUILD_SOURCEBRANCHNAME + $sourceBranch = "" + $env:BUILD_SOURCEBRANCH + $publicTags = "" + $env:PUBLICTAGS $tags = New-Object System.Collections.ArrayList - $buildId = ""+ $env:BUILD_BUILDID - $sorceV = "" +$env:BUILD_SOURCEVERSION + $buildId = "" + $env:BUILD_BUILDID + $sorceV = "" + $env:BUILD_SOURCEVERSION + $sign = "" + $env:SIGN + $reason = "" + $env:BUILD_REASON echo $sorceV echo $sourceBranchName @@ -67,22 +67,36 @@ steps: } } } + if($reason -eq "Schedule") + { + $tags.Add("nightly-release") + } #Tag this build #check PublicTags also add them to the tag list foreach($publicTag in $publicTags.Split(';')) { - if($publicTag){ - $tags.Add($publicTag); - } + if($publicTag){ + $tags.Add($publicTag); + } } #Add tags to the VSTS Build foreach ($tag in $tags) { - Write-Host "##vso[build.addbuildtag]$tag" + if($tag -eq "public-release") + { + $sign = 'true' + } + if($tag -eq "nightly-release") + { + $sign = 'true' + } + Write-Host "##vso[build.addbuildtag]$tag" } - + Write-Host "Sign: $sign" $publicTags = $tags -join ';' Write-Host "##vso[task.setvariable variable=publictags;isOutput=true;]$publicTags" + Write-Host "##vso[task.setvariable variable=sign;isOutput=true]$sign" - displayName: 'Tag and name build copy' + displayName: 'Tag and name build' + name: prepare diff --git a/build/steps/build-windows.yml b/build/steps/build-windows.yml index ecfcee5..b387fc1 100644 --- a/build/steps/build-windows.yml +++ b/build/steps/build-windows.yml @@ -14,15 +14,10 @@ steps: displayName: 'Build solution Xamarin.Forms.sln' inputs: solution: Xamarin.Forms.sln - msbuildVersion: 15.0 - platform: '$(BuildPlatform)' - configuration: '$(BuildConfiguration)' - msbuildArguments: '/nowarn:VSX1000 /p:CreateAllAndroidTargets=true' - clean: true @@ -122,13 +117,9 @@ steps: displayName: 'Copy files test adapter' inputs: Contents: '**/NUnitTestAdapter.*/tools/*.dll' - TargetFolder: '$(Build.ArtifactStagingDirectory)/testadapter' - CleanTargetFolder: true - OverWrite: true - flattenFolders: true