Revert "Merge main to net8 (#12032)" (#12049)

This reverts commit 5bdbfda.
dotnet · Dec 13, 2022 · 03ee3a0 · 03ee3a0
1 parent 5bdbfda
commit 03ee3a0
Show file tree

Hide file tree

Showing 235 changed files with 43,764 additions and 44,112 deletions.
diff --git a/.github/workflows/maestro-changelog.yml b/.github/workflows/maestro-changelog.yml
diff --git a/docs/design/APIChangeTracking.md b/docs/design/APIChangeTracking.md
diff --git a/eng/PublicAPI.empty.txt b/eng/PublicAPI.empty.txt
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -39,11 +39,11 @@
     <MicrosoftAspNetCoreMetadataPackageVersion>7.0.0</MicrosoftAspNetCoreMetadataPackageVersion>
     <MicrosoftJSInteropPackageVersion>7.0.0</MicrosoftJSInteropPackageVersion>
     <!-- Other packages -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22559.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
-    <_MicrosoftWebWebView2Version>1.0.1462.37</_MicrosoftWebWebView2Version>
+    <_MicrosoftWebWebView2Version>1.0.1418.22</_MicrosoftWebWebView2Version>
     <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
     <!-- must be kept in sync with the binding library version to it here: -->
     <_XamarinAndroidGlideVersion>4.13.2.2</_XamarinAndroidGlideVersion>

diff --git a/eng/automation/vs-workload.template.props b/eng/automation/vs-workload.template.props
@@ -27,7 +27,7 @@
     <ComponentResources Include="maui-maccatalyst"  Version="@VS_COMPONENT_VERSION@" Category=".NET" Title=".NET MAUI SDK for Mac Catalyst" Description=".NET SDK Workload for building MAUI applications that target Mac Catalyst." />
     <ComponentResources Include="maui-ios"          Version="@VS_COMPONENT_VERSION@" Category=".NET" Title=".NET MAUI SDK for iOS" Description=".NET SDK Workload for building MAUI applications that target iOS." />
     <ComponentResources Include="maui-windows"      Version="@VS_COMPONENT_VERSION@" Category=".NET" Title=".NET MAUI SDK for Windows" Description=".NET SDK Workload for building MAUI applications that target Windows." />
-    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.Maui.Manifest*.nupkg" Version="@VS_COMPONENT_VERSION@" SupportsMachineArch="true" />
+    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.Maui.Manifest*.nupkg" Version="@VS_COMPONENT_VERSION@" />
     <MultiTargetPackNames Include="Maui.Sdk;Maui.Templates" />
   </ItemGroup>
 </Project>
diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml
@@ -1,14 +1,16 @@
 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

diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
@@ -1,14 +1,8 @@
 parameters:
   platform : ''
-  poolName: ''
   skipXcode: false
-  skipVS: true
-  skipProvisioning: $(skipProvisionator)
-  provisionatorPath: $(provisionator.path)
-  provisionatorXCodePath: $(provisionator.xcode)
-  provisionatorVSPath: $(provisionator.vs)
+  poolName: ''
   provisionatorChannel: 'latest'
-  provisionatorExtraArguments: $(provisionator.extraArguments)
 
 steps:
   # Prepare macOS
@@ -24,23 +18,24 @@ steps:
     - ${{ if ne(parameters.skipXcode, 'true') }}:
       - task: xamops.azdevex.provisionator-task.provisionator@2
         displayName: 'Provision Xcode'
+        condition: ne(variables['REQUIRED_XCODE'], '')
         inputs:
-          provisioning_script: ${{ parameters.provisionatorXCodePath }}
-          provisioning_extra_args: ${{ parameters.provisionatorExtraArguments }}
+          provisioning_script: $(provisionator.xcode)
+          provisioning_extra_args: $(provisionator.extraArguments)
         env:
           PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
           AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
     # Provision Additional Software
-    - ${{ 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)
+    - 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)
 
     # Setup SDK Paths
     - bash: |
@@ -94,30 +89,30 @@ steps:
           msiexec.exe /package $output /quiet ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 ENABLE_PSREMOTING=1 REGISTER_MANIFEST=1
         }
       displayName: 'Install PowerShell Core'
-    - ${{ 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'
+    - 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')
 
     # Provision Additional Software
-    - ${{ 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)
+    - 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)
 
   # 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/common/variables.yml b/eng/pipelines/common/variables.yml
@@ -37,8 +37,6 @@ 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