Skip to content

Commit ca6ef3e

Browse files
adamintadamint
committed
Merge branch 'main' into dev/adamint/fix-url-overflow-resource-actions
2 parents 1cfd16d + 1b76ab9 commit ca6ef3e

File tree

133 files changed

+2403
-970
lines changed

Some content is hidden

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

133 files changed

+2403
-970
lines changed

‎.github/workflows/markdownlint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
- name: Run Markdownlint
2424
run: |
2525
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
26-
npm i -g markdownlint-cli
26+
npm i -g markdownlint-cli@0.45.0
2727
markdownlint --ignore '.dotnet/' --ignore '**/AnalyzerReleases.*.md' '**/*.md'

‎.github/workflows/run-tests.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ jobs:
213213
working-directory: ${{ github.workspace }}/run-tests/
214214
env:
215215
CI: false
216-
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
217216
DCP_DIAGNOSTICS_LOG_LEVEL: debug
218217
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
219218
BUILT_NUGETS_PATH: ${{ github.workspace }}/artifacts/packages/Debug/Shipping
@@ -236,7 +235,6 @@ jobs:
236235
id: run-tests
237236
env:
238237
CI: false
239-
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
240238
DCP_DIAGNOSTICS_LOG_LEVEL: debug
241239
DCP_DIAGNOSTICS_LOG_FOLDER: ${{ github.workspace }}/testresults/dcp
242240
# During restore and build, we use -ci, which causes NUGET_PACKAGES to point to a local cache (Arcade behavior).

‎.vscode/settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dotnet.previewSolution-freeWorkspaceMode": true,
3+
"dotnet.testWindow.useTestingPlatformProtocol": true,
34
"dotnet.defaultSolution": "./Aspire.slnx",
4-
"dotnet.preview.enableSupportForSlnx": true,
5-
"dotnet.testWindow.useTestingPlatformProtocol": false
5+
"dotnet.preview.enableSupportForSlnx": true
66
}

‎Directory.Packages.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@
2626
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.7.0" />
2727
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.0" />
2828
<PackageVersion Include="Azure.Storage.Queues" Version="12.22.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.1.2" />
30-
<PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.1.2" />
3129
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.49.0" />
3230
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.30.3" />
3331
<PackageVersion Include="Microsoft.Azure.SignalR.Management" Version="1.30.3" />
3432
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.11.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.2.0" />
3534
<!-- Azure Management SDK for .NET dependencies -->
3635
<PackageVersion Include="Azure.Provisioning" Version="$(AzureProvisiongVersion)" />
3736
<PackageVersion Include="Azure.Provisioning.AppConfiguration" Version="$(AzureProvisiongVersion)" />
@@ -157,8 +156,8 @@
157156
<ItemGroup>
158157
<!-- dotnet/extensions dependencies ** Common between net8 and net9 ** -->
159158
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
160-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIVersion)" />
161-
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="$(MicrosoftExtensionsAIVersion)" />
159+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIPreviewVersion)" />
160+
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="$(MicrosoftExtensionsAIPreviewVersion)" />
162161
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingVersion)" />
163162
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsHttpResilienceVersion)" />
164163
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(MicrosoftExtensionsTimeProviderTestingVersion)" />

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[Tooling](https://learn.microsoft.com/dotnet/aspire/get-started/aspire-overview?#project-templates-and-tooling): .NET Aspire comes with project templates and tooling experiences for Visual Studio and the dotnet CLI which help you create and interact with .NET Aspire apps.
1919

20-
To learn more, read the full [.NET Aspire overview and documentation](https://learn.microsoft.com/dotnet/aspire/). Samples are available in the [.NET Aspire samples repository](https://github.com/dotnet/aspire-samples). You can find the eShop sample [here](https://github.com/dotnet/eshop) and the Azure version [here](https://github.com/Azure-Samples/eShopOnAzure).
20+
To learn more, read the full [.NET Aspire overview and documentation](https://learn.microsoft.com/dotnet/aspire/). Samples are available in the [.NET Aspire samples repository](https://github.com/dotnet/aspire-samples). You can find the [eShop sample here](https://github.com/dotnet/eshop) and the [Azure version here](https://github.com/Azure-Samples/eShopOnAzure).
2121

2222
## What is in this repo?
2323

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.14.1">
4+
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-amd64" Version="0.14.3">
55
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
6-
<Sha>2be396067a571f3a385cdf15400975a3bd955be8</Sha>
6+
<Sha>5b0670e15dcf8b0669f6201f537f3333d277b22a</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.14.1">
8+
<Dependency Name="Microsoft.DeveloperControlPlane.darwin-arm64" Version="0.14.3">
99
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
10-
<Sha>2be396067a571f3a385cdf15400975a3bd955be8</Sha>
10+
<Sha>5b0670e15dcf8b0669f6201f537f3333d277b22a</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.14.1">
12+
<Dependency Name="Microsoft.DeveloperControlPlane.linux-amd64" Version="0.14.3">
1313
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
14-
<Sha>2be396067a571f3a385cdf15400975a3bd955be8</Sha>
14+
<Sha>5b0670e15dcf8b0669f6201f537f3333d277b22a</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.14.1">
16+
<Dependency Name="Microsoft.DeveloperControlPlane.linux-arm64" Version="0.14.3">
1717
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
18-
<Sha>2be396067a571f3a385cdf15400975a3bd955be8</Sha>
18+
<Sha>5b0670e15dcf8b0669f6201f537f3333d277b22a</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.14.1">
20+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-386" Version="0.14.3">
2121
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
22-
<Sha>2be396067a571f3a385cdf15400975a3bd955be8</Sha>
22+
<Sha>5b0670e15dcf8b0669f6201f537f3333d277b22a</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.14.1">
24+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-amd64" Version="0.14.3">
2525
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
26-
<Sha>2be396067a571f3a385cdf15400975a3bd955be8</Sha>
26+
<Sha>5b0670e15dcf8b0669f6201f537f3333d277b22a</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.14.1">
28+
<Dependency Name="Microsoft.DeveloperControlPlane.windows-arm64" Version="0.14.3">
2929
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
30-
<Sha>2be396067a571f3a385cdf15400975a3bd955be8</Sha>
30+
<Sha>5b0670e15dcf8b0669f6201f537f3333d277b22a</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.Extensions.Http.Resilience" Version="9.4.0">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<!-- This repo version -->
44
<MajorVersion>9</MajorVersion>
5-
<MinorVersion>3</MinorVersion>
5+
<MinorVersion>4</MinorVersion>
66
<PatchVersion>0</PatchVersion>
77
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
88
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
@@ -12,9 +12,9 @@
1212
<DotNetRuntimePreviousVersionForTesting>8.0.13</DotNetRuntimePreviousVersionForTesting>
1313
<!-- dotnet 8.0 versions for running tests - used for templates tests -->
1414
<DotNetSdkPreviousVersionForTesting>8.0.406</DotNetSdkPreviousVersionForTesting>
15-
<XunitV3Version>2.0.0</XunitV3Version>
16-
<XUnitAnalyzersVersion>1.20.0</XUnitAnalyzersVersion>
17-
<XunitRunnerVisualStudioVersion>3.0.2</XunitRunnerVisualStudioVersion>
15+
<XunitV3Version>2.0.2</XunitV3Version>
16+
<XUnitAnalyzersVersion>1.21.0</XUnitAnalyzersVersion>
17+
<XunitRunnerVisualStudioVersion>3.1.0</XunitRunnerVisualStudioVersion>
1818
<MicrosoftTestingPlatformVersion>1.6.3</MicrosoftTestingPlatformVersion>
1919
<MicrosoftNETTestSdkVersion>17.13.0</MicrosoftNETTestSdkVersion>
2020
<!-- Enable to remove prerelease label. -->
@@ -25,20 +25,21 @@
2525
<!-- Package versions defined directly in <reporoot>/Directory.Packages.props -->
2626
<MicrosoftDotnetSdkInternalVersion>8.0.100-rtm.23512.16</MicrosoftDotnetSdkInternalVersion>
2727
<!-- DCP -->
28-
<MicrosoftDeveloperControlPlanedarwinamd64Version>0.14.1</MicrosoftDeveloperControlPlanedarwinamd64Version>
29-
<MicrosoftDeveloperControlPlanedarwinarm64Version>0.14.1</MicrosoftDeveloperControlPlanedarwinarm64Version>
30-
<MicrosoftDeveloperControlPlanelinuxamd64Version>0.14.1</MicrosoftDeveloperControlPlanelinuxamd64Version>
31-
<MicrosoftDeveloperControlPlanelinuxarm64Version>0.14.1</MicrosoftDeveloperControlPlanelinuxarm64Version>
32-
<MicrosoftDeveloperControlPlanewindows386Version>0.14.1</MicrosoftDeveloperControlPlanewindows386Version>
33-
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.14.1</MicrosoftDeveloperControlPlanewindowsamd64Version>
34-
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.14.1</MicrosoftDeveloperControlPlanewindowsarm64Version>
28+
<MicrosoftDeveloperControlPlanedarwinamd64Version>0.14.3</MicrosoftDeveloperControlPlanedarwinamd64Version>
29+
<MicrosoftDeveloperControlPlanedarwinarm64Version>0.14.3</MicrosoftDeveloperControlPlanedarwinarm64Version>
30+
<MicrosoftDeveloperControlPlanelinuxamd64Version>0.14.3</MicrosoftDeveloperControlPlanelinuxamd64Version>
31+
<MicrosoftDeveloperControlPlanelinuxarm64Version>0.14.3</MicrosoftDeveloperControlPlanelinuxarm64Version>
32+
<MicrosoftDeveloperControlPlanewindows386Version>0.14.3</MicrosoftDeveloperControlPlanewindows386Version>
33+
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.14.3</MicrosoftDeveloperControlPlanewindowsamd64Version>
34+
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.14.3</MicrosoftDeveloperControlPlanewindowsarm64Version>
3535
<!-- Other -->
3636
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25225.6</MicrosoftDotNetRemoteExecutorVersion>
3737
<MicrosoftDotNetXUnitV3ExtensionsVersion>10.0.0-beta.25178.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
3838
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.25225.6</MicrosoftDotNetBuildTasksInstallersVersion>
3939
<MicrosoftDotNetBuildTasksWorkloadsVersion>9.0.0-beta.25225.6</MicrosoftDotNetBuildTasksWorkloadsVersion>
4040
<!-- dotnet/extensions -->
41-
<MicrosoftExtensionsAIVersion>9.4.4-preview.1.25259.16</MicrosoftExtensionsAIVersion>
41+
<MicrosoftExtensionsAIVersion>9.5.0</MicrosoftExtensionsAIVersion>
42+
<MicrosoftExtensionsAIPreviewVersion>9.5.0-preview.1.25265.7</MicrosoftExtensionsAIPreviewVersion>
4243
<!-- when updating this, also update cgmanifest.json as it is consumed in templates -->
4344
<MicrosoftExtensionsHttpResilienceVersion>9.4.0</MicrosoftExtensionsHttpResilienceVersion>
4445
<MicrosoftExtensionsDiagnosticsTestingVersion>9.4.0</MicrosoftExtensionsDiagnosticsTestingVersion>

‎eng/pipelines/templates/BuildAndTest.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ steps:
6161
RunOnlyBasicBuildTemplateTests: true
6262
# test root path for template test projects
6363
DEV_TEMP: $(Build.SourcesDirectory)\..
64+
DOTNET_ROOT: $(Build.SourcesDirectory)\.dotnet
6465
TEST_LOG_PATH: $(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\Aspire.Templates.Tests
6566
displayName: Run Template tests
6667

@@ -74,6 +75,8 @@ steps:
7475
/bl:${{ parameters.repoLogPath }}/build.binlog
7576
$(_OfficialBuildIdArgs)
7677
displayName: Build
78+
env:
79+
DOTNET_ROOT: "$(Build.SourcesDirectory)/.dotnet"
7780

7881
- task: DockerInstaller@0
7982
inputs:
@@ -106,7 +109,6 @@ steps:
106109
"${{ parameters.buildScript }} -testnobuild -test -configuration ${{ parameters.buildConfig }} /bl:${{ parameters.repoLogPath }}/tests.binlog /maxcpucount:1 /p:BuildInParallel=false $(_OfficialBuildIdArgs)"
107110
env:
108111
DOCKER_BUILDKIT: 1
109-
DOTNET_ASPIRE_CONTAINER_RUNTIME: docker
110112
# https://github.com/dotnet/aspire/issues/5195#issuecomment-2271687822
111113
DOTNET_ASPIRE_DEPENDENCY_CHECK_TIMEOUT: 180
112114
DCP_DIAGNOSTICS_LOG_LEVEL: debug

‎playground/AzureAppService/AzureAppService.AppHost/api.module.bicep‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,25 @@ param api_identity_outputs_id string
2626

2727
param api_identity_outputs_clientid string
2828

29+
resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-04-01' = {
30+
name: 'main'
31+
properties: {
32+
authType: 'UserAssigned'
33+
image: api_containerimage
34+
isMain: true
35+
userManagedIdentityClientId: infra_outputs_azure_container_registry_managed_identity_client_id
36+
}
37+
parent: webapp
38+
}
39+
2940
resource webapp 'Microsoft.Web/sites@2024-04-01' = {
3041
name: take('${toLower('api')}-${uniqueString(resourceGroup().id)}', 60)
3142
location: location
3243
properties: {
3344
serverFarmId: infra_outputs_planid
3445
keyVaultReferenceIdentity: api_identity_outputs_id
3546
siteConfig: {
36-
linuxFxVersion: 'DOCKER|${api_containerimage}'
47+
linuxFxVersion: 'SITECONTAINERS'
3748
acrUseManagedIdentityCreds: true
3849
acrUserManagedIdentityID: infra_outputs_azure_container_registry_managed_identity_client_id
3950
appSettings: [

‎playground/AzureAppService/AzureAppService.AppHost/infra.module.bicep‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ resource infra_asplan 'Microsoft.Web/serverfarms@2024-04-01' = {
3838
}
3939
kind: 'Linux'
4040
sku: {
41-
name: 'B1'
42-
tier: 'Basic'
41+
name: 'P0V3'
42+
tier: 'Premium'
4343
}
4444
}
4545

0 commit comments

Comments
 (0)