Skip to content

Commit dfd0c6d

Browse files
weidongxu-microsoftweidongxu-microsoft
authored
eng, sync core, prepare releases for both lib (#3022)
1 parent 8b9bd5e commit dfd0c6d

File tree

22 files changed

+642
-449
lines changed

22 files changed

+642
-449
lines changed

‎azure-dataplane-tests/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
<dependency>
4040
<groupId>com.azure</groupId>
4141
<artifactId>azure-json</artifactId>
42-
<version>1.3.0</version>
42+
<version>1.4.0</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.azure</groupId>
4646
<artifactId>azure-xml</artifactId>
47-
<version>1.1.0</version>
47+
<version>1.2.0</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>com.azure</groupId>
5151
<artifactId>azure-core-http-netty</artifactId>
52-
<version>1.15.7</version>
52+
<version>1.15.8</version>
5353
<scope>test</scope>
5454
</dependency>
5555
<dependency>

‎azure-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
<dependency>
2727
<groupId>com.azure</groupId>
2828
<artifactId>azure-core-management</artifactId>
29-
<version>1.15.6</version>
29+
<version>1.16.0</version>
3030
</dependency>
3131

3232
<dependency>
3333
<groupId>com.azure</groupId>
3434
<artifactId>azure-core-http-netty</artifactId>
35-
<version>1.15.7</version>
35+
<version>1.15.8</version>
3636
<scope>test</scope>
3737
</dependency>
3838

‎core‎

Submodule core updated 1750 files

‎customization-base/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<dependency>
3434
<groupId>com.azure</groupId>
3535
<artifactId>azure-json</artifactId>
36-
<version>1.3.0</version>
36+
<version>1.4.0</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.azure</groupId>
4040
<artifactId>azure-xml</artifactId>
41-
<version>1.1.0</version>
41+
<version>1.2.0</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>com.azure.tools</groupId>

‎customization-base/src/main/resources/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@
3030
<dependency>
3131
<groupId>com.azure</groupId>
3232
<artifactId>azure-json</artifactId>
33-
<version>1.3.0</version>
33+
<version>1.4.0</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>com.azure</groupId>
3737
<artifactId>azure-xml</artifactId>
38-
<version>1.1.0</version>
38+
<version>1.2.0</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>com.azure</groupId>
4242
<artifactId>azure-core</artifactId>
43-
<version>1.54.1</version>
43+
<version>1.55.0</version>
4444
</dependency>
4545
<dependency>
4646
<groupId>com.azure</groupId>
4747
<artifactId>azure-core-http-netty</artifactId>
48-
<version>1.15.7</version>
48+
<version>1.15.8</version>
4949
</dependency>
5050

5151
<!-- Test Dependencies -->
5252
<dependency>
5353
<groupId>com.azure</groupId>
5454
<artifactId>azure-core-test</artifactId>
55-
<version>1.27.0-beta.4</version>
55+
<version>1.27.0-beta.5</version>
5656
<scope>test</scope>
5757
</dependency>
5858
</dependencies>

‎customization-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
<dependency>
3939
<groupId>com.azure</groupId>
4040
<artifactId>azure-core-http-netty</artifactId>
41-
<version>1.15.7</version>
41+
<version>1.15.8</version>
4242
</dependency>
4343

4444
<!-- Test Dependencies -->
4545
<dependency>
4646
<groupId>com.azure</groupId>
4747
<artifactId>azure-core-test</artifactId>
48-
<version>1.27.0-beta.4</version>
48+
<version>1.27.0-beta.5</version>
4949
<scope>test</scope>
5050
</dependency>
5151
</dependencies>

‎eng/sdk/sync_sdk.py‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,21 @@ def parse_args() -> argparse.Namespace:
4747

4848

4949
def update_emitter(package_json_path: str, use_dev_package: bool):
50-
logging.info("Update emitter-package.json")
51-
subprocess.check_call(["tsp-client", "generate-config-files", "--package-json", package_json_path], cwd=sdk_root)
52-
5350
if use_dev_package:
51+
# we cannot use "tsp-client generate-config-files" in dev mode, as this command also updates the lock file
52+
logging.info("Update emitter-package.json")
53+
subprocess.check_call(
54+
[
55+
"pwsh",
56+
"./eng/common/scripts/typespec/New-EmitterPackageJson.ps1",
57+
"-PackageJsonPath",
58+
package_json_path,
59+
"-OutputDirectory",
60+
"eng",
61+
],
62+
cwd=sdk_root,
63+
)
64+
5465
# replace version with path to dev package
5566
dev_package_path = None
5667
typespec_extension_path = os.path.dirname(package_json_path)
@@ -70,8 +81,13 @@ def update_emitter(package_json_path: str, use_dev_package: bool):
7081
else:
7182
logging.error("Failed to locate the dev package.")
7283

73-
logging.info("Update emitter-package-lock.json")
74-
subprocess.check_call(["tsp-client", "generate-lock-file"], cwd=sdk_root)
84+
logging.info("Update emitter-package-lock.json")
85+
subprocess.check_call(["tsp-client", "generate-lock-file"], cwd=sdk_root)
86+
else:
87+
logging.info("Update emitter-package.json and emitter-package-lock.json")
88+
subprocess.check_call(
89+
["tsp-client", "generate-config-files", "--package-json", package_json_path], cwd=sdk_root
90+
)
7591

7692

7793
def get_generated_folder_from_artifact(module_path: str, artifact: str, type: str) -> str:

‎extension-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.azure</groupId>
3131
<artifactId>azure-json</artifactId>
32-
<version>1.3.0</version>
32+
<version>1.4.0</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.yaml</groupId>

‎fluent-tests/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@
9191
<dependency>
9292
<groupId>com.azure</groupId>
9393
<artifactId>azure-core-management</artifactId>
94-
<version>1.15.6</version>
94+
<version>1.16.0</version>
9595
</dependency>
9696

9797
<dependency>
9898
<groupId>com.azure</groupId>
9999
<artifactId>azure-core-test</artifactId>
100-
<version>1.27.0-beta.4</version>
100+
<version>1.27.0-beta.5</version>
101101
<scope>test</scope>
102102
<exclusions>
103103
<exclusion>

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)