Update Bazel on Windows

changelog_begin
changelog_end

ci/patch_bazel_windows/compile.yml

@@ -39,7 +39,7 @@ jobs:
   variables:
     cache_key: $[ dependencies.patch_bazel_pre_check.outputs['out.cache_key'] ]
     should_run: $[ dependencies.patch_bazel_pre_check.outputs['out.should_run'] ]
-    bazel_base_version: 2.1.0
+    bazel_base_version: 3.3.1
   pool:
     vmImage: windows-2019
   steps:

ci/patch_bazel_windows/patch-bazel

@@ -1,8 +1,8 @@
 diff --git a/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html b/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html
-index 87d91de5e6..32f85a9201 100644
+index e665cc4a34..7f8cdf493d 100644
 --- a/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html
 +++ b/src/main/java/com/google/devtools/build/docgen/templates/attributes/common/tags.html
-@@ -88,8 +88,9 @@
+@@ -86,8 +86,9 @@
    <li><code>exclusive</code> keyword will force the test to be run in the
      &quot;exclusive&quot; mode, ensuring that no other tests are running at the
      same time. Such tests will be executed in serial fashion after all build
@@ -15,10 +15,10 @@ index 87d91de5e6..32f85a9201 100644
 
    <li><code>manual</code> keyword will force the test target to not be included in target pattern
 diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java
-index dbbf8274a6..92084b3008 100644
+index 214969c1a8..0de7325853 100644
 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java
 +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestTargetProperties.java
-@@ -88,9 +88,12 @@ public class TestTargetProperties {
+@@ -87,9 +87,12 @@ public class TestTargetProperties {
 
      Map<String, String> executionInfo = Maps.newLinkedHashMap();
      executionInfo.putAll(TargetUtils.getExecutionInfo(rule));
@@ -33,30 +33,30 @@ index dbbf8274a6..92084b3008 100644
      if (executionRequirements != null) {
        // This will overwrite whatever TargetUtils put there, which might be confusing.
 diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
-index 72da2b2f85..72f70bfe58 100644
+index b55046dfe3..5271532d8b 100644
 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
 +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppCompileAction.java
-@@ -993,6 +993,7 @@ public class CppCompileAction extends AbstractAction implements IncludeScannable
-             Sets.newHashSet(ccCompilationContext.getDeclaredIncludeDirs().toList());
+@@ -1031,6 +1031,7 @@ public class CppCompileAction extends AbstractAction implements IncludeScannable
+         looseHdrsDirs = Sets.newHashSet(ccCompilationContext.getLooseHdrsDirs().toList());
        }
-       if (!isDeclaredIn(cppConfiguration, actionExecutionContext, input, declaredIncludeDirs)) {
+       if (!isDeclaredIn(cppConfiguration, actionExecutionContext, input, looseHdrsDirs)) {
 +        System.err.println("DA-DEBUG: isDeclaredIn was false" + input.getExecPath().toString());
          errors.add(input.getExecPath().toString());
        }
      }
 diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/HeaderDiscovery.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/HeaderDiscovery.java
-index 157cd5f36a..fb9dbc723f 100644
+index 013e47d499..761fb2e28c 100644
 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/HeaderDiscovery.java
 +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/HeaderDiscovery.java
-@@ -148,6 +148,7 @@ public class HeaderDiscovery {
-         if (execPath.startsWith(execRoot)) {
-           execPathFragment = execPath.relativeTo(execRoot); // funky but tolerable path
+@@ -154,6 +154,7 @@ public class HeaderDiscovery {
+               LabelConstants.EXPERIMENTAL_EXTERNAL_PATH_PREFIX.getRelative(
+                   execPath.relativeTo(execRoot.getParentDirectory()));
          } else {
 +          System.err.println("DA-DEBUG: Absolute path " + execPathFragment.getPathString() + " outside of execroot " + execRoot);
            problems.add(execPathFragment.getPathString());
            continue;
          }
-@@ -184,6 +185,7 @@ public class HeaderDiscovery {
+@@ -181,6 +182,7 @@ public class HeaderDiscovery {
 
        // Abort if we see files that we can't resolve, likely caused by
        // undeclared includes or illegal include constructs.
@@ -100,11 +100,11 @@ index 5571f5fcde..0c0b113bba 100644
 +  }
  }
 diff --git a/src/test/shell/bazel/remote/remote_execution_test.sh b/src/test/shell/bazel/remote/remote_execution_test.sh
-index 6cd04261a4..bd5415c53c 100755
+index 9d9ff41dfb..4ed6f3c24d 100755
 --- a/src/test/shell/bazel/remote/remote_execution_test.sh
 +++ b/src/test/shell/bazel/remote/remote_execution_test.sh
-@@ -1751,6 +1751,34 @@ EOF
-   expect_log "exceeded deadline"
+@@ -1845,6 +1845,34 @@ EOF
+     @default_foo//:all
  }
 
 +function test_exclusive_tag() {

dev-env/windows/manifests/bazel.json

@@ -1,12 +1,12 @@
 {
   "homepage": "https://bazel.build",
-  "version": "2.1.0",
+  "version": "3.3.1",
   "license": "Apache-2.0",
   "bin": "bazel.exe",
   "architecture": {
     "64bit": {
-      "url": "https://daml-binaries.da-ext.net/patch_bazel_windows/bazel-e0c2de6ef9d4217395705f8b61fda948.zip",
-      "hash": "32fbf1f6bd585562268b1bccc38587f4efeeaec2e2989093556e983879358643"
+      "url": "https://daml-binaries.da-ext.net/patch_bazel_windows/bazel-1dac3221f72f5d22a0b79f0531af1f63.zip",
+      "hash": "fd4d07ca1b684e23fad550f9920feaea19c14c3b2429f636ae81b058bb2ca9c7"
     }
   },
   "depends": [