From 931321998f0abba85f90eac410fd631c96b1061c Mon Sep 17 00:00:00 2001
From: Egor Chesakov <5292656+echesakovMSFT@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:15:30 -0700
Subject: [PATCH 1/5] Update URLs to the Clang+LLVM tarballs on GitHub in
 eng/download-llvm-release.py

---
 eng/download-llvm-release.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/download-llvm-release.py b/eng/download-llvm-release.py
index fd26ecaa..78fbac96 100755
--- a/eng/download-llvm-release.py
+++ b/eng/download-llvm-release.py
@@ -12,9 +12,9 @@
 from urllib.error import URLError, HTTPError
 
 Release_urls = {
-  'llvmorg-13.0.0': {
-      'linux': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz',
-      'macos': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-apple-darwin.tar.xz'
+  'llvmorg-13.0.1': {
+      'linux': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang+llvm-13.0.1-x86_64-linux-gnu-ubuntu-18.04.tar.xz',
+      'macos': 'https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang+llvm-13.0.1-x86_64-apple-darwin.tar.xz'
   }
 }
 

From 0830a99f95833eb657e944d87fa3000f18ef114a Mon Sep 17 00:00:00 2001
From: Egor Chesakov <5292656+echesakovMSFT@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:16:18 -0700
Subject: [PATCH 2/5] Update LLVM version as used in coredistools build
 pipeline in coredistools.yml

---
 coredistools.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coredistools.yml b/coredistools.yml
index e5faa0b8..9a190c61 100644
--- a/coredistools.yml
+++ b/coredistools.yml
@@ -36,7 +36,7 @@ resources:
 variables:
   LLVMRepositoryUri: https://github.com/llvm/llvm-project.git
   LLVMSourceBundle: llvm-project.bundle
-  LLVMSourceVersion: llvmorg-13.0.0
+  LLVMSourceVersion: llvmorg-13.0.1
 
 jobs:
 - job: checkout_llvm

From 6fc03799630b64b0a185f84629cc9f827f95927b Mon Sep 17 00:00:00 2001
From: Egor Chesakov <5292656+echesakovMSFT@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:19:05 -0700
Subject: [PATCH 3/5] Use Visual Studio 2022 for building coredistools in
 build-coredistools.cmd

---
 build-coredistools.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-coredistools.cmd b/build-coredistools.cmd
index 844c3af5..613ba6d4 100644
--- a/build-coredistools.cmd
+++ b/build-coredistools.cmd
@@ -53,7 +53,7 @@ if not exist "%BinariesDirectory%" (
 pushd "%BinariesDirectory%"
 
 cmake.exe ^
-    -G "Visual Studio 16 2019" ^
+    -G "Visual Studio 17 2022" ^
     -A %GeneratorPlatform% ^
     -DCMAKE_INSTALL_PREFIX="%StagingDirectory%" ^
     -DLLVM_DEFAULT_TARGET_TRIPLE=%LLVMDefaultTargetTriple% ^

From 9542011569c143c66d979a9e34833738797ec674 Mon Sep 17 00:00:00 2001
From: Egor Chesakov <5292656+echesakovMSFT@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:34:03 -0700
Subject: [PATCH 4/5] Update Ubuntu containers to use 18.04 in coredistools.yml

---
 coredistools.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/coredistools.yml b/coredistools.yml
index 9a190c61..776a6646 100644
--- a/coredistools.yml
+++ b/coredistools.yml
@@ -28,10 +28,10 @@ trigger:
 
 resources:
   containers:
-  - container: ubuntu-16.04-arm
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-20210719121212-8a8d3be
-  - container: ubuntu-16.04-arm64
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
+  - container: ubuntu-18.04-arm
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-20220312201346-b9de666
+  - container: ubuntu-18.04-arm64
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-20220312201346-b2c2436
 
 variables:
   LLVMRepositoryUri: https://github.com/llvm/llvm-project.git
@@ -73,12 +73,12 @@ jobs:
   strategy:
     matrix:
       arm:
-        ContainerImage: ubuntu-16.04-arm
+        ContainerImage: ubuntu-18.04-arm
         CrossRootfsDirectory: /crossrootfs/arm
         TargetOSArchitecture: linux-arm
 
       arm64:
-        ContainerImage: ubuntu-16.04-arm64
+        ContainerImage: ubuntu-18.04-arm64
         CrossRootfsDirectory: /crossrootfs/arm64
         TargetOSArchitecture: linux-arm64
 

From e38b7b3f0cfa758590cc7dd16f9ba9af824f8e67 Mon Sep 17 00:00:00 2001
From: Egor Chesakov <5292656+echesakovMSFT@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:45:45 -0700
Subject: [PATCH 5/5] Use Visual Studio 2022 for building llvm-tblgen in
 build-tblgen.cmd

---
 build-tblgen.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tblgen.cmd b/build-tblgen.cmd
index 1a9fa595..fd8e85b9 100644
--- a/build-tblgen.cmd
+++ b/build-tblgen.cmd
@@ -20,7 +20,7 @@ if not exist "%BinariesDirectory%" (
 pushd "%BinariesDirectory%"
 
 cmake.exe ^
-    -G "Visual Studio 16 2019" ^
+    -G "Visual Studio 17 2022" ^
     -DCMAKE_INSTALL_PREFIX="%RootDirectory%\" ^
     -DLLVM_TARGETS_TO_BUILD=AArch64;ARM;X86 ^
     "%SourcesDirectory%\llvm-project\llvm"