Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Build] Remove unused variable #11727

Merged
merged 5 commits into from
Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions eng/pipelines/common/pack.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
parameters:
platform: ''
poolName: ''
provisionatorChannel: latest
artifact: 'nuget'

steps:
- template: provision.yml
parameters:
platform: ${{ parameters.platform }}
poolName: ${{ parameters.poolName }}
provisioning: true
provisionatorChannel: ${{ parameters.provisionatorChannel }}

- pwsh: ./build.ps1 --target=dotnet --configuration="Release" --verbosity=diagnostic
displayName: 'Install .NET'
retryCountOnTaskFailure: 3
Expand Down
77 changes: 41 additions & 36 deletions eng/pipelines/common/provision.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
parameters:
platform : ''
skipXcode: false
poolName: ''
skipXcode: false
skipVS: true
skipProvisioning: $(skipProvisionator)
provisionatorPath: $(provisionator.path)
provisionatorXCodePath: $(provisionator.xcode)
provisionatorVSPath: $(provisionator.vs)
provisionatorChannel: 'latest'
provisionatorExtraArguments: $(provisionator.extraArguments)

steps:
# Prepare macOS
Expand All @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/common/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions eng/pipelines/handlers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -231,8 +229,6 @@ stages:
parameters:
platform: ${{ BuildPlatform.name }}
poolName: ${{ BuildPlatform.poolName }}
provisioning: true
provisionatorChannel: ${{ parameters.provisionatorChannel }}

- task: DownloadBuildArtifacts@0
displayName: 'Download Packages'
Expand Down Expand Up @@ -285,8 +281,7 @@ stages:
parameters:
platform: ${{ BuildPlatform.name }}
poolName: ${{ BuildPlatform.poolName }}
provisioning: true
provisionatorChannel: ${{ parameters.provisionatorChannel }}

- task: DownloadBuildArtifacts@0
displayName: 'Download Packages'
inputs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/Controls/tests/DeviceTests/Elements/Label/LabelTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -398,7 +398,7 @@ public async Task FontStuffAppliesEvenInHtmlMode()
var label = new Label
{
TextType = TextType.Html,
FontSize = 64,
FontSize = 64,
FontFamily = "Baskerville",
Text = "<p>Test</p>"
};
Expand All @@ -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));

Expand Down
6 changes: 3 additions & 3 deletions src/Core/src/Platform/iOS/MauiWKWebView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void LoadHtml(string? html, string? baseUrl)
}

public void LoadUrl(string? url)
{
{
try
{
var uri = new Uri(url ?? string.Empty);
Expand All @@ -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))
{
Expand Down Expand Up @@ -139,7 +139,7 @@ public static WKWebViewConfiguration CreateConfiguration()

return config;
}

bool LoadFile(string url)
{
try
Expand Down