dotnet · rmarinho · Feb 16, 2023 · Feb 7, 2023 · Feb 7, 2023 · Feb 8, 2023
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.22569.1",
+      "version": "1.0.0-prerelease.23110.1",
       "commands": [
         "xharness"
       ]

@@ -27,6 +27,7 @@ dotnet_diagnostic.IL2050.severity = none
 # Code analyzers
 dotnet_diagnostic.CA1307.severity = error
 dotnet_diagnostic.CA1309.severity = error
+dotnet_diagnostic.CA1815.severity = error
 
 # Modifier preferences
 dotnet_style_require_accessibility_modifiers = never:suggestion

@@ -2005,116 +2005,12 @@
           {
             "name": "addReply",
             "parameters": {
-              "comment": "Thanks for the issue report @${issueAuthor}! This issue appears to be a problem with Visual Studio, so we ask that you use the VS feedback tool to report the issue. That way it will get to the routed to the team that owns this experience in VS.\n\nIf you encounter a problem with Visual Studio, we want to know about it so that we can diagnose and fix it. By using the Report a Problem tool, you can collect detailed information about the problem, and send it to Microsoft with just a few button clicks.\n\n1. Go to the [Visual Studio for Windows feedback tool](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022) or [Visual Studio for Mac feedback tool](https://learn.microsoft.com/en-us/visualstudio/mac/report-a-problem?view=vsmac-2022) to report the issue\n2. Close this bug, and consider adding a link to the VS Feedback issue so that others can follow its activity there.\n\nThis issue will be automatically closed in 3 days if there are no further comments."
+              "comment": "Thanks for the issue report @${issueAuthor}! This issue appears to be a problem with Visual Studio, so we ask that you use the VS feedback tool to report the issue. That way it will get to the routed to the team that owns this experience in VS.\n\nIf you encounter a problem with Visual Studio, we want to know about it so that we can diagnose and fix it. By using the Report a Problem tool, you can collect detailed information about the problem, and send it to Microsoft with just a few button clicks.\n\n1. Go to the [Visual Studio for Windows feedback tool](https://docs.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022) or [Visual Studio for Mac feedback tool](https://learn.microsoft.com/en-us/visualstudio/mac/report-a-problem?view=vsmac-2022) to report the issue\n2. Close this bug, and consider adding a link to the VS Feedback issue so that others can follow its activity there."
             }
           }
         ]
       }
     },
-    {
-      "taskType": "scheduled",
-      "capabilityId": "ScheduledSearch",
-      "subCapability": "ScheduledSearch",
-      "version": "1.1",
-      "config": {
-        "frequency": [
-          {
-            "weekDay": 0,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 1,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 2,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 3,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 4,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 5,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          },
-          {
-            "weekDay": 6,
-            "hours": [
-              0,
-              6,
-              12,
-              18
-            ]
-          }
-        ],
-        "searchTerms": [
-          {
-            "name": "isOpen",
-            "parameters": {}
-          },
-          {
-            "name": "hasLabel",
-            "parameters": {
-              "label": "s/move-to-vs-feedback"
-            }
-          },
-          {
-            "name": "noActivitySince",
-            "parameters": {
-              "days": 3
-            }
-          }
-        ],
-        "taskName": "Close 's/move-to-vs-feedback' after 3 days of no activity",
-        "actions": [
-          {
-            "name": "addReply",
-            "parameters": {
-              "comment": "This issue is being closed due to inactivity. If this issue is still affecting you, please follow the steps above to use the VS Feedback Tool to report the issue."
-            }
-          },
-          {
-            "name": "closeIssue",
-            "parameters": {}
-          }
-        ]
-      }
-    },
     {
       "taskType": "trigger",
       "capabilityId": "IssueResponder",

@@ -20,4 +20,5 @@ jobs:
       - name: 'Push autoformatted patch'
         uses: rolfbjarne/autoformat-push@v0.1
         with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          commentContents: 'Thank you for your pull request. We are auto-formating your source code to follow our code guidelines.'
@@ -14,7 +14,6 @@ jobs:
     - name: 'Autoformat'
       uses: rolfbjarne/autoformat@v0.2
       with:
-        script: 'dotnet format .\Microsoft.Maui.sln --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs'
-        projects: "Microsoft.Maui.sln"
+        script: 'dotnet format Microsoft.Maui.sln --no-restore --exclude Templates/src BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs Graphics/src/Graphics.Win2D/W2DCanvas.cs Graphics/src/Graphics.Win2D/W2DExtensions.cs'
         onlyFilesModifiedInPullRequest: true
-        git_commit_message: 'Thank you for your pull request. We are auto-formating your source code to follow our code guidelines.'
+        git_commit_message: 'Auto-format source code'
@@ -83,17 +83,17 @@
       <Uri>https://github.com/dotnet/templating</Uri>
       <Sha>3f4da9ced34942d83054e647f3b1d9d7dde281e8</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22569.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.23110.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>bc9877ac24c13ef8d4ad4c2c3652291a1b02b78f</Sha>
+      <Sha>6e20fd14ba45ff67193f961186d373ffbcfd5ea2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22569.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.23110.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>bc9877ac24c13ef8d4ad4c2c3652291a1b02b78f</Sha>
+      <Sha>6e20fd14ba45ff67193f961186d373ffbcfd5ea2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22569.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.23110.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>bc9877ac24c13ef8d4ad4c2c3652291a1b02b78f</Sha>
+      <Sha>6e20fd14ba45ff67193f961186d373ffbcfd5ea2</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
@@ -58,7 +58,7 @@
     <_XamarinAndroidXSecurityVersion>1.1.0-alpha03</_XamarinAndroidXSecurityVersion>
     <_XamarinGoogleCryptoTinkAndroidVersion>1.7.0.2</_XamarinGoogleCryptoTinkAndroidVersion>
     <!-- Android Maps -->
-    <XamarinGooglePlayServicesMaps>118.1.0</XamarinGooglePlayServicesMaps>
+    <XamarinGooglePlayServicesMaps>118.1.0.1</XamarinGooglePlayServicesMaps>
     <!--
       SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
        - NuGet versions below
@@ -69,9 +69,9 @@
     <_HarfBuzzSharpVersion>2.8.2.2</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.193b587552cb0ed39372a049d7e6c692db98c267.483</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-preview.5.22226.1</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22569.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22569.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22569.1</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.23110.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.23110.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.23110.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.0</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>0.5.13</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.2.0</FizzlerPackageVersion>

@@ -102,9 +102,14 @@ Task("dotnet-build")
     {
         RunMSBuildWithDotNet("./Microsoft.Maui.BuildTasks.slnf");
         if (IsRunningOnWindows())
+        {
             RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount: 1);
+        }
         else
-            RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", maxCpuCount: 1);
+        {
+            // NOTE: intentionally omit maxCpuCount, to avoid an issue with the 7.0.100 .NET SDK
+            RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf");
+        }
     });
 
 Task("dotnet-samples")

@@ -6,7 +6,7 @@ steps:
     displayName: 'Provisionator'
     condition: eq(variables['provisioning'], 'true')
     inputs:
-      provisioning_script: $(provisionator.path)
+      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.path)
       provisioning_extra_args: $(provisionator.extraArguments)
     env:
       AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)

@@ -6,15 +6,15 @@ steps:
     displayName: 'Provision Xcode'
     condition: ne(variables['REQUIRED_XCODE'], '')
     inputs:
-      provisioning_script: $(provisionator.xcode)
+      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.xcode)
     env:
       AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
   - task: xamops.azdevex.provisionator-task.provisionator@1
     displayName: 'Provisionator'
     condition: eq(variables['provisioning'], 'true')
     inputs:
-      provisioning_script: $(provisionator.path)
+      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.path)
       provisioning_extra_args: $(provisionator.extraArguments)
     env:
       AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)

@@ -6,7 +6,7 @@ steps:
     displayName: 'Provisionator'
     condition: eq(variables['provisioning'], 'true')
     inputs:
-      provisioning_script: $(provisionator.path)
+      provisioning_script: $(System.DefaultWorkingDirectory)/$(provisionator.path)
       provisioning_extra_args: $(provisionator.extraArguments)
     env:
       AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)

@@ -28,9 +28,14 @@ parameters:
   type: string
   default: $(github--pat--vs-mobiletools-engineering-service2)
 
+- name: checkoutDirectory
+  type: string
+  default: $(System.DefaultWorkingDirectory)
+
 steps:
   - template: provision.yml
     parameters:
+      checkoutDirectory: ${{ parameters.checkoutDirectory }}
       platform: ${{ parameters.platform }}
       poolName: ${{ parameters.poolName }}
       provisionatorChannel: ${{ parameters.provisionatorChannel }}

@@ -4,6 +4,7 @@ parameters:
   skipXcode: false
   skipVS: true
   skipProvisioning: $(skipProvisionator)
+  checkoutDirectory: $(System.DefaultWorkingDirectory)
   provisionatorPath: $(provisionator.path)
   provisionatorXCodePath: $(provisionator.xcode)
   provisionatorVSPath: $(provisionator.vs)
@@ -26,7 +27,7 @@ steps:
       - task: xamops.azdevex.provisionator-task.provisionator@2
         displayName: 'Provision Xcode'
         inputs:
-          provisioning_script: ${{ parameters.provisionatorXCodePath }}
+          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorXCodePath }}
           provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
           github_token: ${{ parameters.gitHubToken }}
         env:
@@ -37,7 +38,7 @@ steps:
         displayName: 'Provision Additional Software'
         continueOnError: true 
         inputs:
-          provisioning_script: ${{ parameters.provisionatorPath }}
+          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorPath }}
           provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
           github_token: ${{ parameters.gitHubToken }}
         env:
@@ -99,7 +100,7 @@ steps:
       - task: xamops.azdevex.provisionator-task.provisionator@2
         displayName: 'Provision Visual Studio'
         inputs:
-          provisioning_script: ${{ parameters.provisionatorVSPath }}
+          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorVSPath }}
           provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
           github_token: ${{ parameters.gitHubToken }}
         env:
@@ -114,18 +115,18 @@ steps:
       - task: xamops.azdevex.provisionator-task.provisionator@2
         displayName: 'Provision Additional Software'
         inputs:
-          provisioning_script: ${{ parameters.provisionatorPath }}
+          provisioning_script: ${{ parameters.checkoutDirectory }}/${{ parameters.provisionatorPath }}
           provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
           github_token: ${{ parameters.gitHubToken }}
         env:
           PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
 
   # Prepare Both
   - task: UseDotNet@2                 # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer?view=azure-devops
-    displayName: 'Use .NET SDK 6'
+    displayName: 'Use .NET SDK 7'
     inputs:
       packageType: sdk
-      version: 6.0.x
+      version: $(DOTNET_VERSION)
 
   - pwsh: |
       dotnet --version

@@ -6,7 +6,7 @@ variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
 - name: DOTNET_VERSION
-  value: 6.0.403
+  value: 7.0.100
 - name: REQUIRED_XCODE
   value: 14.2.0
 - name: DEVICETESTS_REQUIRED_XCODE
@@ -40,11 +40,11 @@ variables:
 - name: skipProvisionator
   value: $[ne(variables['provisioning'], 'true')]
 - name: provisionator.xcode
-  value: '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
+  value: 'eng/provisioning/xcode.csx'
 - name: provisionator.path
-  value: '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
+  value: 'eng/provisioning/provisioning.csx'
 - name: provisionator.vs
-  value: '$(System.DefaultWorkingDirectory)/eng/provisioning/vs.csx'
+  value: 'eng/provisioning/vs.csx'
 - name: provisionator.extraArguments
   value: '-vvvv'
 - name: DotNet.Dir

@@ -7,6 +7,8 @@
     <RootNamespace>Microsoft.Maui.MauiBlazorWebView.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.MauiBlazorWebView.DeviceTests</AssemblyName>
     <NoWarn>$(NoWarn),CA1416</NoWarn>
+    <!-- Disable multi-RID builds to workaround a parallel build issue -->
+    <RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
   </PropertyGroup>
 
   <PropertyGroup>

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.10" />
+    <PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.11" />
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
   </ItemGroup>
 

@@ -49,7 +49,9 @@ protected override void Init()
 	}
 
 	[Preserve(AllMembers = true)]
+#pragma warning disable CA1815 // Override equals and operator equals on value types
 	public struct Issue8958Model
+#pragma warning restore CA1815 // Override equals and operator equals on value types
 	{
 		public string Title { get; set; }
 	}

@@ -65,7 +65,9 @@ Button MenuButton(TestPoint test)
 		}
 
 		[Preserve(AllMembers = true)]
+#pragma warning disable CA1815 // Override equals and operator equals on value types
 		public struct TestPoint
+#pragma warning restore CA1815 // Override equals and operator equals on value types
 		{
 			public TestPoint(int i) : this()
 			{

@@ -26,7 +26,9 @@ public enum ActivationFlags : long
 		DisableSetStatusBarColor = 1 << 0,
 	}
 
+#pragma warning disable CA1815 // Override equals and operator equals on value types
 	public struct ActivationOptions
+#pragma warning restore CA1815 // Override equals and operator equals on value types
 	{
 		public ActivationOptions(Bundle bundle)
 		{