Skip to content

Commit ef472c0

Browse files
tsp, mgmt, no tag line in readme/changelog/pom, if generated from typespec (#2727)
* do not generate tag line, if no tag * bump to 0.15.15
1 parent 474b25f commit ef472c0

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

eng/sdk/sync_sdk.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,7 @@ def update_emitter(package_json_path: str):
4747
cwd=sdk_root)
4848

4949
logging.info('Update emitter-package-lock.json')
50-
subprocess.check_call([
51-
'pwsh',
52-
'./eng/common/scripts/typespec/New-EmitterPackageLock.ps1',
53-
'-EmitterPackageJsonPath',
54-
'eng/emitter-package.json',
55-
'-OutputDirectory',
56-
'eng'],
57-
cwd=sdk_root)
50+
subprocess.check_call(['tsp-client', '--generate-lock-file'], cwd=sdk_root)
5851

5952

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

fluentgen/src/main/java/com/azure/autorest/fluent/model/projectmodel/FluentProject.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ private String getServiceDescription() {
4040
return String.format("%1$s %2$s %3$s",
4141
simpleDescription,
4242
clientDescription,
43-
tagDescription);
43+
tagDescription).trim();
4444
}
4545

4646
public String getServiceDescriptionForPom() {
4747
return String.format("%1$s %2$s %3$s %4$s",
4848
simpleDescription,
4949
"For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt.",
5050
clientDescription,
51-
tagDescription);
51+
tagDescription).trim();
5252
}
5353

5454
public String getServiceDescriptionForMarkdown() {
@@ -81,7 +81,11 @@ protected FluentProject(String serviceName, String clientDescription) {
8181

8282
this.serviceDescription.simpleDescription = String.format(simpleDescriptionTemplate, serviceName);
8383
this.serviceDescription.clientDescription = clientDescription;
84-
this.serviceDescription.tagDescription = String.format(tagDescriptionTemplate, JavaSettings.getInstance().getAutorestSettings().getTag());
84+
String autorestTag = JavaSettings.getInstance().getAutorestSettings().getTag();
85+
// SDK from TypeSpec does not contain autorest tag.
86+
this.serviceDescription.tagDescription = autorestTag == null
87+
? ""
88+
: String.format(tagDescriptionTemplate, autorestTag);
8589

8690
this.changelog = new Changelog(this);
8791
}

typespec-extension/changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release History
22

3+
## 0.15.15 (2024-04-30)
4+
5+
Compatible with compiler 0.55.
6+
37
## 0.15.14 (2024-04-27)
48

59
Compatible with compiler 0.55.

typespec-extension/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.

typespec-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure-tools/typespec-java",
3-
"version": "0.15.14",
3+
"version": "0.15.15",
44
"description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
55
"keywords": [
66
"TypeSpec"

typespec-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@azure-tools/cadl-ranch-specs": "0.32.0",
13-
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.14.tgz"
13+
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.15.tgz"
1414
},
1515
"devDependencies": {
1616
"@typespec/prettier-plugin-typespec": "~0.55.0",

0 commit comments

Comments
 (0)