Merge branch '4.4.0' into 4.5.0

This commit is contained in:
Rui Marinho 2020-02-12 10:25:09 +00:00
Родитель e1e92739ef 3313c58198
Коммит 8372db2ec4
7 изменённых файлов: 44 добавлений и 34 удалений

Просмотреть файл

@ -247,7 +247,7 @@ namespace Xamarin.Forms.Platform.iOS
Control.ResignFirstResponder();
((IEntryController)Element).SendCompleted();
if (Element.ReturnType == ReturnType.Next)
if (Element != null && Element.ReturnType == ReturnType.Next)
{
FocusSearch(true);
}

Просмотреть файл

@ -101,6 +101,8 @@ jobs:
provisionatorPath : 'build/provisioning/provisioning.csx'
- job: osx
workspace:
clean: all
displayName: OSX Phase
pool:
name: $(macOSVmImage)
@ -120,6 +122,8 @@ jobs:
- template: build/steps/build-osx.yml
- job: nuget_pack
workspace:
clean: all
displayName: Nuget Phase
dependsOn:
- win

Просмотреть файл

@ -35,18 +35,16 @@ function StripNodes {
pushd ..\..
if(test-path docstemp){ del docstemp -Recurse -Force }
mkdir docstemp
pushd docstemp
# Default Language Stuff
# Clone Xamarin.Forms-api-docs in docstemp\Xamarin.Forms-api-docs
git clone -b $branch --single-branch $docsUri
git clone -qb $branch --single-branch $docsUri
pushd .\Xamarin.Forms-api-docs
# Temporary hack to handle a typo (https://github.com/xamarin/Xamarin.Forms/pull/6103)
copy .\docs\Xamarin.Forms\SearchBoxVisibility.xml .\docs\Xamarin.Forms\SearchBoxVisiblity.xml
# Run mdoc
& $mdoc export-msxdoc .\docs
@ -76,54 +74,54 @@ $translations =
$branch = "live"
$translations | % {
#$translations | % {
# Generate the URI for each translated version
$translationUri = "https://$token@github.com/xamarin/Xamarin.Forms-api-docs.$($_.lang).git"
$translationFolder = ".\Xamarin.Forms-api-docs.$($_.lang)"
# $translationUri = "https://$token@github.com/xamarin/Xamarin.Forms-api-docs.$($_.lang).git"
# $translationFolder = ".\Xamarin.Forms-api-docs.$($_.lang)"
# Clone the translation repo
git clone -b $branch --single-branch $translationUri
# git clone -qb $branch --single-branch $translationUri
# Go into the language-specific folder
pushd $translationFolder\docs
# pushd $translationFolder\docs
# Copy everything over the stuff in the default language folder
# (So untranslated bits still remain in the default language)
copy-item -Path . -Destination ..\..\Xamarin.Forms-api-docs -Recurse -Force
# copy-item -Path . -Destination ..\..\Xamarin.Forms-api-docs -Recurse -Force -Exclude index.xml
# Return from the language-specific folder
popd
# popd
# Go into the default language folder
pushd .\Xamarin.Forms-api-docs
# pushd .\Xamarin.Forms-api-docs
Write-Host "Stripping out unused XML for $($_.lang)"
# Write-Host "Stripping out unused XML for $($_.lang)"
dir .\docs -R *.xml | Select -ExpandProperty FullName | % {
# dir .\docs -R *.xml | Select -ExpandProperty FullName | % {
$xpaths = "//remarks",
"//summary[text()='To be added.']",
"//param[text()='To be added.']",
"//returns[text()='To be added.']",
"//typeparam[text()='To be added.']",
"//value[text()='To be added.']",
"//related",
"//example"
# $xpaths = "//remarks",
# "//summary[text()='To be added.']",
# "//param[text()='To be added.']",
# "//returns[text()='To be added.']",
# "//typeparam[text()='To be added.']",
# "//value[text()='To be added.']",
# "//related",
# "//example"
StripNodes $_ $xpaths
}
# StripNodes $_ $xpaths
# }
# Run mdoc
& $mdoc export-msxdoc .\docs
# & $mdoc export-msxdoc .\docs
# And put the results in the language specific folder under docs
$dest = "..\..\docs\$($_.target)"
mkdir $dest
mv Xamarin.Forms.*.xml $dest -Force
# $dest = "..\..\docs\$($_.target)"
# mkdir $dest
# mv Xamarin.Forms.*.xml $dest -Force
# Return from the default language folder
popd
}
# popd
#}
popd

Просмотреть файл

@ -21,6 +21,8 @@ parameters:
jobs:
- job: ${{ parameters.name }}
workspace:
clean: all
displayName: ${{ parameters.displayName }}
timeoutInMinutes: 120
pool:

Просмотреть файл

@ -1,4 +1,7 @@
steps:
- checkout: self
clean: true
- task: DownloadBuildArtifacts@0
displayName: 'Download build artifact win_build'
inputs:
@ -17,9 +20,8 @@ steps:
displayName: 'Generate docs from docs repo'
inputs:
scriptName: 'build/scripts/generate-docs.ps1'
arguments: '"$(Build.SourceBranch)" "$(GitHub.Token)"'
arguments: '"$(Build.SourceBranch)" "$(github--pat--xamarinreleasemanager)"'
workingFolder: '$(System.DefaultWorkingDirectory)/build/scripts'
failOnStandardError: false
- task: NuGetToolInstaller@1
displayName: 'Use NuGet: $(NUGET_VERSION)'

Просмотреть файл

@ -10,6 +10,8 @@ parameters:
steps:
- checkout: none
clean: true
- template: sign-artifacts/steps/v1.yml@xamarin-templates
parameters:
targetFolder: $(Build.ArtifactStagingDirectory)/nuget/signed

Просмотреть файл

@ -23,6 +23,8 @@ parameters:
jobs:
- job: ${{ parameters.name }}
workspace:
clean: all
displayName: ${{ parameters.displayName }}
timeoutInMinutes: 120
pool:
@ -85,7 +87,7 @@ jobs:
solution: ${{ parameters.csprojPath }}
configuration: '$(BuildConfiguration)'
msbuildArguments: ${{ parameters.msbuildExtraArguments }} /t:rebuild /p:DisableEmbeddedXbf=false /bl:$(Build.ArtifactStagingDirectory)\win-$(BuildConfiguration)-csproj.binlog
- task: VSTest@2
displayName: 'Unit Tests'
inputs: