[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]>
xamarin · May 13, 2022 · 5859251 · 5859251
1 parent bc4d4d9
commit 5859251
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git a/MauiCompat.sh b/MauiCompat.sh
@@ -336,6 +336,8 @@ sed -i '' 's/var newTypeface = f.ToTypeface();/var fontManager = Element.Handler
 				throw new ArgumentException("Unable to get IFontManager implementation");\
 			}\
 var newTypeface = f.ToTypeface(fontManager);/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/TextSwitcherRenderer.android.cs
+sed -i '' 's/child.RecalculateSpanPositions(/Xamarin.CommunityToolkit.Extensions.Internals.TextViewExtensions.RecalculateSpanPositions(child, /g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/TextSwitcherRenderer.android.cs
+
 
 # Controls 
 
@@ -481,6 +483,7 @@ sed -i '' 's/RequestAvAsset/RequestAVAsset/g' ./src/CommunityToolkit/Xamarin.Com
 
 sed -i '' 's/v,/(float)v,/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualElementExtension.shared.cs
 sed -i '' 's/, v/, (float)v/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualElementExtension.shared.cs
+sed -i '' 's/.Descendants()/.GetVisualTreeDescendants()/g' ./src/CommunityToolkit/Xamarin.CommunityToolkit.MauiCompat/**/VisualElementExtensions.uwp.cs
 
 # NativeSnackBar.ios.macos.cs
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -194,12 +194,11 @@ jobs:
     pool:
       vmImage: macos-latest
     steps:
-      - task: CmdLine@2
-        displayName: Install .NET 6.0.300-preview.22204.3
+      - task: UseDotNet@2
+        displayName: 'Install .NET SDK'
         inputs:
-          script: |
-            curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version 6.0.300-preview.22204.3 --quality preview
-            dotnet --info
+          version: $(NETCORE_VERSION)
+          includePreviewVersions: false
 
       - task: CmdLine@2
         displayName: 'Install .NET MAUI Workload'
@@ -242,12 +241,11 @@ jobs:
       - download: current
         artifact: drop      
 
-      - powershell: |
-          wget https://dot.net/v1/dotnet-install.ps1 -OutFile C:\dotnet-install.ps1
-          C:\dotnet-install.ps1 -Version 6.0.300-preview.22204.3
-          dotnet --info
-          Write-Host "##vso[task.prependpath]C:\\Users\\VssAdministrator\\AppData\\Local\\Microsoft\\dotnet"
-        displayName: Install .NET 6.0.300-preview.22204.3
+      - task: UseDotNet@2
+        displayName: 'Install .NET SDK'
+        inputs:
+          version: $(NETCORE_VERSION)
+          includePreviewVersions: false
 
       - task: CmdLine@2
         displayName: 'Install .NET MAUI Workload'
@@ -261,13 +259,6 @@ jobs:
           jdkArchitectureOption: 'x64'
           jdkSourceOption: 'PreInstalled'
 
-      - task: CmdLine@2
-        displayName: 'Global json'
-        inputs:
-          script: |
-            cd $(Pipeline.Workspace)\drop
-            dotnet new globaljson --sdk-version 6.0.300-preview.22204.3 --roll-forward latestMajor --force
-
       # if this is a tagged build, then update the version number
       - powershell: |
           $buildSourceBranch = "$(Build.SourceBranch)"
@@ -391,4 +382,4 @@ jobs:
     - template: sign-artifacts/jobs/v2.yml@internal-templates
       parameters:
         dependsOn: [ build_windows ]
-        condition: and(succeeded(), or(eq(variables['Sign'], 'true'), startsWith(variables['Build.SourceBranch'],'refs/tags/')))
+        condition: and(succeeded(), or(eq(variables['Sign'], 'true'), startsWith(variables['Build.SourceBranch'],'refs/tags/')))
diff --git a/global.json b/global.json
diff --git a/samples/XCT.Sample.sln b/samples/XCT.Sample.sln
@@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\.editorconfig = ..\.editorconfig
 		..\Directory.Build.props = ..\Directory.Build.props
 		..\Xamarin.CommunityToolkit.ruleset = ..\Xamarin.CommunityToolkit.ruleset
-		..\global.json = ..\global.json
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.CommunityToolkit.Sample.WPF", "XCT.Sample.WPF\Xamarin.CommunityToolkit.Sample.WPF.csproj", "{C4D6CD2D-8DF4-4D46-936C-1AB31C87B5EA}"

diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/AssemblyInfo/AssemblyInfo.android.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/AssemblyInfo/AssemblyInfo.android.cs
@@ -4,4 +4,4 @@
 
 [assembly: LinkerSafe]
 
-[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))] 
+[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]
diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/AssemblyInfo/AssemblyInfo.uwp.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/AssemblyInfo/AssemblyInfo.uwp.cs
@@ -1,4 +1,4 @@
 using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms.Platform.UWP;
 
-[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))] 
+[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		[assembly: LinkerSafe]

		[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]
		[assembly: ExportImageSourceHandler(typeof(GravatarImageSource), typeof(GravatarImageSourceHandler))]