Google Git
Sign in
bazel/tulsi/refs/heads/master^!/.
commit
c1d5d72478056c76c6f523ef1d64bf322235346e
[log]
author
ivanhernandez <ivanhernandez@google.com>
Fri Jun 26 10:05:16 2020 -0400
committer
David Goldman <davg@google.com>
Mon Jun 29 15:52:46 2020 -0400
tree
52f75ef9e23c35a45efed0ef9ff8cc8f2b080d68
parent
31677e18de1a0ea4a6ab9eadeb8036d726b7cbfb [diff]
Update Tulsi to Xcode 11.5.

PiperOrigin-RevId: 318465055

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index cdde891..c25b3bb 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml

@@ -1,7 +1,7 @@
 ---
 platforms:
   macos:
-    xcode_version: "11.3"
+    xcode_version: "11.5"
     bazel: last_downstream_green
     build_targets:
     - "//:tulsi"

diff --git a/.travis.yml b/.travis.yml
index e8b7dc3..d8df97c 100644
--- a/.travis.yml
+++ b/.travis.yml

@@ -1,7 +1,7 @@
 os: osx
 language: swift
 # macOS images: https://docs.travis-ci.com/user/reference/osx#macos-version
-osx_image: xcode11.3
+osx_image: xcode11.5
 
 before_install:
   - brew tap bazelbuild/tap

diff --git a/README.md b/README.md
index b04e6e3..fe17c1b 100644
--- a/README.md
+++ b/README.md

@@ -13,7 +13,7 @@
 
 * `-b`: Bazel binary that Tulsi should use to build and install the app (Default is `bazel`)
 * `-d`: The folder where to install the Tulsi app into (Default is `$HOME/Applications`)
-* `-x`: The Xcode version Tulsi should be built for (Default is `11.3.1`)
+* `-x`: The Xcode version Tulsi should be built for (Default is `11.5`)
 
 
 ## Notes

diff --git a/build_and_run.sh b/build_and_run.sh
index c208db1..ed36ad4 100755
--- a/build_and_run.sh
+++ b/build_and_run.sh

@@ -23,7 +23,7 @@
 
 unzip_dir="$HOME/Applications"
 bazel_path="bazel"
-xcode_version="11.3.1"
+xcode_version="11.5"
 
 while getopts ":b:d:x:h" opt; do
   case ${opt} in

diff --git a/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift b/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift
index 6badfff..8ce2d91 100644
--- a/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift
+++ b/src/TulsiGeneratorIntegrationTests/BazelIntegrationTestCase.swift

@@ -89,7 +89,7 @@
 
     // Explicitly set Xcode version to use. Must use the same version or the golden files
     // won't match.
-    bazelBuildOptions.append("--xcode_version=11.3.1")
+    bazelBuildOptions.append("--xcode_version=11.5")
 
     // Disable the Swift worker as it adds extra dependencies.
     bazelBuildOptions.append("--define=RULES_SWIFT_BUILD_DUMMY_WORKER=1")

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
index 9b73baf..80ff745 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/ComplexSingleProject.xcodeproj/project.pbxproj

@@ -930,7 +930,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -955,7 +955,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -1021,7 +1021,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -1042,7 +1042,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -1059,7 +1059,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -1112,7 +1112,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -1224,7 +1224,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -1241,7 +1241,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -1294,7 +1294,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -1413,7 +1413,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1438,7 +1438,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1504,7 +1504,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_complex;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
index 0a2c41e..6d0c1f9 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSProject.xcodeproj/project.pbxproj

@@ -467,7 +467,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -492,7 +492,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -517,7 +517,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -570,7 +570,7 @@
 				PRODUCT_NAME = MyCommandLineApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -587,7 +587,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -604,7 +604,7 @@
 				PRODUCT_NAME = MyTodayExtension;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -669,7 +669,7 @@
 				PRODUCT_NAME = MyCommandLineApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -686,7 +686,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -703,7 +703,7 @@
 				PRODUCT_NAME = MyTodayExtension;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -781,7 +781,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -806,7 +806,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -831,7 +831,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
index 50f666b..e1a2d81 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MacOSTestsProject.xcodeproj/project.pbxproj

@@ -587,7 +587,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -612,7 +612,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -640,7 +640,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -707,7 +707,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -726,7 +726,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -743,7 +743,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -763,7 +763,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -817,7 +817,7 @@
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -848,7 +848,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -865,7 +865,7 @@
 				PRODUCT_NAME = MyMacOSApp;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -885,7 +885,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -939,7 +939,7 @@
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -978,7 +978,7 @@
 				TEST_TARGET_NAME = MyMacOSApp;
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1003,7 +1003,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1031,7 +1031,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MyMacOSApp.app/Contents/MacOS/MyMacOSApp";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1098,7 +1098,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_mac;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
index 7972ff0..c5b0088 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/MultiExtensionProject.xcodeproj/project.pbxproj

@@ -347,7 +347,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -372,7 +372,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -397,7 +397,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -450,7 +450,7 @@
 				PRODUCT_NAME = ApplicationOne;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -467,7 +467,7 @@
 				PRODUCT_NAME = ApplicationTwo;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -484,7 +484,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -537,7 +537,7 @@
 				PRODUCT_NAME = ApplicationOne;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -554,7 +554,7 @@
 				PRODUCT_NAME = ApplicationTwo;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -571,7 +571,7 @@
 				PRODUCT_NAME = TodayExtension;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -637,7 +637,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -662,7 +662,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -687,7 +687,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_multi_extension;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
index 9e9c6ef..cf78064 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleCCProject.xcodeproj/project.pbxproj

@@ -327,7 +327,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -405,7 +405,7 @@
 				PRODUCT_NAME = ccBinary;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -483,7 +483,7 @@
 				PRODUCT_NAME = ccBinary;
 				SDKROOT = macosx;
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -548,7 +548,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_ccsimple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
index ddedc63..2de0e13 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SimpleProject.xcodeproj/project.pbxproj

@@ -549,7 +549,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -574,7 +574,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -640,7 +640,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -660,7 +660,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -677,7 +677,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -730,7 +730,7 @@
 				PRODUCT_NAME = TargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -777,7 +777,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -794,7 +794,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -847,7 +847,7 @@
 				PRODUCT_NAME = TargetApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -902,7 +902,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Application.app/Application";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -927,7 +927,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -993,7 +993,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_simple;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
index 7ffa411..313744d 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SkylarkBundlingProject.xcodeproj/project.pbxproj

@@ -360,7 +360,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -385,7 +385,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -451,7 +451,7 @@
 				PRODUCT_NAME = tvOSApplication;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Debug;
@@ -468,7 +468,7 @@
 				PRODUCT_NAME = tvOSExtension;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Debug;
@@ -534,7 +534,7 @@
 				PRODUCT_NAME = tvOSApplication;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Release;
@@ -551,7 +551,7 @@
 				PRODUCT_NAME = tvOSExtension;
 				SDKROOT = appletvos;
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = Release;
@@ -617,7 +617,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -642,7 +642,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_tvos_project;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
 			name = __TulsiTestRunner_Debug;

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
index 0e09e04..c9b1f5f 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/SwiftProject.xcodeproj/project.pbxproj

@@ -404,7 +404,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -458,7 +458,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -554,7 +554,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -663,7 +663,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_swift;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
index 9ef4167..5735120 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteExplicitXCTestsProject.xcodeproj/project.pbxproj

@@ -623,7 +623,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -648,7 +648,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -676,7 +676,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -704,7 +704,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -771,7 +771,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -791,7 +791,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -808,7 +808,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -828,7 +828,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -848,7 +848,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -902,7 +902,7 @@
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -934,7 +934,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -951,7 +951,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -971,7 +971,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -991,7 +991,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -1045,7 +1045,7 @@
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -1085,7 +1085,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1110,7 +1110,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1138,7 +1138,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1166,7 +1166,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Two;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1233,7 +1233,7 @@
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite/One;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
index 170309d..14e953e 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteLocalTaggedTestsProject.xcodeproj/project.pbxproj

@@ -356,7 +356,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -381,7 +381,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -442,7 +442,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -459,7 +459,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -527,7 +527,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -544,7 +544,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -620,7 +620,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -645,7 +645,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
index 7dda3fe..d2a82a7 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/TestSuiteRecursiveTestSuiteProject.xcodeproj/project.pbxproj

@@ -524,7 +524,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -549,7 +549,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -577,7 +577,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -605,7 +605,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -666,7 +666,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -683,7 +683,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -703,7 +703,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -723,7 +723,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -791,7 +791,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -808,7 +808,7 @@
 				PRODUCT_NAME = TestApplication;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -828,7 +828,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -848,7 +848,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -924,7 +924,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -949,7 +949,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = TestSuite;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -977,7 +977,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite/Three;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -1005,7 +1005,7 @@
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TestApplication.app/TestApplication";
 				TULSI_BUILD_PATH = TestSuite;
 				TULSI_TEST_RUNNER_ONLY = YES;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};

diff --git a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
index 7f14806..0392b84 100644
--- a/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj
+++ b/src/TulsiGeneratorIntegrationTests/Resources/GoldenProjects/WatchProject.xcodeproj/project.pbxproj

@@ -488,7 +488,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Release;
 		};
@@ -512,7 +512,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -537,7 +537,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Release;
@@ -591,7 +591,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Debug;
 		};
@@ -607,7 +607,7 @@
 				PRODUCT_NAME = WatchApplication;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
@@ -624,7 +624,7 @@
 				PRODUCT_NAME = WatchExtension;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Debug;
@@ -702,7 +702,7 @@
 				PRODUCT_NAME = Application;
 				SDKROOT = iphoneos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = Release;
 		};
@@ -718,7 +718,7 @@
 				PRODUCT_NAME = WatchApplication;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
@@ -735,7 +735,7 @@
 				PRODUCT_NAME = WatchExtension;
 				SDKROOT = watchos;
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = Release;
@@ -826,7 +826,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 			};
 			name = __TulsiTestRunner_Debug;
 		};
@@ -850,7 +850,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Debug;
@@ -875,7 +875,7 @@
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(PRODUCT_NAME).h";
 				TULSI_BUILD_PATH = tulsi_e2e_watch;
-				TULSI_XCODE_VERSION = 11.3.1.11C505;
+				TULSI_XCODE_VERSION = 11.5.0.11E608c;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
 			name = __TulsiTestRunner_Debug;

diff --git a/src/TulsiGeneratorIntegrationTests/update_goldens.sh b/src/TulsiGeneratorIntegrationTests/update_goldens.sh
index e836e9d..5820daf 100755
--- a/src/TulsiGeneratorIntegrationTests/update_goldens.sh
+++ b/src/TulsiGeneratorIntegrationTests/update_goldens.sh

@@ -17,7 +17,7 @@
 
 # Update this whenever the version of Xcode needed to generate the goldens
 # changes.
-readonly XCODE_VERSION=11.3.1
+readonly XCODE_VERSION=11.5
 
 readonly WORKSPACE=$(bazel info workspace)
 readonly TEST_PATH="src/TulsiGeneratorIntegrationTests"