Skip to content

Commit 9918c8f

Browse files
rmarinhormarinho
authored
[Build] Update yaml builds (#6230)
* [Build] Update build yaml * [MacOS]Fix warning * [Build] Enable binlog * [Build] Run tests after build, update nuget version * [Build] Don't build PagesGallery and Embedding
1 parent 9bc0fc6 commit 9918c8f

9 files changed

+60
-111
lines changed

‎Version.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
</ItemGroup>
5050

5151
<Message Condition="$(CI)" Importance="high" Text="##vso[build.updatebuildnumber]$(PackageVersion)"/>
52+
<Message Condition="$(CI)" Importance="high" Text="##vso[task.setvariable variable=packageversion;isOutput=true;]$(PackageVersion)"/>
5253
</Target>
5354

5455
<Target Name="VersionInfoReport" DependsOnTargets="SetVersions" AfterTargets="GitInfoReport">

‎Xamarin.Forms.Platform.MacOS/PlatformRenderer.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ internal class PlatformRenderer : NSViewController
1010
internal PlatformRenderer(Platform platform)
1111
{
1212
Platform = platform;
13+
#pragma warning disable CS0618 // Type or member is obsolete
1314
View = new NSView(NSApplication.SharedApplication.Windows[0].Frame);
15+
#pragma warning restore CS0618 // Type or member is obsolete
1416
_platformNavigation = new PlatformNavigation(this);
1517
}
1618

‎Xamarin.Forms.sln

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,6 @@ Global
785785
{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhone.ActiveCfg = Debug|Any CPU
786786
{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhone.Build.0 = Debug|Any CPU
787787
{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
788-
{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
789788
{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x64.ActiveCfg = Debug|Any CPU
790789
{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x64.Build.0 = Debug|Any CPU
791790
{D6133DBD-6C60-4BD5-BEA2-07E0A3927C31}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -809,7 +808,6 @@ Global
809808
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
810809
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhone.Build.0 = Debug|Any CPU
811810
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
812-
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
813811
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x64.ActiveCfg = Debug|Any CPU
814812
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x64.Build.0 = Debug|Any CPU
815813
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -827,13 +825,11 @@ Global
827825
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x86.ActiveCfg = Release|Any CPU
828826
{447DC60E-C485-4427-8CF7-50074C6B61DE}.Release|x86.Build.0 = Release|Any CPU
829827
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
830-
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
831828
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|ARM.ActiveCfg = Debug|Any CPU
832829
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|ARM.Build.0 = Debug|Any CPU
833830
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhone.ActiveCfg = Debug|Any CPU
834831
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhone.Build.0 = Debug|Any CPU
835832
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
836-
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
837833
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x64.ActiveCfg = Debug|Any CPU
838834
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x64.Build.0 = Debug|Any CPU
839835
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -851,7 +847,6 @@ Global
851847
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x86.ActiveCfg = Release|Any CPU
852848
{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}.Release|x86.Build.0 = Release|Any CPU
853849
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
854-
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
855850
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
856851
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|ARM.ActiveCfg = Debug|Any CPU
857852
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|ARM.Build.0 = Debug|Any CPU
@@ -860,7 +855,6 @@ Global
860855
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhone.Build.0 = Debug|Any CPU
861856
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhone.Deploy.0 = Debug|Any CPU
862857
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
863-
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
864858
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
865859
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x64.ActiveCfg = Debug|Any CPU
866860
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Debug|x64.Build.0 = Debug|Any CPU
@@ -886,20 +880,6 @@ Global
886880
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.ActiveCfg = Release|Any CPU
887881
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Build.0 = Release|Any CPU
888882
{5EB6EB6B-A412-4F41-A89B-D7C9AAD237F2}.Release|x86.Deploy.0 = Release|Any CPU
889-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.ActiveCfg = Debug|x86
890-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Build.0 = Debug|x86
891-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|Any CPU.Deploy.0 = Debug|x86
892-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.ActiveCfg = Debug|ARM
893-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Build.0 = Debug|ARM
894-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|ARM.Deploy.0 = Debug|ARM
895-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhone.ActiveCfg = Debug|ARM
896-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
897-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.ActiveCfg = Debug|x64
898-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Build.0 = Debug|x64
899-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x64.Deploy.0 = Debug|x64
900-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.ActiveCfg = Debug|x86
901-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Build.0 = Debug|x86
902-
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Debug|x86.Deploy.0 = Debug|x86
903883
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.ActiveCfg = Release|x86
904884
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.Build.0 = Release|x86
905885
{95FEB8D4-D57E-4B96-A8D8-59D241C0501B}.Release|Any CPU.Deploy.0 = Release|x86
@@ -945,7 +925,6 @@ Global
945925
{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
946926
{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhone.Build.0 = Debug|Any CPU
947927
{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
948-
{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
949928
{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.ActiveCfg = Debug|Any CPU
950929
{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x64.Build.0 = Debug|Any CPU
951930
{C9696465-7657-4843-872E-3C01891C4A9B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -963,13 +942,11 @@ Global
963942
{C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.ActiveCfg = Release|Any CPU
964943
{C9696465-7657-4843-872E-3C01891C4A9B}.Release|x86.Build.0 = Release|Any CPU
965944
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
966-
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
967945
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|ARM.ActiveCfg = Debug|iPhone
968946
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|ARM.Build.0 = Debug|iPhone
969947
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.ActiveCfg = Debug|iPhone
970948
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhone.Build.0 = Debug|iPhone
971949
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
972-
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
973950
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
974951
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x64.Build.0 = Debug|iPhoneSimulator
975952
{392156B2-760A-4EE3-A822-CABD3238A21D}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
@@ -987,7 +964,6 @@ Global
987964
{392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x86.ActiveCfg = Release|iPhoneSimulator
988965
{392156B2-760A-4EE3-A822-CABD3238A21D}.Release|x86.Build.0 = Release|iPhoneSimulator
989966
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
990-
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|Any CPU.Build.0 = Debug|Any CPU
991967
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
992968
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|ARM.ActiveCfg = Debug|Any CPU
993969
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|ARM.Build.0 = Debug|Any CPU
@@ -996,7 +972,6 @@ Global
996972
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhone.Build.0 = Debug|Any CPU
997973
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhone.Deploy.0 = Debug|Any CPU
998974
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
999-
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
1000975
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
1001976
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|x64.ActiveCfg = Debug|Any CPU
1002977
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Debug|x64.Build.0 = Debug|Any CPU
@@ -1023,13 +998,11 @@ Global
1023998
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Release|x86.Build.0 = Release|Any CPU
1024999
{0C902203-D56E-4F7E-9CE6-E23C701B628D}.Release|x86.Deploy.0 = Release|Any CPU
10251000
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1026-
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
10271001
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|ARM.ActiveCfg = Debug|Any CPU
10281002
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|ARM.Build.0 = Debug|Any CPU
10291003
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
10301004
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhone.Build.0 = Debug|Any CPU
10311005
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
1032-
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
10331006
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|x64.ActiveCfg = Debug|Any CPU
10341007
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|x64.Build.0 = Debug|Any CPU
10351008
{02EAC00F-0425-4959-AC64-E921627265CA}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1143,13 +1116,11 @@ Global
11431116
{9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.ActiveCfg = Release|Any CPU
11441117
{9DB0CABB-24CC-4538-88EC-6E0A0FE40248}.Release|x86.Build.0 = Release|Any CPU
11451118
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
1146-
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
11471119
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|ARM.ActiveCfg = Debug|iPhone
11481120
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|ARM.Build.0 = Debug|iPhone
11491121
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhone.ActiveCfg = Debug|iPhone
11501122
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhone.Build.0 = Debug|iPhone
11511123
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
1152-
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
11531124
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
11541125
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x64.Build.0 = Debug|iPhoneSimulator
11551126
{29DDE791-5608-4072-8E1C-D37D72992A83}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
@@ -1166,20 +1137,6 @@ Global
11661137
{29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x64.Build.0 = Release|iPhoneSimulator
11671138
{29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x86.ActiveCfg = Release|iPhoneSimulator
11681139
{29DDE791-5608-4072-8E1C-D37D72992A83}.Release|x86.Build.0 = Release|iPhoneSimulator
1169-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.ActiveCfg = Debug|x86
1170-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.Build.0 = Debug|x86
1171-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|Any CPU.Deploy.0 = Debug|x86
1172-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.ActiveCfg = Debug|ARM
1173-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Build.0 = Debug|ARM
1174-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|ARM.Deploy.0 = Debug|ARM
1175-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhone.ActiveCfg = Debug|ARM
1176-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
1177-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.ActiveCfg = Debug|x64
1178-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Build.0 = Debug|x64
1179-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|x64.Deploy.0 = Debug|x64
1180-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.ActiveCfg = Debug|x86
1181-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Build.0 = Debug|x86
1182-
{73A22D45-2350-457D-A191-F888148E4280}.Debug|x86.Deploy.0 = Debug|x86
11831140
{73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.ActiveCfg = Release|x86
11841141
{73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.Build.0 = Release|x86
11851142
{73A22D45-2350-457D-A191-F888148E4280}.Release|Any CPU.Deploy.0 = Release|x86
@@ -1616,7 +1573,7 @@ Global
16161573
{FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.ActiveCfg = Release|Any CPU
16171574
{FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Build.0 = Release|Any CPU
16181575
{FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Deploy.0 = Release|Any CPU
1619-
{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.ActiveCfg = Debug|iPhone
1576+
{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
16201577
{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|ARM.ActiveCfg = Debug|iPhone
16211578
{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|iPhone.ActiveCfg = Debug|iPhone
16221579
{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|iPhone.Build.0 = Debug|iPhone
@@ -1632,6 +1589,7 @@ Global
16321589
{160053B8-745A-41DB-9B33-30479729D6DC}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
16331590
{160053B8-745A-41DB-9B33-30479729D6DC}.Release|x64.ActiveCfg = Release|iPhone
16341591
{160053B8-745A-41DB-9B33-30479729D6DC}.Release|x86.ActiveCfg = Release|iPhone
1592+
{160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
16351593
{868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|Any CPU.ActiveCfg = Debug|x86
16361594
{868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.ActiveCfg = Debug|ARM
16371595
{868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.Build.0 = Debug|ARM

‎azure-pipelines.yml

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@ variables:
1717
value: 0
1818
- name: buildversion
1919
value: $[counter('$(Build.SourceBranchName)_counter', 1)]
20+
- name: MONO_VERSION
21+
value: 5_18_1
22+
- name: XCODE_VERSION
23+
value: 10.2
24+
- name: provisioning
25+
value: false
26+
- name: NUGET_VERSION
27+
value: 5.0.2
2028

2129
resources:
2230
repositories:
@@ -36,9 +44,10 @@ trigger:
3644
- README.md
3745

3846
pr:
39-
- master
40-
- 3.*
41-
- 4.*
47+
autoCancel: false
48+
branches:
49+
include:
50+
- '*'
4251

4352
jobs:
4453
- job: Phase_1
@@ -63,32 +72,18 @@ jobs:
6372
release:
6473
BuildConfiguration: 'Release'
6574
BuildPlatform: $(DefaultBuildPlatform)
75+
variables:
76+
nugetVersion: $(NUGET_VERSION)
6677
steps:
6778
- template: build/steps/build-windows.yml
6879

69-
- job: Phase_3
70-
displayName: Test Windows Phase
71-
dependsOn: Phase_2
72-
condition: succeeded()
73-
pool:
74-
name: $(winVmImage)
75-
demands: vstest
76-
strategy:
77-
matrix:
78-
debug:
79-
BuildConfiguration: $(DefaultBuildConfiguration)
80-
release:
81-
BuildConfiguration: 'Release'
82-
steps:
83-
- template: build/steps/build-windows-test.yml
84-
8580
- template: build/steps/build-android.yml
8681
parameters:
8782
name: android_legacy
8883
displayName: Build Android [Legacy Renderers]
8984
vmImage: $(macOSVmImage)
9085
targetFolder: Xamarin.Forms.ControlGallery.Android/legacyRenderers/
91-
androidProjectArguments: '/t:"Rebuild;SignAndroidPackage"'
86+
androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /bl:$(Build.ArtifactStagingDirectory)\android-legacy.binlog'
9287
dependsOn: Phase_1
9388
buildConfiguration: $(DefaultBuildConfiguration)
9489

@@ -98,7 +93,7 @@ jobs:
9893
displayName: Build Android [Pre-AppCompat]
9994
vmImage: $(macOSVmImage)
10095
targetFolder: Xamarin.Forms.ControlGallery.Android/preAppCompat
101-
androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG FORMS_APPLICATION_ACTIVITY APP"'
96+
androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG FORMS_APPLICATION_ACTIVITY APP" /bl:$(Build.ArtifactStagingDirectory)\android-preappcompact.binlog'
10297
dependsOn: Phase_1
10398
buildConfiguration: $(DefaultBuildConfiguration)
10499

@@ -108,7 +103,7 @@ jobs:
108103
displayName: Build Android [Fast Renderers]
109104
vmImage: $(macOSVmImage)
110105
targetFolder: Xamarin.Forms.ControlGallery.Android/newRenderers/
111-
androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG TEST_EXPERIMENTAL_RENDERERS APP"'
106+
androidProjectArguments: '/t:"Rebuild;SignAndroidPackage" /p:DefineConstants="TRACE DEBUG TEST_EXPERIMENTAL_RENDERERS APP" /bl:$(Build.ArtifactStagingDirectory)\android-newrenderers.binlog'
112107
dependsOn: Phase_1
113108
buildConfiguration: $(DefaultBuildConfiguration)
114109

@@ -129,7 +124,7 @@ jobs:
129124
provisionator.signPath : 'build/provisioning/provisioning_sign.csx'
130125
buildConfiguration: $(DefaultBuildConfiguration)
131126
slnPath: $(SolutionFile)
132-
nugetVersion: 4.8.1
127+
nugetVersion: $(NUGET_VERSION)
133128
iOSCertSecureFileName: 'Xamarin Forms iOS Certificate.p12'
134129
iOSProvisioningSecureFileName: 'Xamarin Forms iOS Provisioning.mobileprovision'
135130
steps:
@@ -138,7 +133,7 @@ jobs:
138133
- job: Phase_5
139134
displayName: Nuget Phase
140135
dependsOn:
141-
- Phase_3
136+
- Phase_2
142137
- android_legacy
143138
- android_preappcompact
144139
- android_fast
@@ -148,6 +143,7 @@ jobs:
148143
variables:
149144
FormsIdAppend: ''
150145
buildConfiguration: $(DefaultBuildConfiguration)
146+
pacakageVersion : $[ dependencies.Phase_2.outputs['debug.winbuild.packageversion'] ]
151147
steps:
152148
- template: build/steps/build-nuget.yml
153149

‎build/steps/build-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ parameters:
1313
androidProjectPath : 'Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj'
1414
androidProjectArguments : ''
1515
buildConfiguration : 'Debug'
16-
nugetVersion: 4.8.1
16+
nugetVersion: $(NUGET_VERSION)
1717
apkTargetFolder: '$(build.artifactstagingdirectory)/androidApp'
1818

1919
jobs:

‎build/steps/build-nuget.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,23 @@ steps:
2626
$preXamForms = $env:XAMARINFORMSPACKAGEVERSION
2727
$prefix = $env:SUFFIX
2828
Write-Host("Pre FormsVersion = $preXamForms $prefix")
29-
29+
Write-Host("MSBUILD packageVersion = $(pacakageVersion)")
30+
$packageVer = "$(pacakageVersion)"
3031
if(!$preXamForms)
3132
{
3233
$formsNugetVersion = $env:major + "." + $env:minor + "." + $env:patch + "." + $env:buildversion
3334
if($prefix)
3435
{
3536
$formsNugetVersion = $formsNugetVersion +"-"+$prefix
3637
}
37-
Write-Host("FormsVersion = $formsNugetVersion")
38-
Write-Host("##{0}[task.setvariable variable=XamarinFormsPackageVersion]{1}" -f "vso",$formsNugetVersion.ToString() )
38+
if($packageVer)
39+
{
40+
$formsNugetVersion = $packageVer
41+
}
42+
3943
}
44+
Write-Host("FormsVersion = $formsNugetVersion")
45+
Write-Host("##{0}[task.setvariable variable=XamarinFormsPackageVersion]{1}" -f "vso",$formsNugetVersion.ToString() )
4046
4147
failOnStderr: true
4248
displayName: 'Set Nuget version'

‎build/steps/build-osx.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@ steps:
88
provisioning_script: $(provisionator.osxPath)
99
provisioning_extra_args: $(provisionator.extraArguments)
1010

11+
- bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION)
12+
displayName: Switch to the latest Xamarin SDK
13+
14+
- bash: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XCODE_VERSION).app;sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
15+
displayName: Switch to the latest Xcode
16+
1117
- task: NuGetToolInstaller@0
12-
displayName: 'Use NuGet $(nugetVersion)'
18+
displayName: 'Use NuGet'
1319
inputs:
1420
versionSpec: $(nugetVersion)
15-
checkLatest: true
1621

1722
- task: NuGetCommand@2
1823
displayName: 'NuGet restore'

0 commit comments

Comments
 (0)