diff --git a/desktop_photo_search/codelab_rebuild.yaml b/desktop_photo_search/codelab_rebuild.yaml
index 9a5673056..1c19500af 100644
--- a/desktop_photo_search/codelab_rebuild.yaml
+++ b/desktop_photo_search/codelab_rebuild.yaml
@@ -12,38 +12,38 @@ steps:
     flutter: create --platforms windows,linux,macos --project-name desktop_photo_search .
   - name: Replace fluent_ui/macos/Runner/DebugProfile.entitlements
     path: fluent_ui/macos/Runner/DebugProfile.entitlements
-    replace-contents:
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-      <plist version="1.0">
-      <dict>
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <key>com.apple.security.cs.allow-jit</key>
-        <true/>
-        <key>com.apple.security.files.user-selected.read-write</key>
-        <true/>
-        <key>com.apple.security.network.client</key>
-        <true/>
-        <key>com.apple.security.network.server</key>
-        <true/>
-      </dict>
-      </plist>
+    patch-u: |
+      --- b/desktop_photo_search/fluent_ui/macos/Runner/DebugProfile.entitlements
+      +++ a/desktop_photo_search/fluent_ui/macos/Runner/DebugProfile.entitlements
+      @@ -6,6 +6,10 @@
+       	<true/>
+       	<key>com.apple.security.cs.allow-jit</key>
+       	<true/>
+      +	<key>com.apple.security.files.user-selected.read-write</key>
+      +	<true/>
+      +	<key>com.apple.security.network.client</key>
+      +	<true/>
+       	<key>com.apple.security.network.server</key>
+       	<true/>
+       </dict>
   - name: Patch fluent_ui/macos/Runner/Release.entitlements
     path: fluent_ui/macos/Runner/Release.entitlements
-    replace-contents:
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-      <plist version="1.0">
-      <dict>
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <key>com.apple.security.files.user-selected.read-write</key>
-        <true/>
-        <key>com.apple.security.network.client</key>
-        <true/>
-      </dict>
-      </plist>
+    patch-u: |
+      --- b/desktop_photo_search/fluent_ui/macos/Runner/Release.entitlements
+      +++ a/desktop_photo_search/fluent_ui/macos/Runner/Release.entitlements
+      @@ -4,5 +4,9 @@
+       <dict>
+       	<key>com.apple.security.app-sandbox</key>
+       	<true/>
+      +	<key>com.apple.security.files.user-selected.read-write</key>
+      +	<true/>
+      +	<key>com.apple.security.network.client</key>
+      +	<true/>
+       </dict>
+       </plist>
+  - name: Flutter upgrade
+    path: fluent_ui
+    flutter: pub upgrade --major-versions
   - name: Flutter build macOS
     path: fluent_ui
     flutter: build macos
@@ -58,41 +58,38 @@ steps:
     flutter: create --platforms windows,linux,macos --project-name desktop_photo_search .
   - name: Replace material/macos/Runner/DebugProfile.entitlements
     path: material/macos/Runner/DebugProfile.entitlements
-    replace-contents:
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-      <plist version="1.0">
-      <dict>
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <key>com.apple.security.cs.allow-jit</key>
-        <true/>
-        <key>com.apple.security.files.user-selected.read-write</key>
-        <true/>
-        <key>com.apple.security.network.client</key>
-        <true/>
-        <key>com.apple.security.network.server</key>
-        <true/>
-      </dict>
-      </plist>
+    patch-u: |
+      --- b/desktop_photo_search/material/macos/Runner/DebugProfile.entitlements
+      +++ a/desktop_photo_search/material/macos/Runner/DebugProfile.entitlements
+      @@ -6,6 +6,10 @@
+       	<true/>
+       	<key>com.apple.security.cs.allow-jit</key>
+       	<true/>
+      +	<key>com.apple.security.files.user-selected.read-write</key>
+      +	<true/>
+      +	<key>com.apple.security.network.client</key>
+      +	<true/>
+       	<key>com.apple.security.network.server</key>
+       	<true/>
+       </dict>
   - name: Replace material/macos/Runner/Release.entitlements
     path: material/macos/Runner/Release.entitlements
-    replace-contents:
-      <?xml version="1.0" encoding="UTF-8"?>
-      <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-      <plist version="1.0">
-      <dict>
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <key>com.apple.security.files.user-selected.read-write</key>
-        <true/>
-        <key>com.apple.security.network.client</key>
-        <true/>
-      </dict>
-      </plist>
+    patch-u: |
+      --- b/desktop_photo_search/material/macos/Runner/Release.entitlements
+      +++ a/desktop_photo_search/material/macos/Runner/Release.entitlements
+      @@ -4,5 +4,9 @@
+       <dict>
+       	<key>com.apple.security.app-sandbox</key>
+       	<true/>
+      +	<key>com.apple.security.files.user-selected.read-write</key>
+      +	<true/>
+      +	<key>com.apple.security.network.client</key>
+      +	<true/>
+       </dict>
+       </plist>
   - name: Patch material/macos/Runner/Base.lproj/MainMenu.xib
     path: material/macos/Runner/Base.lproj/MainMenu.xib
-    patch-u:
+    patch-u: |
       --- b/desktop_photo_search/material/macos/Runner/Base.lproj/MainMenu.xib
       +++ a/desktop_photo_search/material/macos/Runner/Base.lproj/MainMenu.xib
       @@ -330,10 +330,11 @@
@@ -109,7 +106,10 @@ steps:
       +            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1025"/>
                    <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
                        <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
-                       <autoresizingMask key="autoresizingMask"/>      
+                       <autoresizingMask key="autoresizingMask"/>
+  - name: Flutter upgrade
+    path: material
+    flutter: pub upgrade --major-versions
   - name: Flutter build macOS
     path: material
     flutter: build macos