Skip to content

Commit 8768345

Browse files
Flanker32Flanker32
committed
Merge branch 'develop.next' into develop.eap
2 parents c15e928 + e4764b8 commit 8768345

File tree

69 files changed

+4072
-151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4072
-151
lines changed

‎.azure-pipelines/sign-for-dev-release.yml‎

Lines changed: 67 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ extends:
1919
name: 1ES_JavaTooling_Pool
2020
image: 1ES_JavaTooling_Ubuntu-2004
2121
os: linux
22+
timeoutInMinutes: 360
2223
sdl:
2324
sourceAnalysisPool:
2425
name: 1ES_JavaTooling_Pool
@@ -31,21 +32,40 @@ extends:
3132
jobs:
3233
- job: Job_1
3334
displayName: Build and Sign Azure Plugin for IntelliJ
35+
timeoutInMinutes: 360
3436
templateContext:
3537
outputs:
3638
- output: pipelineArtifact
3739
artifactName: drop
38-
targetPath: $(build.artifactstagingdirectory)
40+
targetPath: $(build.artifactstagingdirectory)/drop
3941
displayName: "Publish Artifact: drop"
4042
steps:
4143
- checkout: self
4244
fetchTags: false
43-
- task: JavaToolInstaller@0
44-
displayName: Use Java 17
45+
- task: Bash@3
46+
displayName: Prepare JDK environment
4547
inputs:
46-
versionSpec: "17"
47-
jdkArchitectureOption: x64
48-
jdkSourceOption: PreInstalled
48+
targetType: inline
49+
script: |
50+
# Create a directory for the JDK
51+
mkdir -p $HOME/java
52+
cd $HOME/java
53+
54+
# Download Adoptium/Temurin JDK 17.0.7
55+
echo "Downloading Java 17.0.7..."
56+
wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
57+
58+
# Extract the archive
59+
echo "Extracting Java 17.0.7..."
60+
tar -xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
61+
rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
62+
63+
# Set JAVA_HOME and add to PATH
64+
export JAVA_HOME=$HOME/java/jdk-17.0.7+7
65+
export PATH=$JAVA_HOME/bin:$PATH
66+
67+
echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME"
68+
echo "##vso[task.setvariable variable=PATH]$PATH"
4969
- task: Bash@3
5070
displayName: Build Toolkit Libs@$(TOOLKIT_BRANCH)
5171
inputs:
@@ -90,54 +110,60 @@ extends:
90110
cp ./PluginsAndFeatures/azure-toolkit-for-intellij/build/distributions/*.zip ./artifacts/intellij/azure-toolkit-for-intellij.zip
91111
unzip ./artifacts/intellij/azure-toolkit-for-intellij.zip -d ./artifacts/intellij/folder
92112
rm ./artifacts/intellij/azure-toolkit-for-intellij.zip
93-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
94-
displayName: Sign IntelliJ
95-
condition: and(succeeded(), ne(variables['DisableCodeSign'], 'true'))
113+
- task: UsePythonVersion@0
114+
displayName: 'Use Python 3.11.x'
115+
inputs:
116+
versionSpec: 3.11.x
117+
- task: UseDotNet@2
118+
displayName: 'Use .NET Core 3.1.x'
96119
inputs:
97-
ConnectedServiceName: 'ESRP-Release-Test'
98-
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
99-
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
100-
AuthAKVName: 'vscjavaci'
101-
AuthCertName: 'vscjava-esrprelease-auth'
102-
AuthSignCertName: 'VSCJava-CodeSign'
103-
FolderPath: artifacts/intellij/folder
104-
Pattern: azure-intellij-*.jar, azure-toolkit-*.jar, azuretools-core-*.jar,azure-explorer-common-*.jar,hdinsight-node-common-*.jar, azure-sdk-reference-book.jar
105-
signConfigType: inlineSignParams
106-
inlineOperation: |-
107-
[
108-
{
109-
"KeyCode" : "$(KEY_CODE)",
110-
"OperationCode" : "JavaSign",
111-
"Parameters" : {
112-
"SigAlg" : "SHA256withRSA",
113-
"Timestamp" : "-tsa http://sha256timestamp.ws.digicert.com/sha256/timestamp"
114-
},
115-
"ToolName" : "sign",
116-
"ToolVersion" : "1.0"
117-
},
118-
{
119-
"KeyCode" : "$(KEY_CODE)",
120-
"OperationCode" : "JavaVerify",
121-
"Parameters" : {},
122-
"ToolName" : "sign",
123-
"ToolVersion" : "1.0"
124-
}
125-
]
120+
packageType: 'sdk'
121+
version: '3.1.x'
122+
- task: MicroBuildSigningPlugin@4
123+
displayName: 'Install Signing Plugin'
124+
inputs:
125+
signType: real
126+
azureSubscription: 'MicroBuild Signing Task (MSEng)'
127+
feedSource: 'https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'
128+
env:
129+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
130+
- task: CmdLine@2
131+
displayName: Sign jars
132+
timeoutInMinutes: 240
133+
inputs:
134+
script: |
135+
ABSOLUTE_PATH="$(pwd)"
136+
# Generate the signing-filelist.xml file
137+
echo '<?xml version="1.0" encoding="utf-8" ?>' > signing-filelist.xml
138+
echo '<filelist>' >> signing-filelist.xml
139+
echo ' <certificate certnumbers="100010171">' >> signing-filelist.xml
140+
141+
find . -type f -name "azure-intellij-*.jar" -o -name "azure-toolkit-ide-*.jar" -o -name "azuretools-core-*.jar" -o -name "azure-explorer-common-*.jar" -o -name "hdinsight-node-common-*.jar" -o -name "azure-sdk-reference-book.jar" | while read -r file; do
142+
clean_file="${file#./}"
143+
abs_path="$ABSOLUTE_PATH/$clean_file"
144+
echo " <file srcpath=\"$abs_path\" dstpath=\"$abs_path\"></file>" >> signing-filelist.xml
145+
done
146+
147+
echo ' </certificate>' >> signing-filelist.xml
148+
echo '</filelist>' >> signing-filelist.xml
149+
150+
dotnet "$MBSIGN_APPFOLDER/DDSignFiles.dll" -- /filelist:signing-filelist.xml
151+
rm signing-filelist.xml
152+
workingDirectory: 'artifacts/intellij/folder/azure-toolkit-for-intellij/lib'
126153
- task: Bash@3
127154
displayName: Repackage
128155
inputs:
129156
targetType: inline
130157
script: |
131158
# Write your commands here
132-
133159
(cd ./artifacts/intellij/folder && zip -r ../../azure-toolkit-for-intellij-$(Build.BuildNumber).zip ./azure-toolkit-for-intellij/)
134160
- task: CopyFiles@2
135161
displayName: "Copy Files to: $(build.artifactstagingdirectory)"
136162
inputs:
137163
SourceFolder: $(system.defaultworkingdirectory)/artifacts
138164
Contents: "*.zip"
139-
TargetFolder: $(build.artifactstagingdirectory)
165+
TargetFolder: $(build.artifactstagingdirectory)/drop
140166
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
141167
displayName: "Manifest Generator "
142168
inputs:
143-
BuildDropPath: $(build.artifactstagingdirectory)
169+
BuildDropPath: $(build.artifactstagingdirectory)/drop

‎.azure-pipelines/sign-for-stable-release.yml‎

Lines changed: 67 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ extends:
1919
name: 1ES_JavaTooling_Pool
2020
image: 1ES_JavaTooling_Ubuntu-2004
2121
os: linux
22+
timeoutInMinutes: 360
2223
sdl:
2324
sourceAnalysisPool:
2425
name: 1ES_JavaTooling_Pool
@@ -31,21 +32,40 @@ extends:
3132
jobs:
3233
- job: Job_1
3334
displayName: Build and Sign Azure Plugin for IntelliJ
35+
timeoutInMinutes: 360
3436
templateContext:
3537
outputs:
3638
- output: pipelineArtifact
3739
artifactName: drop
38-
targetPath: $(build.artifactstagingdirectory)
40+
targetPath: $(build.artifactstagingdirectory)/drop
3941
displayName: "Publish Artifact: drop"
4042
steps:
4143
- checkout: self
4244
fetchTags: false
43-
- task: JavaToolInstaller@0
44-
displayName: Use Java 17
45+
- task: Bash@3
46+
displayName: Prepare JDK environment
4547
inputs:
46-
versionSpec: "17"
47-
jdkArchitectureOption: x64
48-
jdkSourceOption: PreInstalled
48+
targetType: inline
49+
script: |
50+
# Create a directory for the JDK
51+
mkdir -p $HOME/java
52+
cd $HOME/java
53+
54+
# Download Adoptium/Temurin JDK 17.0.7
55+
echo "Downloading Java 17.0.7..."
56+
wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
57+
58+
# Extract the archive
59+
echo "Extracting Java 17.0.7..."
60+
tar -xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
61+
rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
62+
63+
# Set JAVA_HOME and add to PATH
64+
export JAVA_HOME=$HOME/java/jdk-17.0.7+7
65+
export PATH=$JAVA_HOME/bin:$PATH
66+
67+
echo "##vso[task.setvariable variable=JAVA_HOME]$JAVA_HOME"
68+
echo "##vso[task.setvariable variable=PATH]$PATH"
4969
- task: Bash@3
5070
displayName: Build Utils
5171
inputs:
@@ -68,54 +88,60 @@ extends:
6888
6989
unzip ./artifacts/intellij/azure-toolkit-for-intellij.zip -d ./artifacts/intellij/folder
7090
rm ./artifacts/intellij/azure-toolkit-for-intellij.zip
71-
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
72-
displayName: Sign IntelliJ
73-
condition: and(succeeded(), ne(variables['DisableCodeSign'], 'true'))
91+
- task: UsePythonVersion@0
92+
displayName: 'Use Python 3.11.x'
93+
inputs:
94+
versionSpec: 3.11.x
95+
- task: UseDotNet@2
96+
displayName: 'Use .NET Core 3.1.x'
7497
inputs:
75-
ConnectedServiceName: 'ESRP-Release-Test'
76-
AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
77-
AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
78-
AuthAKVName: 'vscjavaci'
79-
AuthCertName: 'vscjava-esrprelease-auth'
80-
AuthSignCertName: 'VSCJava-CodeSign'
81-
FolderPath: artifacts/intellij/folder
82-
Pattern: azure-toolkit-for-intellij.jar, azure-intellij-plugin-*.jar, azure-intellij-resource-connector-*.jar, azure-toolkit-ide-*.jar, azuretools-core-*.jar,azure-explorer-common-*.jar,hdinsight-node-common-*.jar, azure-sdk-reference-book.jar
83-
signConfigType: inlineSignParams
84-
inlineOperation: |-
85-
[
86-
{
87-
"KeyCode" : "$(KEY_CODE)",
88-
"OperationCode" : "JavaSign",
89-
"Parameters" : {
90-
"SigAlg" : "SHA256withRSA",
91-
"Timestamp" : "-tsa http://sha256timestamp.ws.digicert.com/sha256/timestamp"
92-
},
93-
"ToolName" : "sign",
94-
"ToolVersion" : "1.0"
95-
},
96-
{
97-
"KeyCode" : "$(KEY_CODE)",
98-
"OperationCode" : "JavaVerify",
99-
"Parameters" : {},
100-
"ToolName" : "sign",
101-
"ToolVersion" : "1.0"
102-
}
103-
]
98+
packageType: 'sdk'
99+
version: '3.1.x'
100+
- task: MicroBuildSigningPlugin@4
101+
displayName: 'Install Signing Plugin'
102+
inputs:
103+
signType: real
104+
azureSubscription: 'MicroBuild Signing Task (MSEng)'
105+
feedSource: 'https://mseng.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json'
106+
env:
107+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
108+
- task: CmdLine@2
109+
displayName: Sign jars
110+
timeoutInMinutes: 240
111+
inputs:
112+
script: |
113+
ABSOLUTE_PATH="$(pwd)"
114+
# Generate the signing-filelist.xml file
115+
echo '<?xml version="1.0" encoding="utf-8" ?>' > signing-filelist.xml
116+
echo '<filelist>' >> signing-filelist.xml
117+
echo ' <certificate certnumbers="100010171">' >> signing-filelist.xml
118+
119+
find . -type f -name "azure-intellij-*.jar" -o -name "azure-toolkit-ide-*.jar" -o -name "azuretools-core-*.jar" -o -name "azure-explorer-common-*.jar" -o -name "hdinsight-node-common-*.jar" -o -name "azure-sdk-reference-book.jar" | while read -r file; do
120+
clean_file="${file#./}"
121+
abs_path="$ABSOLUTE_PATH/$clean_file"
122+
echo " <file srcpath=\"$abs_path\" dstpath=\"$abs_path\"></file>" >> signing-filelist.xml
123+
done
124+
125+
echo ' </certificate>' >> signing-filelist.xml
126+
echo '</filelist>' >> signing-filelist.xml
127+
128+
dotnet "$MBSIGN_APPFOLDER/DDSignFiles.dll" -- /filelist:signing-filelist.xml
129+
rm signing-filelist.xml
130+
workingDirectory: 'artifacts/intellij/folder/azure-toolkit-for-intellij/lib'
104131
- task: Bash@3
105132
displayName: Repackage
106133
inputs:
107134
targetType: inline
108135
script: |
109136
# Write your commands here
110-
111137
(cd ./artifacts/intellij/folder && zip -r ../../azure-toolkit-for-intellij-$(Build.BuildNumber).zip ./azure-toolkit-for-intellij/)
112138
- task: CopyFiles@2
113139
displayName: "Copy Files to: $(build.artifactstagingdirectory)"
114140
inputs:
115141
SourceFolder: $(system.defaultworkingdirectory)/artifacts
116142
Contents: "*.zip"
117-
TargetFolder: $(build.artifactstagingdirectory)
143+
TargetFolder: $(build.artifactstagingdirectory)/drop
118144
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
119145
displayName: "Manifest Generator "
120146
inputs:
121-
BuildDropPath: $(build.artifactstagingdirectory)
147+
BuildDropPath: $(build.artifactstagingdirectory)/drop

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
44

55
- [Change Log](#change-log)
6+
- [3.95.0](#3950)
7+
- [3.94.0](#3940)
68
- [3.93.0](#3930)
79
- [3.92.0](#3920)
810
- [3.91.0](#3910)
@@ -115,6 +117,10 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
115117
- [3.0.7](#307)
116118
- [3.0.6](#306)
117119

120+
## 3.95.0
121+
- Update function cdn uri
122+
- Integrate rule sets for flagging and making better Azure SDK usage
123+
118124
## 3.94.0
119125
- Fix some known issues.
120126

‎PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<parent>
2828
<groupId>com.microsoft.azuretools</groupId>
2929
<artifactId>utils</artifactId>
30-
<version>3.94.0</version>
30+
<version>3.95.0</version>
3131
</parent>
3232
<groupId>com.microsoft.azuretools</groupId>
3333
<artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -39,9 +39,9 @@
3939
</organization>
4040

4141
<properties>
42-
<azuretool.version>3.94.0</azuretool.version>
42+
<azuretool.version>3.95.0</azuretool.version>
4343
<azuretool.sdk.version>3.32.0.qualifier</azuretool.sdk.version>
44-
<azure.toolkit-lib.version>0.51.0</azure.toolkit-lib.version>
44+
<azure.toolkit-lib.version>0.52.2</azure.toolkit-lib.version>
4545
</properties>
4646
<dependencyManagement>
4747
<dependencies>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ Export-Package: com.microsoft.azuretools.appservice,
4343
com.microsoft.azuretools.appservice.handlers,
4444
com.microsoft.azuretools.appservice.ui
4545
Bundle-ClassPath: .,
46-
target/lib/azure-toolkit-ide-appservice-lib-0.51.0.jar
46+
target/lib/azure-toolkit-ide-appservice-lib-0.52.2.jar

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>com.microsoft.azure</groupId>
1515
<artifactId>azure-toolkit-ide-appservice-lib</artifactId>
16-
<version>0.51.0</version>
16+
<version>0.52.2</version>
1717
</dependency>
1818
</dependencies>
1919
<repositories>

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui,
2323
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
2424
Bundle-ActivationPolicy: lazy
2525
Bundle-ClassPath: .,
26-
target/lib/azure-toolkit-ide-springcloud-lib-0.51.0.jar
26+
target/lib/azure-toolkit-ide-springcloud-lib-0.52.2.jar
2727
Import-Package: com.microsoft.azuretools.core.actions,
2828
org.eclipse.core.expressions,
2929
org.eclipse.jface.text.hyperlink,

‎PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependency>
1414
<groupId>com.microsoft.azure</groupId>
1515
<artifactId>azure-toolkit-ide-springcloud-lib</artifactId>
16-
<version>0.51.0</version>
16+
<version>0.52.2</version>
1717
</dependency>
1818
</dependencies>
1919
<build>

0 commit comments

Comments
 (0)