Patch Tuesday September 2023 + arm-uwp=>arm64-uwp (microsoft#33759)

Co-authored-by: Leander Schulten <[email protected]>
jozefizso · Sep 15, 2023 · b5d4a46 · b5d4a46
1 parent d99b693
commit b5d4a46
Show file tree

Hide file tree

Showing 7 changed files with 123 additions and 121 deletions.
diff --git a/scripts/Get-Changelog.ps1 b/scripts/Get-Changelog.ps1
@@ -414,7 +414,7 @@ vcpkg ($($StartDate.ToString('yyyy.MM.dd')) - $((($EndDate).AddSeconds(-1)).ToSt
 |x64-windows-static-md|NUM|
 |x64-uwp|NUM|
 |arm64-windows|NUM|
-|arm-uwp|NUM|
+|arm64-uwp|NUM|
 |**x64-osx**|NUM|
 |**x64-linux**|NUM|
 

diff --git a/scripts/azure-pipelines/android/create-docker-image.ps1 b/scripts/azure-pipelines/android/create-docker-image.ps1
@@ -16,17 +16,22 @@ $registry = Get-AzContainerRegistry -ResourceGroupName $ResourceGroupName -Name
 Connect-AzContainerRegistry -Name $registry.Name
 
 $imageName = "vcpkg-android"
-docker build . -t $imageName
-
-$remote = [string]::Format('andcontainerregistry.azurecr.io/{0}:{1}', $imageName, $Date)
-docker tag $imageName $remote
-
-docker push $remote
-
-#removes from local environment
-docker rmi --force $remote $imageName
-
-# pulls and runs ...
-docker logout
+Push-Location $PSScriptRoot
+try {
+    docker build . -t $imageName
+
+    $remote = [string]::Format('andcontainerregistry.azurecr.io/{0}:{1}', $imageName, $Date)
+    docker tag $imageName $remote
+
+    docker push $remote
+
+    #removes from local environment
+    docker rmi --force $remote $imageName
+
+    # pulls and runs ...
+    docker logout
+} finally {
+    Pop-Location
+}
 
 Write-Host "Remote: $remote"
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
@@ -4,9 +4,9 @@
 variables:
   android-pool: 'PrAnd-1ES-Pool'
   linux-pool: 'PrLin-1ES-Pool'
-  windows-pool: 'PrWin-2023-08-09'
+  windows-pool: 'PrWin-2023-09-13'
   osx-pool: 'PrOsx-2023-09-11'
-  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20'
+  linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-09-13'
 
 parameters:
   - name: vcpkgToolSha
@@ -69,8 +69,8 @@ jobs:
 
 - template: windows/azure-pipelines.yml
   parameters:
-    triplet: arm-uwp
-    jobName: arm_uwp
+    triplet: arm64-uwp
+    jobName: arm64_uwp
     poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}

diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
@@ -9,15 +9,13 @@ $VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/release/vs_enterprise.exe'
 $Workloads = @(
   'Microsoft.VisualStudio.Workload.NativeDesktop',
   'Microsoft.VisualStudio.Workload.Universal',
+  'Microsoft.VisualStudio.Component.UWP.VC.ARM64',
   'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
-  'Microsoft.VisualStudio.Component.VC.Tools.ARM',
   'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
   'Microsoft.VisualStudio.Component.VC.ASAN',
   'Microsoft.VisualStudio.Component.VC.ATL',
   'Microsoft.VisualStudio.Component.VC.ATLMFC',
-  'Microsoft.VisualStudio.Component.VC.ATL.ARM',
   'Microsoft.VisualStudio.Component.VC.ATL.ARM64',
-  'Microsoft.VisualStudio.Component.VC.MFC.ARM',
   'Microsoft.VisualStudio.Component.VC.MFC.ARM64',
   "Microsoft.VisualStudio.Component.Windows11SDK.22621",
   "Microsoft.VisualStudio.Component.Windows10SDK.20348",