Merge branch '4.7.0' into 4.8.0

rmarinho · rmarinho · commit 0bb52af9a34a · 2020-09-10T11:54:13.000+01:00
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs
@@ -192,7 +192,7 @@ void NextButton_Clicked(object sender, EventArgs e)
 			ViewModel.RunTest(_TestCases[_TestNumber++]);
 		}
 
-#if UITEST
+#if false && UITEST
 
 		double TopThreshold => 1 + Threshold;
 		double BottomThreshold => 1 - Threshold;
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -26,6 +26,7 @@ resources:
       type: github
       name: xamarin/yaml-templates
       endpoint: xamarin
+      ref: refs/heads/main # still defaults to master even though main is the main branch
 
 trigger:
   branches:
diff --git a/build/steps/build-sign.yml b/build/steps/build-sign.yml
@@ -19,6 +19,7 @@ steps:
       jenkinsEndpoint: Xamarin Code Signing Jenkins
       jenkinsJob: sign-from-vsts
       artifactHost: 'https://dl.internalx.com/vsts-devdiv'
+      CodeSignOverride: true
 
   - task: PublishBuildArtifacts@1
     displayName: 'Publish Artifact: nuget signed'

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ void NextButton_Clicked(object sender, EventArgs e)`
`192`	`192`	`ViewModel.RunTest(_TestCases[_TestNumber++]);`
`193`	`193`	`}`
`194`	`194`
`195`		`-#if UITEST`
	`195`	`+#if false && UITEST`
`196`	`196`
`197`	`197`	`double TopThreshold => 1 + Threshold;`
`198`	`198`	`double BottomThreshold => 1 - Threshold;`