Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 1532d46

Browse files
PureWeenPureWeen
authored
Add switches to build Control Gallery using the nuget produced by the build (#8937)
* Build Control Gallery with nugets * - sync pipelines * - add team project check * - fix output dir to match for ui tests * - preserve dual screen
1 parent 112a203 commit 1532d46

34 files changed

+329
-156
lines changed

‎DevopsNuget.config

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear/>
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6+
<add key="nightly" value="https://aka.ms/xf-ci/index.json" />
7+
<add key="nuget" value="../s/Nuget" />
8+
</packageSources>
9+
<activePackageSource>
10+
<add key="All" value="(Aggregate source)" />
11+
</activePackageSource>
12+
</configuration>

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
<Target Name="GitVersion" />
2222

2323
<Import Condition="'$(EnvironmentBuildPropsImported)' != 'True'" Project="Environment.Build.props" />
24-
</Project>
24+
</Project>

‎Directory.Build.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<PackageReference Include="GitInfo" Version="2.0.20" PrivateAssets="All" />
44
<PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
55
</ItemGroup>
6-
76
<Import Project="Version.targets" />
87
</Project>

‎Environment.Build.props

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66

77

8+
89
<PropertyGroup Condition="'$(CI)' == ''">
910
<CI>false</CI>
1011
<CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
@@ -19,6 +20,18 @@
1920
-->
2021
</PropertyGroup>
2122

23+
<PropertyGroup Condition="'$(CI)' == 'true'">
24+
<_XamarinFormsVersion>$(BUILD_BUILDNUMBER.Split(`+`)[0])</_XamarinFormsVersion>
25+
<XamarinFormsVersion Condition="Exists('$(BUILD_SOURCESDIRECTORY)/Nuget/Xamarin.Forms.$(_XamarinFormsVersion).nupkg')" >$(_XamarinFormsVersion)</XamarinFormsVersion>
26+
</PropertyGroup>
27+
28+
<!-- Build from source or nugets-->
29+
<PropertyGroup>
30+
<XamarinFormsVersion Condition="'$(XamarinFormsVersion)' == ''"></XamarinFormsVersion>
31+
<FromSource Condition="'$(XamarinFormsVersion)' != ''">false</FromSource>
32+
<FromSource Condition="'$(FromSource)' == ''">true</FromSource>
33+
</PropertyGroup>
34+
2235
<PropertyGroup>
2336
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
2437
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
@@ -30,4 +43,4 @@
3043
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'true'">MonoAndroid90;</AndroidTargetFrameworks>
3144
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'false'">MonoAndroid90;MonoAndroid10.0;</AndroidTargetFrameworks>
3245
</PropertyGroup>
33-
</Project>
46+
</Project>

‎Nuget.targets

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)">
4+
</PackageReference>
5+
<PackageReference Include="Xamarin.Forms.Maps" Version="$(XamarinFormsVersion)">
6+
</PackageReference>
7+
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="$(XamarinFormsVersion)">
8+
</PackageReference>
9+
<PackageReference Include="Xamarin.Forms.DualScreen" Version="$(XamarinFormsVersion)">
10+
</PackageReference>
11+
</ItemGroup>
12+
<ItemGroup Condition=" $(TargetFrameworkIdentifier.StartsWith('MonoAndroid')) ">
13+
<PackageReference Include="Xamarin.Forms.AppLinks" Version="$(XamarinFormsVersion)">
14+
</PackageReference>
15+
</ItemGroup>
16+
</Project>

‎Nuget/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except this file
4+
!.gitignore

‎Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{39B3457F-01D8-43D0-8E84-D8C4F73CF48D}</ProjectGuid>

‎Xamarin.Forms.ControlGallery.Android/Android10.Build.targets

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<ItemGroup Condition="'$(TargetFrameworkVersion)' == 'v10.0'">
3-
<PackageReference Include="Xamarin.AndroidX.Migration">
4-
<Version>1.0.0</Version>
5-
</PackageReference>
6-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
7-
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
8-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
9-
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
10-
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
3+
<PackageReference Include="Xamarin.AndroidX.Migration">
4+
<Version>1.0.0</Version>
5+
</PackageReference>
6+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.1.0" />
7+
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.0.0" />
8+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.0.0" />
9+
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0" />
10+
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0" />
1111
</ItemGroup>
12-
</Project>
12+
</Project>

‎Xamarin.Forms.ControlGallery.Android/Directory.Build.targets

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
<Project>
22
<Import Project="Android10.Build.targets" Condition="'$(TargetFrameworkVersion)' == 'v10.0'" />
3-
</Project>
3+
<Import Condition="'$(Use2017)' == 'true'" Project="Nuget2017.Build.targets" />
4+
<Import Condition="'$(Use2017)' != 'true'" Project="Nuget2019.Build.targets" />
5+
<Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
6+
</Project>

‎Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Xamarin.Build.Download">
4+
<Version>0.4.11</Version>
5+
</PackageReference>
6+
</ItemGroup>
7+
</Project>

0 commit comments

Comments
 (0)