Skip to content

Commit bf9f0ee

Browse files
manodnyabmanodnyab
committed
resolve merge conflicts
2 parents 7a8d31a + f9f19d5 commit bf9f0ee

File tree

29 files changed

+168
-84
lines changed

29 files changed

+168
-84
lines changed

‎.changes/3.57.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"date" : "2025-02-28",
3+
"version" : "3.57",
4+
"entries" : [ {
5+
"type" : "bugfix",
6+
"description" : "Fix suggestion not visible in remote for 2024.3"
7+
}, {
8+
"type" : "bugfix",
9+
"description" : "/test: update capability card text"
10+
}, {
11+
"type" : "bugfix",
12+
"description" : "Amazon Q /doc: update workspace too large error message"
13+
}, {
14+
"type" : "bugfix",
15+
"description" : "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
16+
}, {
17+
"type" : "bugfix",
18+
"description" : "/transform: skip running tests locally when user chooses to do so"
19+
} ]
20+
}

‎.changes/next-release/bugfix-3adca794-d149-4f2e-bf7c-6f748f339849.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.changes/next-release/bugfix-8878216c-a256-4459-80de-8334711c8d53.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.changes/next-release/bugfix-ce55123f-2437-4740-b9c8-c1069856e316.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# _3.57_ (2025-02-28)
2+
- **(Bug Fix)** Fix suggestion not visible in remote for 2024.3
3+
- **(Bug Fix)** /test: update capability card text
4+
- **(Bug Fix)** Amazon Q /doc: update workspace too large error message
5+
- **(Bug Fix)** Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message
6+
- **(Bug Fix)** /transform: skip running tests locally when user chooses to do so
7+
18
# _3.56_ (2025-02-20)
29
- **(Feature)** Amazon Q /doc: support making changes to architecture diagrams
310

‎buildspec/linuxUiTests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ phases:
4747
- chmod +x gradlew
4848

4949
- ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:[email protected]:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
50-
- ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:test coverageReport --console plain --info
50+
- ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:uiTest coverageReport --console plain --info
5151

5252
post_build:
5353
commands:

‎buildspec/windowsTests.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work throuh path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

‎buildspec/windowsTestsForAmazonQ.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work through path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

‎buildspec/windowsTestsForCore.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work through path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

‎buildspec/windowsTestsForToolkit.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work through path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

0 commit comments

Comments
 (0)