Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 5859251

Browse files
[housekeeping] Automated PR to fix formatting errors (#1855)
* Automated dotnet-format update * Update global.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Brandon Minnick <[email protected]>
1 parent bc4d4d9 commit 5859251

File tree

6 files changed

+15
-28
lines changed

6 files changed

+15
-28
lines changed

MauiCompat.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ sed -i '' 's/var newTypeface = f.ToTypeface();/var fontManager = Element.Handler
336336
throw new ArgumentException("Unable to get IFontManager implementation");\
337337
}\
338338
var newTypeface = f.ToTypeface(fontManager);/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/TextSwitcherRenderer.android.cs
339+
sed -i '' 's/child.RecalculateSpanPositions(/Xamarin.CommunityToolkit.Extensions.Internals.TextViewExtensions.RecalculateSpanPositions(child, /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/TextSwitcherRenderer.android.cs
340+
339341

340342
# Controls
341343

@@ -481,6 +483,7 @@ sed -i '' 's/RequestAvAsset/RequestAVAsset/g' ./src/CommunityToolkit/Xamarin.Com
481483

482484
sed -i '' 's/v,/(float)v,/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualElementExtension.shared.cs
483485
sed -i '' 's/, v/, (float)v/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualElementExtension.shared.cs
486+
sed -i '' 's/.Descendants()/.GetVisualTreeDescendants()/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualElementExtensions.uwp.cs
484487

485488
# NativeSnackBar.ios.macos.cs
486489

azure-pipelines.yml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,11 @@ jobs:
194194
pool:
195195
vmImage: macos-latest
196196
steps:
197-
- task: CmdLine@2
198-
displayName: Install .NET 6.0.300-preview.22204.3
197+
- task: UseDotNet@2
198+
displayName: 'Install .NET SDK'
199199
inputs:
200-
script: |
201-
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 6.0.300-preview.22204.3 --quality preview
202-
dotnet --info
200+
version: $(NETCORE_VERSION)
201+
includePreviewVersions: false
203202

204203
- task: CmdLine@2
205204
displayName: 'Install .NET MAUI Workload'
@@ -242,12 +241,11 @@ jobs:
242241
- download: current
243242
artifact: drop
244243

245-
- powershell: |
246-
wget https://dot.net/v1/dotnet-install.ps1 -OutFile C:\dotnet-install.ps1
247-
C:\dotnet-install.ps1 -Version 6.0.300-preview.22204.3
248-
dotnet --info
249-
Write-Host "##vso[task.prependpath]C:\\Users\\VssAdministrator\\AppData\\Local\\Microsoft\\dotnet"
250-
displayName: Install .NET 6.0.300-preview.22204.3
244+
- task: UseDotNet@2
245+
displayName: 'Install .NET SDK'
246+
inputs:
247+
version: $(NETCORE_VERSION)
248+
includePreviewVersions: false
251249

252250
- task: CmdLine@2
253251
displayName: 'Install .NET MAUI Workload'
@@ -261,13 +259,6 @@ jobs:
261259
jdkArchitectureOption: 'x64'
262260
jdkSourceOption: 'PreInstalled'
263261

264-
- task: CmdLine@2
265-
displayName: 'Global json'
266-
inputs:
267-
script: |
268-
cd $(Pipeline.Workspace)\drop
269-
dotnet new globaljson --sdk-version 6.0.300-preview.22204.3 --roll-forward latestMajor --force
270-
271262
# if this is a tagged build, then update the version number
272263
- powershell: |
273264
$buildSourceBranch = "$(Build.SourceBranch)"
@@ -391,4 +382,4 @@ jobs:
391382
- template: sign-artifacts/jobs/v2.yml@internal-templates
392383
parameters:
393384
dependsOn: [ build_windows ]
394-
condition: and(succeeded(), or(eq(variables['Sign'], 'true'), startsWith(variables['Build.SourceBranch'],'refs/tags/')))
385+
condition: and(succeeded(), or(eq(variables['Sign'], 'true'), startsWith(variables['Build.SourceBranch'],'refs/tags/')))

global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

samples/XCT.Sample.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2121
..\.editorconfig = ..\.editorconfig
2222
..\Directory.Build.props = ..\Directory.Build.props
2323
..\Xamarin.CommunityToolkit.ruleset = ..\Xamarin.CommunityToolkit.ruleset
24-
..\global.json = ..\global.json
2524
EndProjectSection
2625
EndProject
2726
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.CommunityToolkit.Sample.WPF", "XCT.Sample.WPF\Xamarin.CommunityToolkit.Sample.WPF.csproj", "{C4D6CD2D-8DF4-4D46-936C-1AB31C87B5EA}"

src/CommunityToolkit/Xamarin.CommunityToolkit/AssemblyInfo/AssemblyInfo.android.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
[assembly: LinkerSafe]
66

7-
[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]
7+
[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
using Xamarin.CommunityToolkit.UI.Views;
22
using Xamarin.Forms.Platform.UWP;
33

4-
[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]
4+
[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]

0 commit comments

Comments
 (0)