Skip to content

Commit 22cbdab

Browse files
author
Rival Abdrakhmanov
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 72fa9b1 + d7d49bc commit 22cbdab

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

‎PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/resources/func-core-tools/cli-feed-v4.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"releases": {
1010
"4.29.0": {
11-
"templates": "https://functionscdn.azureedge.net/public/TemplatesApi/3.1.1648.zip",
11+
"templates": "https://cdn.functions.azure.com/public/TemplatesApi/3.1.1648.zip",
1212
"workerRuntimes": {
1313
"dotnet": {
1414
"net6": {
@@ -187,71 +187,71 @@
187187
{
188188
"OS": "Linux",
189189
"Architecture": "x64",
190-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.linux-x64.4.0.4895.zip",
190+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.linux-x64.4.0.4895.zip",
191191
"sha2": "a83dd3c1f503e884a12c6155ab4a8e235816b5d986c339a3e235a50e8cb7c078",
192192
"size": "full",
193193
"default": "false"
194194
},
195195
{
196196
"OS": "MacOS",
197197
"Architecture": "x64",
198-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.osx-x64.4.0.4895.zip",
198+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.osx-x64.4.0.4895.zip",
199199
"sha2": "0633f46623047b611a811aa068b248e15a2da77ca298f1161aa735b55306004d",
200200
"size": "full",
201201
"default": "false"
202202
},
203203
{
204204
"OS": "MacOS",
205205
"Architecture": "arm64",
206-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.osx-arm64.4.0.4895.zip",
206+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.osx-arm64.4.0.4895.zip",
207207
"sha2": "d180ed7c7e6fe9945fc2881425e5e6ff7944d251d83efe6062ed55b8b3307041",
208208
"size": "full",
209209
"default": "false"
210210
},
211211
{
212212
"OS": "Windows",
213213
"Architecture": "x64",
214-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.min.win-x64.4.0.4895.zip",
214+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.min.win-x64.4.0.4895.zip",
215215
"sha2": "3b76e58091a3f36733d10d21287d5c99f75586d8a8183a525931562423b8a8c9",
216216
"size": "minified",
217217
"default": "false"
218218
},
219219
{
220220
"OS": "Windows",
221221
"Architecture": "x64",
222-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.win-x64.4.0.4895.zip",
222+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.win-x64.4.0.4895.zip",
223223
"sha2": "fd85110c173b1bf7099c3a6c6834fb301f88d2f2ef3361a0b1e046ce4ac56477",
224224
"size": "full",
225225
"default": "false"
226226
},
227227
{
228228
"OS": "Windows",
229229
"Architecture": "x86",
230-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.win-x86.4.0.4895.zip",
230+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.win-x86.4.0.4895.zip",
231231
"sha2": "934c6182ed8888310ec137673b39a33407d1ed2aa94846cba51273fb95ebe280",
232232
"size": "full",
233233
"default": "false"
234234
},
235235
{
236236
"OS": "Windows",
237237
"Architecture": "x86",
238-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.min.win-x86.4.0.4895.zip",
238+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.min.win-x86.4.0.4895.zip",
239239
"sha2": "2a3e2a3ac8d749e1ebfcac3ba948c96edaf7e3a74d65cfdf7bab8cc29f7f8494",
240240
"size": "minified",
241241
"default": "true"
242242
},
243243
{
244244
"OS": "Windows",
245245
"Architecture": "arm64",
246-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.min.win-arm64.4.0.4895.zip",
246+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.min.win-arm64.4.0.4895.zip",
247247
"sha2": "ea9b4c527e0856dde837ebb449e6f78186a283c17e8247404cad2d4797f3ad6f",
248248
"size": "minified",
249249
"default": "false"
250250
},
251251
{
252252
"OS": "Windows",
253253
"Architecture": "arm64",
254-
"downloadLink": "https://functionscdn.azureedge.net/public/4.0.4895/Azure.Functions.Cli.win-arm64.4.0.4895.zip",
254+
"downloadLink": "https://cdn.functions.azure.com/public/4.0.4895/Azure.Functions.Cli.win-arm64.4.0.4895.zip",
255255
"sha2": "1d9b044d5287ed31ad5c38a4b52bce72b58219596ea81bf00a1715f63ebe4c19",
256256
"size": "full",
257257
"default": "false"

‎PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
## [Unreleased]
66

7+
### Added
8+
9+
- Initial .NET Aspire support
10+
711
## [4.4.2] - 2025-01-31
812

913
### Changed

‎PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/resources/META-INF/azure-intellij-plugin-appservice-dotnet.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
defaultValue="true"
6969
description="Enable downloading from Azure Functions Core Tools releases feed URL."/>
7070
<registryKey key="azure.function_app.core_tools.feed.url"
71-
defaultValue="https://functionscdn.azureedge.net/public/cli-feed-v4.json"
71+
defaultValue="https://cdn.functions.azure.com/public/cli-feed-v4.json"
7272
description="Azure Functions Core Tools releases feed URL."/>
7373

7474
<internalFileTemplate name="Trigger Azure HTTP Function"/>

‎PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pluginUntilBuild = 251.*
1515
# Release: 2020.2
1616
# EAP: 2020.3-EAP2-SNAPSHOT
1717
# Nightly: 2020.3-SNAPSHOT
18-
platformVersion = 2025.1-SNAPSHOT
18+
platformVersion = 2025.1-EAP3-SNAPSHOT
1919

2020
dotnetBuildConfiguration=Release
2121

0 commit comments

Comments
 (0)