Merge pull request #10575 from Youssef1313/remove-workaround

ci: Delete workaround for a fixed bug
unoplatform · Nov 26, 2022 · f0f6f13 · f0f6f13
2 parents cf46e30 + fd99316
commit f0f6f13
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 33 deletions.
diff --git a/build/ci/.azure-devops-docs.yml b/build/ci/.azure-devops-docs.yml
@@ -25,7 +25,6 @@ jobs:
 
   - template: templates/gitversion.yml
   - template: templates/jdk-setup.yml
-  - template: templates/update-vs-components.yml
 
   - task: NuGetToolInstaller@0
     inputs:

diff --git a/build/ci/.azure-devops-project-template-tests.yml b/build/ci/.azure-devops-project-template-tests.yml
@@ -21,7 +21,6 @@ jobs:
 
   - template: templates/gitversion.yml
   - template: templates/jdk-setup.yml
-  - template: templates/update-vs-components.yml
 
   - template: templates/install-windows-sdk.yml
     parameters:
@@ -57,7 +56,6 @@ jobs:
   - template: templates/dotnet-install.yml
 
   - template: templates/dotnet7-mobile-install-windows.yml
-  - template: templates/update-vs-components.yml
 
   - template: templates/install-windows-sdk.yml
     parameters:

diff --git a/build/ci/.azure-devops-unit-tests.yml b/build/ci/.azure-devops-unit-tests.yml
@@ -42,7 +42,6 @@ jobs:
   - template: templates/gitversion.yml
   - template: templates/dotnet-install.yml
   - template: templates/jdk-setup.yml
-  - template: templates/update-vs-components.yml
 
   - task: MSBuild@1
     inputs:
@@ -93,13 +92,13 @@ jobs:
     matrix:
       UWP:
         UNO_UWP_BUILD: true
-        XAML_FLAVOR_BUILD: UWP 
+        XAML_FLAVOR_BUILD: UWP
 
       # Disabled as tests explicitly use UWP types.
       # Will be migrated once the whole tree is moved to WinUI
       # WinUI:
       #   UNO_UWP_BUILD: false
-      #   XAML_FLAVOR_BUILD: WinUI 
+      #   XAML_FLAVOR_BUILD: WinUI
 
   variables:
     CombinedConfiguration: Release|Any CPU
@@ -114,17 +113,17 @@ jobs:
 
   - template: templates/dotnet-install.yml
   - template: templates/download-winui-converted-tree.yml
-  
+
   - task: DownloadBuildArtifacts@0
     displayName: Download build artifact
     inputs:
       artifactName: 'NugetPackages-Artifacts-reference'
-      downloadPath: '$(Agent.WorkFolder)' 
+      downloadPath: '$(Agent.WorkFolder)'
 
   - task: ExtractFiles@1
     displayName: Restore binaries structure
     inputs:
-      archiveFilePatterns: '$(Agent.WorkFolder)/NugetPackages-Artifacts*/*-bin-$(XAML_FLAVOR_BUILD).zip' 
+      archiveFilePatterns: '$(Agent.WorkFolder)/NugetPackages-Artifacts*/*-bin-$(XAML_FLAVOR_BUILD).zip'
       destinationFolder: $(build.sourcesdirectory)
       cleanDestinationFolder: false
       overwriteExistingFiles: true

diff --git a/build/ci/templates/update-vs-components.yml b/build/ci/templates/update-vs-components.yml