From e36ca65c7bc6d270351d1358033f38018e0996be Mon Sep 17 00:00:00 2001
From: Chris Bracken <chris@bracken.jp>
Date: Thu, 6 May 2021 18:04:37 -0700
Subject: [PATCH] Add dependency on Windows SDK CIPD package

We now build against a specific Windows SDK rather than whatever happens
to be installed on the host machine.

This also rolls the buildroot to include change
https://github.com/flutter/buildroot/pull/448, which generates the WinRT
headers from the CIPD Windows SDK.

This also rolls an updated version of cppwinrt that includes supports
for long paths.

This also re-enables the UWP builder.
---
 DEPS                      | 15 +++++++++++++--
 ci/dev/prod_builders.json |  4 ++++
 ci/dev/try_builders.json  |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/DEPS b/DEPS
index 925591f4bdbde..1eb2798e41f68 100644
--- a/DEPS
+++ b/DEPS
@@ -96,7 +96,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7137efc8964bd91fa13e69af2cd3d1e13007d065',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '3a3422d5f3b2c3ff237d855a6906d6d7533e4af4',
 
    # Fuchsia compatibility
    #
@@ -554,12 +554,23 @@ deps = {
      'dep_type': 'cipd',
    },
 
+  # Windows SDK
+  'src/third_party/windows_sdk': {
+    'packages': [
+      {
+        'package': 'flutter/windows/windows-sdk',
+        'version': 'build:10.0.19041.0'
+      }
+    ],
+    'condition': 'download_windows_deps',
+    'dep_type': 'cipd',
+  },
   # CppWinRT tooling for UWP builds
   'src/third_party/cppwinrt': {
     'packages': [
       {
         'package': 'flutter/cppwinrt/win-amd64',
-        'version': 'build:2.0.210304.5'
+        'version': 'build:2.0.210505.3'
       }
     ],
     'condition': 'download_windows_deps',
diff --git a/ci/dev/prod_builders.json b/ci/dev/prod_builders.json
index 50f098abbdddf..f9d4d074d59af 100644
--- a/ci/dev/prod_builders.json
+++ b/ci/dev/prod_builders.json
@@ -68,6 +68,10 @@
          "name":"Windows Host Engine",
          "repo":"engine"
       },
+      {
+         "name":"Windows UWP Engine",
+         "repo":"engine"
+      },
       {
          "name":"Windows Web Engine",
          "repo":"engine"
diff --git a/ci/dev/try_builders.json b/ci/dev/try_builders.json
index 3c65e9475f924..f40e61da384eb 100644
--- a/ci/dev/try_builders.json
+++ b/ci/dev/try_builders.json
@@ -110,7 +110,7 @@
       {
          "name":"Windows UWP Engine",
          "repo":"engine",
-         "enabled": false
+         "enabled": true
       },
       {
          "name":"Windows Web Engine",