Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update package versions and local path dependencies #2247

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Update package versions and local path dependencies #2247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9308a21
Update package versions and local path dependencies
hallipr Feb 26, 2025
f60c6ae
Add dependency script
hallipr Feb 27, 2025
100555f
Fix deps with versions
hallipr Feb 27, 2025
19e5d58
Use crates.io index
hallipr Feb 28, 2025
ebbd785
Sort versions using AzureEngSemanticVersion class
hallipr Feb 28, 2025
b6c6986
fix property names
hallipr Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions sdk/core/azure_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ serde_json.workspace = true
sha2 = { workspace = true, optional = true }
tokio = { workspace = true, optional = true }
tracing.workspace = true
typespec = { path = "../../typespec", features = ["http", "json"] }
typespec_client_core = { path = "../../typespec/typespec_client_core", features = [
typespec = { path = "../../typespec", version = "0.3.0", features = [
"http",
"json",
] }
typespec_client_core = { path = "../../typespec/typespec_client_core", version = "0.2.0", features = [
"http",
"json",
] }
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure_core_amqp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ categories = ["api-bindings"]
edition = "2021"

[dependencies]
azure_core = { path = "../azure_core", default-features = false }
azure_core = { path = "../azure_core", version = "0.23.0", default-features = false }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Versions should only be in the workspace Cargo.toml. I don't want to manager versions across a swatch of files.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anything with a path dependency is unshippable without a version req. We have to choose between:

  1. Path and version in workspace toml
    • Dependency packages will be frozen until dependents ship against workspace version
  2. Path and version in dependents
    • Dependents will be responsible for keeping their version in sync
  3. Path only in dependents
    • Version can be fixed up at release time
    • Will have to solve for tomlyn mangling of toml (either use rust or regex?)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I thought we can put both the path and version in the workspace Cargo.toml. I do not want to keep track of all the versions in the crates' Cargo.tomls. Most other languages use centralized versions/dependencies as well. It's far easier to keep track of and resolve CG alerts, etc.

fe2o3-amqp = { workspace = true, optional = true }
fe2o3-amqp-cbs = { workspace = true, optional = true }
fe2o3-amqp-ext = { workspace = true, optional = true }
Expand All @@ -29,7 +29,7 @@ serde_bytes = { workspace = true, optional = true }
time.workspace = true
tokio.workspace = true
tracing.workspace = true
typespec = { path = "../../typespec", features = ["amqp"] }
typespec = { path = "../../typespec", version = "0.3.0", features = ["amqp"] }
url = { workspace = true }
uuid = { workspace = true }

Expand Down
4 changes: 2 additions & 2 deletions sdk/eventhubs/azure_messaging_eventhubs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ edition = "2021"

[dependencies]
async-stream.workspace = true
azure_core = { path = "../../core/azure_core", default-features = false }
azure_core_amqp.path = "../../core/azure_core_amqp"
azure_core = { path = "../../core/azure_core", version = "0.23.0", default-features = false }
azure_core_amqp = { path = "../../core/azure_core_amqp", version = "0.2.0" }
futures.workspace = true
time.workspace = true
tokio.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/azure_storage_blob/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rust-version.workspace = true
async-trait.workspace = true
azure_core = { workspace = true, features = ["xml"] }
azure_identity = { workspace = true }
azure_storage_common.path = ".."
azure_storage_common = { path = "..", version = "0.1.0" }
serde.workspace = true
time.workspace = true
typespec_client_core = { workspace = true, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion sdk/template/azure_template/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repository.workspace = true
rust-version.workspace = true

[dependencies]
azure_template_core = { path = "../azure_template_core" }
azure_template_core = { path = "../azure_template_core", version = "0.1.0" }

[lints]
workspace = true
4 changes: 2 additions & 2 deletions sdk/typespec/typespec_client_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ serde_json.workspace = true
time.workspace = true
tokio = { workspace = true, optional = true }
tracing.workspace = true
typespec = { path = "..", default-features = false }
typespec_macros = { path = "../typespec_macros", optional = true }
typespec = { path = "..", version = "0.3.0", default-features = false }
typespec_macros = { path = "../typespec_macros", version = "0.2.0", optional = true }
url.workspace = true
uuid.workspace = true

Expand Down
Loading