Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
afscrome authored Jul 20, 2024
2 parents 266931f + 5238a73 commit 05c6d0c
Show file tree
Hide file tree
Showing 555 changed files with 18,654 additions and 3,572 deletions.
2 changes: 2 additions & 0 deletions .config/1espt/PipelineAutobaseliningConfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ pipelines:
lastModifiedDate: 2024-03-19
armory:
lastModifiedDate: 2024-03-19
policheck:
lastModifiedDate: 2024-07-12
binary:
credscan:
lastModifiedDate: 2024-03-19
Expand Down
8 changes: 8 additions & 0 deletions .config/CredScanSuppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
{
"placeholder": "thisIsAFakeSecret",
"_justification": "This isn't a real secret, it's used in one of the playground applications for testing purposes."
},
{
"file": "\\tests\\Shared\\TestCertificates\\eku.client.pfx",
"_justification": "Legitimate UT certificate file with private key, from dotnet/aspnetcore"
},
{
"file": "\\tests\\Shared\\TestCertificates\\testCert.pfx",
"_justification": "Legitimate UT certificate file with private key, from dotnet/aspnetcore"
}
]
}
3 changes: 3 additions & 0 deletions .config/PoliCheckExclusions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<PoliCheckExclusions>

</PoliCheckExclusions>
12 changes: 6 additions & 6 deletions .config/guardian/.gdnbaselines
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-03-19 20:44:19Z",
"expirationDate": "2024-09-05 22:14:02Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-19 22:14:02Z"
"createdDate": "2024-07-12 14:58:00Z",
"expirationDate": "2024-12-29 17:24:51Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-07-12 17:24:51Z"
},
"33c7907352345498ee4bb7f5e1e60f06f2720758aec6ff819c9d5dc6668f5c4a": {
"signature": "33c7907352345498ee4bb7f5e1e60f06f2720758aec6ff819c9d5dc6668f5c4a",
Expand All @@ -35,9 +35,9 @@
],
"tool": "credscan",
"ruleId": "CSCAN-GENERAL0020",
"createdDate": "2024-03-19 20:44:19Z",
"expirationDate": "2024-09-05 22:14:02Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-19 22:14:02Z"
"createdDate": "2024-07-12 14:58:00Z",
"expirationDate": "2024-12-29 17:24:51Z",
"justification": "This error is baselined with an expiration date of 180 days from 2024-07-12 17:24:51Z"
}
}
}
10 changes: 10 additions & 0 deletions .config/tsaoptions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"instanceUrl": "https://devdiv.visualstudio.com/",
"template": "TFSDEVDIV",
"projectName": "DEVDIV",
"areaPath": "DevDiv\\ASP.NET Core\\Policy Violations",
"iterationPath": "DevDiv",
"notificationAliases": [ "[email protected]" ],
"repositoryName": "aspire",
"codebaseName": "aspire"
}
23 changes: 16 additions & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ updates:
registries:
- public-nuget
schedule:
interval: daily
day: monday
interval: weekly
time: "07:00"
timezone: "America/Los_Angeles"
open-pull-requests-limit: 15
Expand All @@ -28,13 +29,11 @@ updates:
AspNetCoreHealthChecks:
patterns:
- "AspNetCore.HealthChecks.*"
AspNetCore:
patterns:
- "Microsoft.AspNetCore.*"
- "Microsoft.Extensions.Features"
MicrosoftExtensions:
AWS:
patterns:
- "Microsoft.Extensions.*"
- "AWS.*"
- "AWSSDK.*"
- "OpenTelemetry.*.AWS"
EntityFrameworkCore:
patterns:
- "Microsoft.EntityFrameworkCore.*"
Expand All @@ -44,6 +43,13 @@ updates:
OpenTelemetry:
patterns:
- "OpenTelemetry.*"
Orleans:
patterns:
- "Microsoft.Orleans*"
NetPlatform:
patterns:
- "Microsoft.AspNetCore.*"
- "Microsoft.Extensions.*"
Npgsql:
patterns:
- "Npgsql.*"
Expand All @@ -53,6 +59,9 @@ updates:
Grpc:
patterns:
- "Grpc.*"
Polly:
patterns:
- "Polly.*"
labels:
- "area-codeflow"

Expand Down
221 changes: 187 additions & 34 deletions Aspire.sln

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
<LangVersion>preview</LangVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<SharedDir>$(MSBuildThisFileDirectory)/src/Shared/</SharedDir>
<TestsSharedDir>$(MSBuildThisFileDirectory)/tests/Shared/</TestsSharedDir>
<TestsSharedDir>$([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), 'tests', 'Shared'))</TestsSharedDir>
<TestsSharedRepoTestingDir>$([MSBuild]::NormalizeDirectory($(TestsSharedDir), 'RepoTesting'))</TestsSharedRepoTestingDir>
<VendoringDir>$(MSBuildThisFileDirectory)/src/Vendoring/</VendoringDir>
<!-- Capture PackageIconFullPath into DefaultDotnetIconFullPath before we overwrite PackageIconFullPath. -->
<!-- DefaultDotnetIconFullPath is only needed for the ServiceDisovery packages. The property can be removed when these libraries move. See https://github.com/dotnet/aspire/issues/170 -->
Expand Down
46 changes: 24 additions & 22 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<Import Project="eng/Versions.props" Condition="'$(MajorVersion)' == '' and Exists('eng/Versions.props')" />
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<TestcontainersPackageVersion>3.8.0</TestcontainersPackageVersion>
<TestcontainersPackageVersion>3.9.0</TestcontainersPackageVersion>
</PropertyGroup>
<ItemGroup>
<!-- AWS SDK for .NET dependencies -->
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.308.9" />
<PackageVersion Include="AWSSDK.SQS" Version="3.7.301.17" />
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.301.52" />
<PackageVersion Include="AWSSDK.Core" Version="3.7.304.14" />
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.308.18" />
<PackageVersion Include="AWSSDK.SQS" Version="3.7.301.26" />
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.301.61" />
<PackageVersion Include="AWSSDK.Core" Version="3.7.304.23" />
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
<PackageVersion Include="AWS.Messaging" Version="0.9.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.4" />
<PackageVersion Include="OpenTelemetry.Extensions.AWS" Version="1.3.0-beta.1" />
<!-- Azure SDK for .NET dependencies -->
<PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
<PackageVersion Include="Azure.AI.OpenAI" Version="2.0.0-beta.2" />
<PackageVersion Include="Azure.Data.Tables" Version="12.8.3" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
<PackageVersion Include="Azure.Identity" Version="1.12.0" />
Expand Down Expand Up @@ -53,6 +53,7 @@
<PackageVersion Include="Azure.Provisioning.WebPubSub" Version="0.1.0-beta.1" />
<!-- ASP.NET Core dependencies -->
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Version="$(MicrosoftAspNetCoreAuthenticationCertificatePackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(MicrosoftAspNetCoreAuthenticationOpenIdConnectPackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftAspNetCoreOpenApiPackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="$(MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion)" />
Expand Down Expand Up @@ -93,7 +94,8 @@
<!-- external dependencies -->
<PackageVersion Include="Confluent.Kafka" Version="2.4.0" />
<PackageVersion Include="Dapper" Version="2.1.44" />
<PackageVersion Include="DnsClient" Version="1.7.0" />
<PackageVersion Include="DnsClient" Version="1.8.0" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.14.4" />
<PackageVersion Include="Google.Protobuf" Version="3.27.1" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.63.0" />
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.63.0" />
Expand All @@ -104,20 +106,20 @@
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.7.2" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.7.2" />
<PackageVersion Include="Milvus.Client" Version="2.3.0-preview.1"/>
<PackageVersion Include="MongoDB.Driver" Version="2.26.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.27.0" />
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.6" />
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
<PackageVersion Include="NATS.Net" Version="2.2.3" />
<PackageVersion Include="NATS.Net" Version="2.3.0" />
<PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.40" />
<PackageVersion Include="Polly.Core" Version="8.4.0" />
<PackageVersion Include="Polly.Extensions" Version="8.4.0" />
<PackageVersion Include="Polly.Core" Version="8.4.1" />
<PackageVersion Include="Polly.Extensions" Version="8.4.1" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageVersion Include="Qdrant.Client" Version="1.9.0" />
<PackageVersion Include="Qdrant.Client" Version="1.10.0" />
<PackageVersion Include="RabbitMQ.Client" Version="[6.8.1,7.0.0)" />
<PackageVersion Include="StackExchange.Redis" Version="2.7.33" />
<PackageVersion Include="StackExchange.Redis" Version="2.8.0" />
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
<PackageVersion Include="Yarp.ReverseProxy" Version="2.1.0" />
<!-- Open Telemetry -->
Expand All @@ -136,15 +138,15 @@
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23564.4" />
<PackageVersion Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24209.3" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24324.3" />
<!-- unit test dependencies -->
<PackageVersion Include="bUnit" Version="1.28.9" />
<PackageVersion Include="JsonSchema.Net" Version="7.0.4" />
<PackageVersion Include="JsonSchema.Net" Version="7.1.2" />
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingPackageVersion)" />
<PackageVersion Include="Microsoft.NET.Runtime.WorkloadTesting.Internal" Version="$(MicrosoftNETRuntimeWorkloadTestingInternalVersion)" />
<PackageVersion Include="Microsoft.Playwright" Version="1.44.0" />
<PackageVersion Include="Microsoft.Playwright" Version="1.45.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
Expand All @@ -154,14 +156,14 @@
<PackageVersion Include="Testcontainers.Redis" Version="$(TestcontainersPackageVersion)" />
<PackageVersion Include="Testcontainers.Nats" Version="$(TestcontainersPackageVersion)" />
<PackageVersion Include="Testcontainers.Milvus" Version="$(TestcontainersPackageVersion)" />

<PackageVersion Include="Testcontainers.Elasticsearch" Version="$(TestcontainersPackageVersion)" />
<!-- playground apps dependencies -->
<PackageVersion Include="Dapr.AspNetCore" Version="1.13.1" />
<PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="8.1.0" />
<PackageVersion Include="Microsoft.Orleans.Persistence.AzureStorage" Version="8.1.0" />
<PackageVersion Include="Microsoft.Orleans.Client" Version="8.1.0" />
<PackageVersion Include="Microsoft.Orleans.Server" Version="8.1.0" />
<PackageVersion Include="Microsoft.Orleans.Sdk" Version="8.1.0" />
<PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="8.2.0" />
<PackageVersion Include="Microsoft.Orleans.Persistence.AzureStorage" Version="8.2.0" />
<PackageVersion Include="Microsoft.Orleans.Client" Version="8.2.0" />
<PackageVersion Include="Microsoft.Orleans.Server" Version="8.2.0" />
<PackageVersion Include="Microsoft.Orleans.Sdk" Version="8.2.0" />
<!-- Pinned version for Component Governance - Remove when root dependencies are updated -->
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
Expand Down
23 changes: 23 additions & 0 deletions docs/updating-container-registry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Updating the test container registry

Docker Hub has a rate limit on how often requests can be made from an IP. Because of this, we can't use Docker Hub in our build and automation. Instead, we have created a mirror container registry (netaspireci.azurecr.io) to mirror the public images used in our tests.

Use the following guide to add a new image, or update an existing image with a new version.

1. Install az cli - https://learn.microsoft.com/cli/azure/install-azure-cli
2. Log in to the container registry (Assumes you are permitted to login to the registry. Contact an admin if you need permissions.)
1. `az login`
2. `az acr login --name netaspireci --expose-token --output tsv --query accessToken | docker login netaspireci.azurecr.io -u 00000000-0000-0000-0000-000000000000 --password-stdin`
3. See the following docs for more information
1. https://learn.microsoft.com/azure/container-registry/container-registry-get-started-docker-cli#log-in-to-a-registry
2. https://github.com/dotnet/dotnet-docker/blob/main/samples/push-image-to-acr.md#login-to-acr
3. Pull the image locally, tag it, and push it
1. `docker pull docker.io/library/redis:7.2`
2. `docker tag library/redis:7.2 netaspireci.azurecr.io/library/redis:7.2`
3. `docker push netaspireci.azurecr.io/library/redis:7.2`
4. Alternatively, you can try the import command, but unless you have Docker Hub credentials it can fail due to rate limits.
1. `az acr import --name netaspireci --source docker.io/library/redis:7.2 --image library/redis:7.2 --username <Docker Hub user name> --password <Docker Hub token>`
2. See https://learn.microsoft.com/azure/container-registry/container-registry-import-images?tabs=azure-cli#import-from-docker-hub

> [!IMPORTANT]
> Note that the image name in netaspireci.azurecr.io needs to match exactly the name in docker.io or else the test won't be able to simply override the container registry.
Loading

0 comments on commit 05c6d0c

Please sign in to comment.