зеркало из https://github.com/DeGsoft/maui-linux.git
Merge branch '5.0.0' into main
This commit is contained in:
Rui Marinho
Коммит
09188523a2
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"version": 1,
|
||||
"isRoot": true,
|
||||
"tools": {
|
||||
"cake.tool": {
|
||||
"version": "1.0.0",
|
||||
"commands": [
|
||||
"dotnet-cake"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -343,7 +343,7 @@
|
|||
<Version>12.0.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="NUnit">
|
||||
<Version>3.12.0</Version>
|
||||
<Version>3.13.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo">
|
||||
<Version>3.0.2</Version>
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@
|
|||
<Version>12.0.3</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="NUnit">
|
||||
<Version>3.12.0</Version>
|
||||
<Version>3.13.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo">
|
||||
<Version>3.0.2</Version>
|
||||
|
|
|
|||
|
|
@ -386,7 +386,7 @@
|
|||
<PackageReference Include="AdvancedColorPicker" Version="2.0.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="NUnit">
|
||||
<Version>3.12.0</Version>
|
||||
<Version>3.13.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
|
||||
<PackageReference Include="Xamarin.Insights" Version="1.12.3" />
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace Xamarin.Forms.Controls.Issues
|
|||
public ObservableCollection<Item> Source1 { get; } = new ObservableCollection<Item>();
|
||||
public ObservableCollection<Item> Source2 { get; } = new ObservableCollection<Item>();
|
||||
|
||||
CollectionView BindingWithConverter()
|
||||
CollectionView BindingWithConverter()
|
||||
{
|
||||
var cv = new CollectionView
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
|
|||
|
||||
namespace Xamarin.Forms.Controls.Issues
|
||||
{
|
||||
public partial class VisualGallery : ContentPage
|
||||
public partial class VisualGallery : ContentPage
|
||||
{
|
||||
bool isVisible = false;
|
||||
double percentage = 0.0;
|
||||
public VisualGallery()
|
||||
{
|
||||
{
|
||||
#if APP
|
||||
InitializeComponent();
|
||||
Device.BeginInvokeOnMainThread(OnAppearing);
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<EmbeddedResource Include="GalleryPages\crimson.jpg" />
|
||||
<EmbeddedResource Include="coffee.png" />
|
||||
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
|
||||
<EmbeddedResource Include="Fonts\CuteFont-Regular.ttf">
|
||||
|
|
|
|||
|
|
@ -46,11 +46,11 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.11" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.14" />
|
||||
<PackageReference Include="NUnit3TestAdapter">
|
||||
<Version>3.15.1</Version>
|
||||
<Version>3.17.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter">
|
||||
<Version>3.15.1</Version>
|
||||
<Version>3.17.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -45,17 +45,17 @@
|
|||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Appium.WebDriver" Version="4.2.1" />
|
||||
<PackageReference Include="Appium.WebDriver" Version="4.3.1" />
|
||||
<PackageReference Include="Castle.Core" Version="4.3.1" />
|
||||
<PackageReference Include="DotNetSeleniumExtras.PageObjects" Version="3.11.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="Selenium.Support" Version="3.141.0" />
|
||||
<PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.11" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.14" />
|
||||
<PackageReference Include="NUnit3TestAdapter">
|
||||
<Version>3.15.1</Version>
|
||||
<Version>3.17.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -97,4 +97,4 @@
|
|||
</ItemGroup>
|
||||
<Copy SourceFiles="@(_XamarinUITestFiles)" DestinationFolder="$(SolutionDir)packages\Xamarin.UITest.AnyVersion\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -47,11 +47,11 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.11" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.14" />
|
||||
<PackageReference Include="NUnit3TestAdapter">
|
||||
<Version>3.15.1</Version>
|
||||
<Version>3.17.0</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="ServiceStack.Client" Version="4.5.12" />
|
||||
<PackageReference Include="ServiceStack.Interfaces" Version="4.5.12" />
|
||||
<PackageReference Include="ServiceStack.Text" Version="4.5.12" />
|
||||
<PackageReference Include="Xam.Plugin.DeviceInfo" Version="3.0.2" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.11" />
|
||||
<PackageReference Include="Xamarin.UITest" Version="3.0.14" />
|
||||
<PackageReference Include="Xamarin.UITest.Desktop" Version="0.0.7" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -89,4 +89,4 @@
|
|||
</ItemGroup>
|
||||
<Copy SourceFiles="@(_XamarinUITestFiles)" DestinationFolder="$(SolutionDir)packages\Xamarin.UITest.AnyVersion\%(RecursiveDir)" ContinueOnError="true" Retries="0" />
|
||||
</Target>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter">
|
||||
<Version>3.16.1</Version>
|
||||
</PackageReference>
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ namespace Xamarin.Forms.Material.Android
|
|||
return;
|
||||
}
|
||||
|
||||
if(!_hasDrawnOnce)
|
||||
if (!_hasDrawnOnce)
|
||||
{
|
||||
_hasDrawnOnce = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace Xamarin.Forms.Material.Android
|
|||
|
||||
_textInputLayout?.SetHint(Element.Placeholder, Element);
|
||||
|
||||
if(!string.IsNullOrWhiteSpace(Element.Placeholder))
|
||||
if (!string.IsNullOrWhiteSpace(Element.Placeholder))
|
||||
EditText.SetHintTextColor(global::Android.Graphics.Color.Transparent);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ namespace Xamarin.Forms.Material.Android
|
|||
ColorStateList _placeholderColorsList;
|
||||
ColorStateList _placeholderDefaultColorList;
|
||||
ColorStateList _underlineColorsList;
|
||||
|
||||
|
||||
static readonly int[][] s_colorStates = { new[] { global::Android.Resource.Attribute.StateEnabled }, new[] { -global::Android.Resource.Attribute.StateEnabled } };
|
||||
bool _disposed = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NUnit">
|
||||
<Version>3.12.0</Version>
|
||||
<Version>3.13.1</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
EvasObject _headerView;
|
||||
EvasObject _footerView;
|
||||
SmartEvent _scrollAnimationStop;
|
||||
SmartEvent _scrollAnimationStart;
|
||||
bool _isScrollAnimationStarted;
|
||||
|
||||
public event EventHandler<ItemsViewScrolledEventArgs> Scrolled;
|
||||
|
||||
|
|
@ -43,6 +45,10 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
Scroller.Show();
|
||||
PackEnd(Scroller);
|
||||
Scroller.Scrolled += OnScrolled;
|
||||
|
||||
_scrollAnimationStart = new SmartEvent(Scroller, ThemeConstants.Scroller.Signals.StartScrollAnimation);
|
||||
_scrollAnimationStart.On += OnScrollStarted;
|
||||
|
||||
_scrollAnimationStop = new SmartEvent(Scroller, ThemeConstants.Scroller.Signals.StopScrollAnimation);
|
||||
_scrollAnimationStop.On += OnScrollStopped;
|
||||
|
||||
|
|
@ -227,6 +233,11 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
|
||||
public void ItemMeasureInvalidated(int index)
|
||||
{
|
||||
// If a first item size was updated, need to reset _itemSize
|
||||
if (index == 0)
|
||||
{
|
||||
_itemSize = new ESize(-1, -1);
|
||||
}
|
||||
LayoutManager?.ItemMeasureInvalidated(index);
|
||||
}
|
||||
|
||||
|
|
@ -594,6 +605,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
Scroller.HorizontalStepSize = _layoutManager.GetScrollBlockSize();
|
||||
Scroller.VerticalStepSize = _layoutManager.GetScrollBlockSize();
|
||||
UpdateSnapPointsType(SnapPointsType);
|
||||
Device.BeginInvokeOnMainThread(SendScrolledEvent);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -629,7 +641,27 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
int _previousHorizontalOffset = 0;
|
||||
int _previousVerticalOffset = 0;
|
||||
|
||||
void OnScrollStarted(object sender, EventArgs e)
|
||||
{
|
||||
_isScrollAnimationStarted = true;
|
||||
}
|
||||
|
||||
void OnScrollStopped(object sender, EventArgs e)
|
||||
{
|
||||
SendScrolledEvent();
|
||||
_isScrollAnimationStarted = false;
|
||||
}
|
||||
|
||||
void OnScrolled(object sender, EventArgs e)
|
||||
{
|
||||
_layoutManager.LayoutItems(ViewPort);
|
||||
if (!_isScrollAnimationStarted)
|
||||
{
|
||||
SendScrolledEvent();
|
||||
}
|
||||
}
|
||||
|
||||
void SendScrolledEvent()
|
||||
{
|
||||
var args = new ItemsViewScrolledEventArgs();
|
||||
args.FirstVisibleItemIndex = _layoutManager.GetVisibleItemIndex(ViewPort.X, ViewPort.Y);
|
||||
|
|
@ -646,11 +678,6 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
_previousVerticalOffset = ViewPort.Y;
|
||||
}
|
||||
|
||||
void OnScrolled(object sender, EventArgs e)
|
||||
{
|
||||
_layoutManager.LayoutItems(ViewPort);
|
||||
}
|
||||
|
||||
void UpdateSnapPointsType(SnapPointsType snapPoints)
|
||||
{
|
||||
if (LayoutManager == null)
|
||||
|
|
|
|||
|
|
@ -178,6 +178,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
{
|
||||
return;
|
||||
}
|
||||
|
||||
_isLayouting = true;
|
||||
_last = bound;
|
||||
|
||||
|
|
@ -382,14 +383,21 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
|
||||
public void ItemMeasureInvalidated(int index)
|
||||
{
|
||||
if (_realizedItem.ContainsKey(index))
|
||||
{
|
||||
CollectionView.RequestLayoutItems();
|
||||
}
|
||||
if (_hasUnevenRows)
|
||||
{
|
||||
if (_cached.Count > index)
|
||||
_cached[index] = false;
|
||||
|
||||
if (_realizedItem.ContainsKey(index))
|
||||
{
|
||||
CollectionView.RequestLayoutItems();
|
||||
}
|
||||
}
|
||||
else if (index == 0) // MeasureFirstItem
|
||||
{
|
||||
// Reset item size to measure updated size
|
||||
InitializeMeasureCache();
|
||||
CollectionView.RequestLayoutItems();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -252,6 +252,10 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
header = structuredItemsView.HeaderTemplate.CreateContent() as View;
|
||||
header.BindingContext = structuredItemsView.Header;
|
||||
}
|
||||
else if (structuredItemsView.Header is String str)
|
||||
{
|
||||
header = new XLabel { Text = str, };
|
||||
}
|
||||
return header;
|
||||
}
|
||||
}
|
||||
|
|
@ -274,6 +278,10 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
footer = structuredItemsView.FooterTemplate.CreateContent() as View;
|
||||
footer.BindingContext = structuredItemsView.Footer;
|
||||
}
|
||||
else if (structuredItemsView.Footer is String str)
|
||||
{
|
||||
footer = new XLabel { Text = str, };
|
||||
}
|
||||
return footer;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -322,14 +322,21 @@ namespace Xamarin.Forms.Platform.Tizen.Native
|
|||
|
||||
public void ItemMeasureInvalidated(int index)
|
||||
{
|
||||
if (_realizedItem.ContainsKey(index))
|
||||
{
|
||||
CollectionView.RequestLayoutItems();
|
||||
}
|
||||
if (_hasUnevenRows)
|
||||
{
|
||||
if (_cached.Count > index)
|
||||
_cached[index] = false;
|
||||
|
||||
if (_realizedItem.ContainsKey(index))
|
||||
{
|
||||
CollectionView.RequestLayoutItems();
|
||||
}
|
||||
}
|
||||
else if (index == 0)
|
||||
{
|
||||
// Reset item size to measure updated size
|
||||
InitializeMeasureCache();
|
||||
CollectionView.RequestLayoutItems();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@
|
|||
<Version>6.2.10</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="NUnit">
|
||||
<Version>3.12.0</Version>
|
||||
<Version>3.13.1</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NUnit">
|
||||
<Version>3.12.0</Version>
|
||||
<Version>3.13.1</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
|
||||
<PackageReference Include="NUnit" Version="3.12.0" />
|
||||
<PackageReference Include="NUnit" Version="3.13.1" />
|
||||
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
Windows CMD:
|
||||
build.cmd -Target NugetPack
|
||||
build.cmd -Target NugetPack -ScriptArgs '-packageVersion="9.9.9-custom"','-configuration="Release"'
|
||||
build.cmd -Target NugetPack -ScriptArgs '--packageVersion="9.9.9-custom"','--configuration="Release"'
|
||||
|
||||
PowerShell:
|
||||
./build.ps1 -Target NugetPack
|
||||
./build.ps1 -Target NugetPack -ScriptArgs '-packageVersion="9.9.9-custom"'
|
||||
./build.ps1 -Target NugetPack -ScriptArgs '--packageVersion="9.9.9-custom"'
|
||||
|
||||
*/
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -135,6 +135,7 @@ Information ("isCIBuild: {0}", isCIBuild);
|
|||
Information ("artifactStagingDirectory: {0}", artifactStagingDirectory);
|
||||
Information("workingDirectory: {0}", workingDirectory);
|
||||
Information("NUNIT_TEST_WHERE: {0}", NUNIT_TEST_WHERE);
|
||||
Information("TARGET: {0}", target);
|
||||
|
||||
var releaseChannel = ReleaseChannel.Stable;
|
||||
if(releaseChannelArg == "Preview")
|
||||
|
|
|
|||
226
build.ps1
226
build.ps1
|
|
@ -1,234 +1,20 @@
|
|||
##########################################################################
|
||||
# This is the Cake bootstrapper script for PowerShell.
|
||||
# This file was downloaded from https://github.com/cake-build/resources
|
||||
# Feel free to change this file to fit your needs.
|
||||
##########################################################################
|
||||
|
||||
<#
|
||||
|
||||
.SYNOPSIS
|
||||
This is a Powershell script to bootstrap a Cake build.
|
||||
|
||||
.DESCRIPTION
|
||||
This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
|
||||
and execute your Cake build script with the parameters you provide.
|
||||
|
||||
.PARAMETER Script
|
||||
The build script to execute.
|
||||
.PARAMETER Target
|
||||
The build script target to run.
|
||||
.PARAMETER Configuration
|
||||
The build configuration to use.
|
||||
.PARAMETER Verbosity
|
||||
Specifies the amount of information to be displayed.
|
||||
.PARAMETER ShowDescription
|
||||
Shows description about tasks.
|
||||
.PARAMETER DryRun
|
||||
Performs a dry run.
|
||||
.PARAMETER Experimental
|
||||
Uses the nightly builds of the Roslyn script engine.
|
||||
.PARAMETER Mono
|
||||
Uses the Mono Compiler rather than the Roslyn script engine.
|
||||
.PARAMETER SkipToolPackageRestore
|
||||
Skips restoring of packages.
|
||||
.PARAMETER ScriptArgs
|
||||
Remaining arguments are added here.
|
||||
|
||||
.LINK
|
||||
https://cakebuild.net
|
||||
|
||||
#>
|
||||
# script inspired by https://andrewlock.net/simplifying-the-cake-global-tool-bootstrapper-scripts-in-netcore3-with-local-tools/
|
||||
|
||||
[CmdletBinding()]
|
||||
Param(
|
||||
[string]$Script = "build.cake",
|
||||
[string]$Target,
|
||||
[string]$Configuration,
|
||||
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
|
||||
[string]$Verbosity,
|
||||
[switch]$ShowDescription,
|
||||
[Alias("WhatIf", "Noop")]
|
||||
[switch]$DryRun,
|
||||
[switch]$Experimental,
|
||||
[switch]$Mono,
|
||||
[switch]$SkipToolPackageRestore,
|
||||
[Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
|
||||
[string[]]$ScriptArgs
|
||||
)
|
||||
|
||||
[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
|
||||
function MD5HashFile([string] $filePath)
|
||||
{
|
||||
if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
|
||||
{
|
||||
return $null
|
||||
}
|
||||
|
||||
[System.IO.Stream] $file = $null;
|
||||
[System.Security.Cryptography.MD5] $md5 = $null;
|
||||
try
|
||||
{
|
||||
$md5 = [System.Security.Cryptography.MD5]::Create()
|
||||
$file = [System.IO.File]::OpenRead($filePath)
|
||||
return [System.BitConverter]::ToString($md5.ComputeHash($file))
|
||||
}
|
||||
finally
|
||||
{
|
||||
if ($file -ne $null)
|
||||
{
|
||||
$file.Dispose()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function GetProxyEnabledWebClient
|
||||
{
|
||||
$wc = New-Object System.Net.WebClient
|
||||
$proxy = [System.Net.WebRequest]::GetSystemWebProxy()
|
||||
$proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
|
||||
$wc.Proxy = $proxy
|
||||
return $wc
|
||||
}
|
||||
|
||||
Write-Host "Preparing to run build script..."
|
||||
|
||||
if(!$PSScriptRoot){
|
||||
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
|
||||
}
|
||||
|
||||
$TOOLS_DIR = Join-Path $PSScriptRoot "caketools"
|
||||
$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
|
||||
$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
|
||||
$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
|
||||
$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
|
||||
$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
|
||||
$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
|
||||
$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
|
||||
$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
|
||||
$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
|
||||
|
||||
# Make sure tools folder exists
|
||||
if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
|
||||
Write-Verbose -Message "Creating tools directory..."
|
||||
New-Item -Path $TOOLS_DIR -Type directory | out-null
|
||||
}
|
||||
|
||||
# Make sure that packages.config exist.
|
||||
if (!(Test-Path $PACKAGES_CONFIG)) {
|
||||
Write-Verbose -Message "Downloading packages.config..."
|
||||
try {
|
||||
$wc = GetProxyEnabledWebClient
|
||||
$wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch {
|
||||
Throw "Could not download packages.config."
|
||||
}
|
||||
}
|
||||
|
||||
# Try find NuGet.exe in path if not exists
|
||||
if (!(Test-Path $NUGET_EXE)) {
|
||||
Write-Verbose -Message "Trying to find nuget.exe in PATH..."
|
||||
$existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
|
||||
$NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
|
||||
if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
|
||||
Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
|
||||
$NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
|
||||
}
|
||||
}
|
||||
|
||||
# Try download NuGet.exe if not exists
|
||||
if (!(Test-Path $NUGET_EXE)) {
|
||||
Write-Verbose -Message "Downloading NuGet.exe..."
|
||||
try {
|
||||
$wc = GetProxyEnabledWebClient
|
||||
$wc.DownloadFile($NUGET_URL, $NUGET_EXE)
|
||||
} catch {
|
||||
Throw "Could not download NuGet.exe."
|
||||
}
|
||||
}
|
||||
|
||||
# Save nuget.exe path to environment to be available to child processed
|
||||
$ENV:NUGET_EXE = $NUGET_EXE
|
||||
|
||||
# Restore tools from NuGet?
|
||||
if(-Not $SkipToolPackageRestore.IsPresent) {
|
||||
Push-Location
|
||||
Set-Location $TOOLS_DIR
|
||||
|
||||
# Check for changes in packages.config and remove installed tools if true.
|
||||
[string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
|
||||
if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
|
||||
($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
|
||||
Write-Verbose -Message "Missing or changed package.config hash..."
|
||||
Remove-Item * -Recurse -Exclude packages.config,nuget.exe
|
||||
}
|
||||
|
||||
Write-Verbose -Message "Restoring tools from NuGet..."
|
||||
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
|
||||
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Throw "An error occurred while restoring NuGet tools."
|
||||
}
|
||||
else
|
||||
{
|
||||
$md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
|
||||
}
|
||||
Write-Verbose -Message ($NuGetOutput | out-string)
|
||||
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
# Restore addins from NuGet
|
||||
if (Test-Path $ADDINS_PACKAGES_CONFIG) {
|
||||
Push-Location
|
||||
Set-Location $ADDINS_DIR
|
||||
|
||||
Write-Verbose -Message "Restoring addins from NuGet..."
|
||||
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
|
||||
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Throw "An error occurred while restoring NuGet addins."
|
||||
}
|
||||
|
||||
Write-Verbose -Message ($NuGetOutput | out-string)
|
||||
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
# Restore modules from NuGet
|
||||
if (Test-Path $MODULES_PACKAGES_CONFIG) {
|
||||
Push-Location
|
||||
Set-Location $MODULES_DIR
|
||||
|
||||
Write-Verbose -Message "Restoring modules from NuGet..."
|
||||
$NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
|
||||
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Throw "An error occurred while restoring NuGet modules."
|
||||
}
|
||||
|
||||
Write-Verbose -Message ($NuGetOutput | out-string)
|
||||
|
||||
Pop-Location
|
||||
}
|
||||
|
||||
# Make sure that Cake has been installed.
|
||||
if (!(Test-Path $CAKE_EXE)) {
|
||||
Throw "Could not find Cake.exe at $CAKE_EXE"
|
||||
}
|
||||
|
||||
|
||||
# Restore Cake tool
|
||||
& dotnet tool restore
|
||||
|
||||
# Build Cake arguments
|
||||
$cakeArguments = @("$Script");
|
||||
if ($Target) { $cakeArguments += "-target=$Target" }
|
||||
if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
|
||||
if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
|
||||
if ($ShowDescription) { $cakeArguments += "-showdescription" }
|
||||
if ($DryRun) { $cakeArguments += "-dryrun" }
|
||||
if ($Experimental) { $cakeArguments += "-experimental" }
|
||||
if ($Mono) { $cakeArguments += "-mono" }
|
||||
if ($Target) { $cakeArguments += "--target=$Target" }
|
||||
$cakeArguments += $ScriptArgs
|
||||
|
||||
# Start Cake
|
||||
Write-Host "Running build script..."
|
||||
&$CAKE_EXE $cakeArguments
|
||||
exit $LASTEXITCODE
|
||||
& dotnet tool run dotnet-cake -- $cakeArguments
|
||||
exit $LASTEXITCODE
|
||||
87
build.sh
87
build.sh
|
|
@ -1,99 +1,30 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
##########################################################################
|
||||
# This is the Cake bootstrapper script for Linux and OS X.
|
||||
# This file was downloaded from https://github.com/cake-build/resources
|
||||
# Feel free to change this file to fit your needs.
|
||||
##########################################################################
|
||||
|
||||
# Define directories.
|
||||
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
|
||||
TOOLS_DIR=$SCRIPT_DIR/caketools
|
||||
NUGET_EXE=$TOOLS_DIR/nuget.exe
|
||||
CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
|
||||
PACKAGES_CONFIG=$TOOLS_DIR/packages.config
|
||||
PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum
|
||||
|
||||
# Define md5sum or md5 depending on Linux/OSX
|
||||
MD5_EXE=
|
||||
if [[ "$(uname -s)" == "Darwin" ]]; then
|
||||
MD5_EXE="md5 -r"
|
||||
else
|
||||
MD5_EXE="md5sum"
|
||||
fi
|
||||
# script inspired by https://andrewlock.net/simplifying-the-cake-global-tool-bootstrapper-scripts-in-netcore3-with-local-tools/
|
||||
|
||||
# Define default arguments.
|
||||
SCRIPT="build.cake"
|
||||
VERBOSITY="verbose"
|
||||
DRYRUN=
|
||||
SHOW_VERSION=false
|
||||
SCRIPT_ARGUMENTS=()
|
||||
CAKE_ARGUMENTS=()
|
||||
|
||||
# Parse arguments.
|
||||
for i in "$@"; do
|
||||
case $1 in
|
||||
-s|--script) SCRIPT="$2"; shift ;;
|
||||
-t|--target) TARGET="$2"; shift ;;
|
||||
-c|--configuration) CONFIGURATION="$2"; shift ;;
|
||||
-v|--verbosity) VERBOSITY="$2"; shift ;;
|
||||
-d|--dryrun) DRYRUN="-dryrun" ;;
|
||||
--version) SHOW_VERSION=true ;;
|
||||
--) shift; SCRIPT_ARGUMENTS+=("$@"); break ;;
|
||||
*) SCRIPT_ARGUMENTS+=("$1") ;;
|
||||
--) shift; CAKE_ARGUMENTS+=("$@"); break ;;
|
||||
*) CAKE_ARGUMENTS+=("$1") ;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
# Make sure the tools folder exist.
|
||||
if [ ! -d "$TOOLS_DIR" ]; then
|
||||
mkdir "$TOOLS_DIR"
|
||||
fi
|
||||
# Restore Cake tool
|
||||
dotnet tool restore
|
||||
|
||||
# Make sure that packages.config exist.
|
||||
if [ ! -f "$TOOLS_DIR/packages.config" ]; then
|
||||
echo "Downloading packages.config..."
|
||||
curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "An error occurred while downloading packages.config."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Download NuGet if it does not exist.
|
||||
if [ ! -f "$NUGET_EXE" ]; then
|
||||
echo "Downloading NuGet..."
|
||||
curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "An error occurred while downloading nuget.exe."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Restore tools from NuGet.
|
||||
pushd "$TOOLS_DIR" >/dev/null
|
||||
if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$( cat $PACKAGES_CONFIG_MD5 | sed 's/\r$//' )" != "$( $MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' )" ]; then
|
||||
find . -type d ! -name . | xargs rm -rf
|
||||
fi
|
||||
|
||||
mono "$NUGET_EXE" install -ExcludeVersion
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Could not restore NuGet packages."
|
||||
echo "An error occured while installing Cake."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
$MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' >| $PACKAGES_CONFIG_MD5
|
||||
|
||||
popd >/dev/null
|
||||
|
||||
# Make sure that Cake has been installed.
|
||||
if [ ! -f "$CAKE_EXE" ]; then
|
||||
echo "Could not find Cake.exe at '$CAKE_EXE'."
|
||||
exit 1
|
||||
fi
|
||||
echo "${CAKE_ARGUMENTS[@]}"
|
||||
|
||||
# Start Cake
|
||||
if $SHOW_VERSION; then
|
||||
exec mono "$CAKE_EXE" -version
|
||||
else
|
||||
exec mono "$CAKE_EXE" $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}"
|
||||
fi
|
||||
dotnet tool run dotnet-cake "$SCRIPT" "${CAKE_ARGUMENTS[@]}"
|
||||
|
|
@ -1,7 +1,11 @@
|
|||
if (IsMac)
|
||||
{
|
||||
System.Net.Http.HttpClient client = new System.Net.Http.HttpClient (new System.Net.Http.HttpClientHandler { AllowAutoRedirect = true });
|
||||
|
||||
if (!Directory.Exists ("/Library/Frameworks/Mono.framework/Versions/Current/Commands/"))
|
||||
{
|
||||
Item ("Mono", "6.12.0.127")
|
||||
.Source (_ => "https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.107.macos10.xamarin.universal.pkg");
|
||||
}
|
||||
ForceJavaCleanup();
|
||||
OpenJDK ("1.8.0-40");
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ jobs:
|
|||
inputs:
|
||||
targetType: 'filePath'
|
||||
filePath: 'build.sh'
|
||||
arguments: --target cg-android --ANDROID_RENDERERS="$(renderers)" --GoogleMapsAPIKey="$(GoogleMapsAPIKey)" --BUILD_CONFIGURATION=${{ parameters.buildConfiguration }} --MSBuildArguments='${{ variables.MSBuildArguments_cg_android }}'
|
||||
arguments: --target cg-android --ANDROID_RENDERERS="$(renderers)" --GoogleMapsAPIKey="$(GoogleMapsAPIKey)" --BUILD_CONFIGURATION=${{ parameters.buildConfiguration }} --MSBuildArguments='${{ variables.MSBuildArguments_cg_android }} '
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: 'Copy $(renderers)'
|
||||
|
|
|
|||
|
|
@ -21,6 +21,13 @@ steps:
|
|||
displayName: 'Setup SDK Paths'
|
||||
condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
|
||||
|
||||
- task: UseDotNet@2
|
||||
displayName: 'Install .net core $(DOTNET_VERSION)'
|
||||
condition: ne(variables['DOTNET_VERSION'], '')
|
||||
inputs:
|
||||
version: $(DOTNET_VERSION)
|
||||
packageType: 'sdk'
|
||||
|
||||
- task: Bash@3
|
||||
displayName: 'Cake Provision'
|
||||
condition: eq(variables['provisioningCake'], 'true')
|
||||
|
|
@ -29,13 +36,6 @@ steps:
|
|||
filePath: 'build.sh'
|
||||
arguments: --target provision --TeamProject="$(System.TeamProject)"
|
||||
|
||||
- task: UseDotNet@2
|
||||
displayName: 'Install .net core $(DOTNET_VERSION)'
|
||||
condition: ne(variables['DOTNET_VERSION'], '')
|
||||
inputs:
|
||||
version: $(DOTNET_VERSION)
|
||||
packageType: 'sdk'
|
||||
|
||||
- task: NuGetToolInstaller@1
|
||||
displayName: 'Use NuGet'
|
||||
condition: ne(variables['NUGET_VERSION'], '')
|
||||
|
|
@ -80,14 +80,14 @@ steps:
|
|||
inputs:
|
||||
targetType: 'filePath'
|
||||
filePath: 'build.sh'
|
||||
arguments: --target cg-ios --BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }}'
|
||||
arguments: --target cg-ios --BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }} '
|
||||
|
||||
- task: Bash@3
|
||||
displayName: 'Build iOS Tests'
|
||||
inputs:
|
||||
targetType: 'filePath'
|
||||
filePath: 'build.sh'
|
||||
arguments: --target cg-ios-build-tests -BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }}'
|
||||
arguments: --target cg-ios-build-tests --BUILD_CONFIGURATION=$(buildConfiguration) --MSBuildArguments='${{ variables.MSBuildArguments_cg_ios }} '
|
||||
|
||||
- task: CopyFiles@2
|
||||
displayName: 'Copy iOS Files for UITest'
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ steps:
|
|||
# version: $(DOTNET_VERSION)
|
||||
# packageType: 'sdk'
|
||||
|
||||
- script: build.cmd -Target cg-uwp-build-tests -ScriptArgs '-BUILD_CONFIGURATION="$(BuildConfiguration)"'
|
||||
- script: build.cmd -Target cg-uwp-build-tests -ScriptArgs '--BUILD_CONFIGURATION="$(BuildConfiguration)"'
|
||||
condition: eq(variables['BuildConfiguration'], 'Release')
|
||||
displayName: 'Build Tests and APPX'
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ steps:
|
|||
Xamarin.Forms.ControlGallery.WindowsUniversal/AppPackages/*/Dependencies/x86/**
|
||||
TargetFolder: '$(build.artifactstagingdirectory)'
|
||||
|
||||
- script: build.cmd -Target BuildForNuget -ScriptArgs '-BUILD_CONFIGURATION="$(BuildConfiguration)"','-Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
|
||||
- script: build.cmd -Target BuildForNuget -ScriptArgs '--BUILD_CONFIGURATION="$(BuildConfiguration)"','--Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
|
||||
name: winbuild
|
||||
displayName: 'Build Projects For Nuget'
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче