Merge branch 'master' into spofford/deploy-output

dfinity · Feb 11, 2025 · ae7c3b5 · ae7c3b5
2 parents cef5f92 + 56d78c6
commit ae7c3b5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ candid = "0.10.11"
 candid_parser = "0.1.4"
 dfx-core = { path = "src/dfx-core", version = "0.1.0" }
 ic-agent = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "9ebf6314ce2fcb36772c7d81d6d414b4628d6101" }
-ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.21.0" }
+ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.22.0" }
 ic-cdk = "0.13.1"
 ic-identity-hsm = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "9ebf6314ce2fcb36772c7d81d6d414b4628d6101" }
 ic-utils = { version = "0.39", git = "https://github.com/dfinity/agent-rs", rev = "9ebf6314ce2fcb36772c7d81d6d414b4628d6101" }

diff --git a/src/canisters/frontend/ic-asset/Cargo.toml b/src/canisters/frontend/ic-asset/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ic-asset"
-version = "0.21.0"
+version = "0.22.0"
 authors.workspace = true
 edition.workspace = true
 repository.workspace = true

diff --git a/src/canisters/frontend/icx-asset/Cargo.toml b/src/canisters/frontend/icx-asset/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "icx-asset"
-version = "0.21.0"
+version = "0.22.0"
 authors.workspace = true
 edition.workspace = true
 repository.workspace = true
@@ -15,7 +15,12 @@ keywords = ["internet-computer", "agent", "icp", "dfinity", "asset"]
 anstyle.workspace = true
 anyhow.workspace = true
 candid = { workspace = true }
-clap = { workspace = true, features = ["derive", "cargo", "unstable-styles", "wrap_help" ] }
+clap = { workspace = true, features = [
+    "derive",
+    "cargo",
+    "unstable-styles",
+    "wrap_help",
+] }
 delay = "0.3.1"
 humantime.workspace = true
 ic-agent = { workspace = true }

diff --git a/src/dfx/src/commands/new.rs b/src/dfx/src/commands/new.rs
@@ -855,7 +855,7 @@ fn warn_upgrade(log: &Logger, latest_version: Option<&Version>, current_version:
 
     warn!(
         log,
-        "\nYou are strongly encouraged to upgrade by running 'dfx upgrade'!"
+        "\nYou are strongly encouraged to upgrade by running 'dfxvm update'!"
     );
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         warn!(
             log,
-            "\nYou are strongly encouraged to upgrade by running 'dfx upgrade'!"
+            "\nYou are strongly encouraged to upgrade by running 'dfxvm update'!"
         );
     }
@@ Expand Down @@