diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b31c75dde..965bd9046 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,8 +4,8 @@ variables: PreviewNumber: $[counter(variables['CurrentSemanticVersionBase'], 1001)] CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(PreviewNumber)' NugetPackageVersion: '$(CurrentSemanticVersion)' - MONO_VERSION: 6_4_0 - XCODE_VERSION: 11.4 + #MONO_VERSION: 6_4_0 + #XCODE_VERSION: 11.4 NETCORE_VERSION: '3.1.x' NETCORE_TEST_VERSION: '3.1.x' RunPoliCheck: 'false' @@ -153,11 +153,12 @@ jobs: Write-Host ("##vso[task.setvariable variable=NugetPackageVersion;]$tagVersion") displayName: Set NuGet Version to Tag Number condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/') + # 16feb21 jfversluis: let's not pin this anymore and use latest # make sure to select the correct Xamarin and mono - - bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION) - displayName: Switch to the latest Xamarin SDK - - 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 - displayName: Switch to the latest Xcode + #- bash: sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(MONO_VERSION) + # displayName: Switch to the latest Xamarin SDK + #- 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 + # displayName: Switch to the latest Xcode # restore, build and pack the packages - task: UseDotNet@2 displayName: 'Use .Net Core sdk' diff --git a/samples/XCT.Sample/Pages/AboutPage.xaml.cs b/samples/XCT.Sample/Pages/AboutPage.xaml.cs index b4973351f..2c1826452 100644 --- a/samples/XCT.Sample/Pages/AboutPage.xaml.cs +++ b/samples/XCT.Sample/Pages/AboutPage.xaml.cs @@ -1,4 +1,5 @@ using System; +using Xamarin.CommunityToolkit.Sample.ViewModels; namespace Xamarin.CommunityToolkit.Sample.Pages { diff --git a/samples/XCT.Sample/Pages/Behaviors/EmailValidationBehaviorPage.xaml b/samples/XCT.Sample/Pages/Behaviors/EmailValidationBehaviorPage.xaml index e9d055e70..f9fef55cd 100644 --- a/samples/XCT.Sample/Pages/Behaviors/EmailValidationBehaviorPage.xaml +++ b/samples/XCT.Sample/Pages/Behaviors/EmailValidationBehaviorPage.xaml @@ -15,11 +15,21 @@ Spacing="50" VerticalOptions="CenterAndExpand">