From 0e977d1e7302c0c04545db1e121ae71b02808808 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 29 Nov 2022 12:26:41 +0000 Subject: [PATCH 1/5] Remove unused variable --- eng/pipelines/common/pack.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml index 75eaf4d486a6..ed12ed6a39f6 100644 --- a/eng/pipelines/common/pack.yml +++ b/eng/pipelines/common/pack.yml @@ -9,7 +9,6 @@ steps: parameters: platform: ${{ parameters.platform }} poolName: ${{ parameters.poolName }} - provisioning: true provisionatorChannel: ${{ parameters.provisionatorChannel }} - pwsh: ./build.ps1 --target=dotnet --configuration="Release" --verbosity=diagnostic displayName: 'Install .NET' From 32b6f21b033b268a75c9d27bcb004e90306b4fd6 Mon Sep 17 00:00:00 2001 From: GitHub Actions Autoformatter Date: Tue, 29 Nov 2022 14:27:37 +0000 Subject: [PATCH 2/5] Auto-format source code --- .../Core/Handlers/Items/Android/CarouselViewLoopManager.cs | 2 +- src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs | 6 +++--- src/Core/src/Platform/iOS/MauiWKWebView.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Controls/src/Core/Handlers/Items/Android/CarouselViewLoopManager.cs b/src/Controls/src/Core/Handlers/Items/Android/CarouselViewLoopManager.cs index 78879067ab01..2565b7ee6ab7 100644 --- a/src/Controls/src/Core/Handlers/Items/Android/CarouselViewLoopManager.cs +++ b/src/Controls/src/Core/Handlers/Items/Android/CarouselViewLoopManager.cs @@ -47,7 +47,7 @@ public int GetGoToIndex(RecyclerView recyclerView, int carouselPosition, int new return -1; if (_itemsSource is null) return -1; - + var currentCarouselPosition = carouselPosition; var itemSourceCount = _itemsSource.Count; diff --git a/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs b/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs index c405d929ea84..53cd794a886c 100644 --- a/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs +++ b/src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs @@ -368,7 +368,7 @@ await InvokeOnMainThreadAsync(async () => } [Fact] - public async Task TextColorAppliesEvenInHtmlMode() + public async Task TextColorAppliesEvenInHtmlMode() { // Note: this is specifically a Controls-level rule that's inherited from Forms // There's no reason other SDKs need to force a TextColor property when dealing @@ -398,7 +398,7 @@ public async Task FontStuffAppliesEvenInHtmlMode() var label = new Label { TextType = TextType.Html, - FontSize = 64, + FontSize = 64, FontFamily = "Baskerville", Text = "

Test

" }; @@ -421,7 +421,7 @@ Color TextColor(LabelHandler handler) #endif } - static void AssertEquivalentFont(LabelHandler handler, Font font) + static void AssertEquivalentFont(LabelHandler handler, Font font) { var fontManager = (IFontManager)handler.MauiContext.Services.GetService(typeof(IFontManager)); diff --git a/src/Core/src/Platform/iOS/MauiWKWebView.cs b/src/Core/src/Platform/iOS/MauiWKWebView.cs index 928f938be49a..d3b15d0491bc 100644 --- a/src/Core/src/Platform/iOS/MauiWKWebView.cs +++ b/src/Core/src/Platform/iOS/MauiWKWebView.cs @@ -91,7 +91,7 @@ public void LoadHtml(string? html, string? baseUrl) } public void LoadUrl(string? url) - { + { try { var uri = new Uri(url ?? string.Empty); @@ -107,7 +107,7 @@ public void LoadUrl(string? url) // someone is passing in a local bundled file page. If we can find a better way // to detect that scenario, we should use it; until then, we'll fall back to // local file loading here and see if that works: - if(!string.IsNullOrEmpty(url)) + if (!string.IsNullOrEmpty(url)) { if (!LoadFile(url)) { @@ -139,7 +139,7 @@ public static WKWebViewConfiguration CreateConfiguration() return config; } - + bool LoadFile(string url) { try From 375b76e9c08b0979639020b2fb540684be79b585 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 29 Nov 2022 15:56:21 +0000 Subject: [PATCH 3/5] Cleanup provisioning --- eng/pipelines/common/pack.yml | 5 +- eng/pipelines/common/provision.yml | 77 ++++++++++++++++-------------- eng/pipelines/handlers.yml | 7 +-- 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml index ed12ed6a39f6..d03f02f40b28 100644 --- a/eng/pipelines/common/pack.yml +++ b/eng/pipelines/common/pack.yml @@ -1,15 +1,14 @@ parameters: platform: '' poolName: '' - provisionatorChannel: latest artifact: 'nuget' - + steps: - template: provision.yml parameters: platform: ${{ parameters.platform }} poolName: ${{ parameters.poolName }} - provisionatorChannel: ${{ parameters.provisionatorChannel }} + - pwsh: ./build.ps1 --target=dotnet --configuration="Release" --verbosity=diagnostic displayName: 'Install .NET' retryCountOnTaskFailure: 3 diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml index 563be62ddc50..2de628de5c04 100644 --- a/eng/pipelines/common/provision.yml +++ b/eng/pipelines/common/provision.yml @@ -1,8 +1,14 @@ parameters: platform : '' - skipXcode: false poolName: '' + skipXcode: false + skipVS: true + skipProvisioning: false + provisionatorPath: $(provisionator.path) + provisionatorXCodePath: $(provisionator.xcode) + provisionatorVSPath: $(provisionator.vs) provisionatorChannel: 'latest' + provisionatorExtraArguments: $(provisionator.extraArguments) steps: # Prepare macOS @@ -18,24 +24,23 @@ steps: - ${{ if ne(parameters.skipXcode, 'true') }}: - task: xamops.azdevex.provisionator-task.provisionator@2 displayName: 'Provision Xcode' - condition: ne(variables['REQUIRED_XCODE'], '') inputs: - provisioning_script: $(provisionator.xcode) - provisioning_extra_args: $(provisionator.extraArguments) + provisioning_script: ${{ parameters.provisionatorXCodePath }} + provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }} env: PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2) # Provision Additional Software - - task: xamops.azdevex.provisionator-task.provisionator@2 - displayName: 'Provision Additional Software' - condition: eq(variables['provisioning'], 'true') - continueOnError: true - inputs: - provisioning_script: $(provisionator.path) - provisioning_extra_args: $(provisionator.extraArguments) - env: - PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} - AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2) + - ${{ if ne(parameters.skipProvisioning, 'true') }}: + - task: xamops.azdevex.provisionator-task.provisionator@2 + displayName: 'Provision Additional Software' + continueOnError: true + inputs: + provisioning_script: ${{ parameters.provisionatorPath }} + provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }} + env: + PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} + AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2) # Setup SDK Paths - bash: | @@ -89,30 +94,30 @@ steps: msiexec.exe /package $output /quiet ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 ENABLE_PSREMOTING=1 REGISTER_MANIFEST=1 } displayName: 'Install PowerShell Core' - - task: xamops.azdevex.provisionator-task.provisionator@2 - displayName: 'Provision Visual Studio' - condition: eq(variables['provisioningVS'], 'true') - inputs: - provisioning_script: $(provisionator.vs) - env: - PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} - AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2) - - pwsh: | - $msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe" - echo "##vso[task.setvariable variable=MSBUILD_EXE]$msbuild" - displayName: 'Setup MSBuild Paths' - condition: eq(variables['provisioningVS'], 'true') + - ${{ if ne(parameters.skipVS, 'true') }}: + - task: xamops.azdevex.provisionator-task.provisionator@2 + displayName: 'Provision Visual Studio' + condition: eq(variables['provisioningVS'], 'true') + inputs: + provisioning_script: ${{ parameters.provisionatorVSPath }} + env: + PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} + AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2) + - pwsh: | + $msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe" + echo "##vso[task.setvariable variable=MSBUILD_EXE]$msbuild" + displayName: 'Setup MSBuild Paths' # Provision Additional Software - - task: xamops.azdevex.provisionator-task.provisionator@2 - displayName: 'Provision Additional Software' - condition: eq('${{ parameters.provisioning }}', 'true') - inputs: - provisioning_script: $(provisionator.path) - provisioning_extra_args: $(provisionator.extraArguments) - env: - PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} - AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2) + - ${{ if ne(parameters.skipProvisioning, 'true') }}: + - task: xamops.azdevex.provisionator-task.provisionator@2 + displayName: 'Provision Additional Software' + inputs: + provisioning_script: ${{ parameters.provisionatorPath }} + provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }} + env: + PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }} + AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2) # Prepare Both - task: UseDotNet@2 # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer?view=azure-devops diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml index 6eeea967debd..5de50d301789 100644 --- a/eng/pipelines/handlers.yml +++ b/eng/pipelines/handlers.yml @@ -154,8 +154,6 @@ stages: parameters: platform: ${{ BuildPlatform.name }} poolName: ${{ BuildPlatform.poolName }} - provisioning: true - provisionatorChannel: ${{ parameters.provisionatorChannel }} - pwsh: ./build.ps1 --target=dotnet --configuration="${{ BuildConfiguration }}" --verbosity=diagnostic displayName: 'Install .NET' retryCountOnTaskFailure: 3 @@ -231,8 +229,6 @@ stages: parameters: platform: ${{ BuildPlatform.name }} poolName: ${{ BuildPlatform.poolName }} - provisioning: true - provisionatorChannel: ${{ parameters.provisionatorChannel }} - task: DownloadBuildArtifacts@0 displayName: 'Download Packages' @@ -285,8 +281,7 @@ stages: parameters: platform: ${{ BuildPlatform.name }} poolName: ${{ BuildPlatform.poolName }} - provisioning: true - provisionatorChannel: ${{ parameters.provisionatorChannel }} + - task: DownloadBuildArtifacts@0 displayName: 'Download Packages' inputs: From b78b2bb4bbf8cad2ccda4c30ea8401f7be1cebff Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 29 Nov 2022 17:19:09 +0000 Subject: [PATCH 4/5] Use variable for skipping provisioning --- eng/pipelines/common/provision.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml index 2de628de5c04..a8b12d7d1986 100644 --- a/eng/pipelines/common/provision.yml +++ b/eng/pipelines/common/provision.yml @@ -3,7 +3,7 @@ parameters: poolName: '' skipXcode: false skipVS: true - skipProvisioning: false + skipProvisioning: $[ne(variables['provisioning'], 'true')] provisionatorPath: $(provisionator.path) provisionatorXCodePath: $(provisionator.xcode) provisionatorVSPath: $(provisionator.vs) From 284838526bb8a24d14e631057bffbf9b51a7bb94 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 29 Nov 2022 17:36:12 +0000 Subject: [PATCH 5/5] Try other approach --- eng/pipelines/common/provision.yml | 2 +- eng/pipelines/common/variables.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml index a8b12d7d1986..9b7b44e478ab 100644 --- a/eng/pipelines/common/provision.yml +++ b/eng/pipelines/common/provision.yml @@ -3,7 +3,7 @@ parameters: poolName: '' skipXcode: false skipVS: true - skipProvisioning: $[ne(variables['provisioning'], 'true')] + skipProvisioning: $(skipProvisionator) provisionatorPath: $(provisionator.path) provisionatorXCodePath: $(provisionator.xcode) provisionatorVSPath: $(provisionator.vs) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index c54068f276b1..ac0e2795ea16 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -37,6 +37,8 @@ variables: value: $(Build.ArtifactStagingDirectory)/logs - name: TestResultsDirectory value: $(Build.ArtifactStagingDirectory)/test-results +- name: skipProvisionator + value: $[ne(variables['provisioning'], 'true')] - name: provisionator.xcode value: '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx' - name: provisionator.path