Skip to content

Commit 7887a4b

Browse files
radicalradical
committed
Merge remote-tracking branch 'origin/main' into internal-build-pack
2 parents 52a1e02 + 2ea9817 commit 7887a4b

File tree

120 files changed

+2000
-725
lines changed

Some content is hidden

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

120 files changed

+2000
-725
lines changed

‎Directory.Packages.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<!-- AWS SDK for .NET dependencies -->
13-
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.1" />
14-
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.1" />
15-
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.1" />
16-
<PackageVersion Include="AWSSDK.Core" Version="3.7.400.1" />
13+
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.11" />
14+
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.11" />
15+
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.11" />
16+
<PackageVersion Include="AWSSDK.Core" Version="3.7.400.11" />
1717
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
18-
<PackageVersion Include="AWS.Messaging" Version="0.9.1" />
19-
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.4" />
18+
<PackageVersion Include="AWS.Messaging" Version="0.9.2" />
19+
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.5" />
2020
<PackageVersion Include="OpenTelemetry.Extensions.AWS" Version="1.3.0-beta.1" />
2121
<!-- Azure SDK for .NET dependencies -->
2222
<PackageVersion Include="Azure.AI.OpenAI" Version="2.0.0-beta.2" />
@@ -31,7 +31,7 @@
3131
<PackageVersion Include="Azure.Storage.Queues" Version="12.19.1" />
3232
<PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0" />
3333
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.42.0" />
34-
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.26.0" />
34+
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.26.1" />
3535
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.5" />
3636
<!-- Azure Management SDK for .NET dependencies -->
3737
<PackageVersion Include="Azure.Provisioning" Version="0.3.0" />
@@ -93,16 +93,16 @@
9393
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsHttpResiliencePackageVersion)" />
9494
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(MicrosoftExtensionsTimeProviderTestingVersion)" />
9595
<!-- external dependencies -->
96-
<PackageVersion Include="Confluent.Kafka" Version="2.5.0" />
96+
<PackageVersion Include="Confluent.Kafka" Version="2.5.2" />
9797
<PackageVersion Include="Dapper" Version="2.1.44" />
9898
<PackageVersion Include="DnsClient" Version="1.8.0" />
99-
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.14.7" />
100-
<PackageVersion Include="Google.Protobuf" Version="3.27.2" />
99+
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.15.2" />
100+
<PackageVersion Include="Google.Protobuf" Version="3.27.3" />
101101
<PackageVersion Include="Grpc.AspNetCore" Version="2.65.0" />
102102
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.65.0" />
103103
<PackageVersion Include="Grpc.Tools" Version="2.65.0" />
104104
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
105-
<PackageVersion Include="KubernetesClient" Version="14.0.2" />
105+
<PackageVersion Include="KubernetesClient" Version="14.0.9" />
106106
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.1" />
107107
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
108108
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
@@ -111,15 +111,15 @@
111111
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
112112
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.6" />
113113
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
114-
<PackageVersion Include="NATS.Net" Version="2.3.2" />
114+
<PackageVersion Include="NATS.Net" Version="2.3.3" />
115115
<PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.3" />
116116
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
117117
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.50" />
118118
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.5.0" />
119119
<PackageVersion Include="Polly.Core" Version="8.4.1" />
120120
<PackageVersion Include="Polly.Extensions" Version="8.4.1" />
121121
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
122-
<PackageVersion Include="Qdrant.Client" Version="1.10.0" />
122+
<PackageVersion Include="Qdrant.Client" Version="1.11.0" />
123123
<PackageVersion Include="RabbitMQ.Client" Version="[6.8.1,7.0.0)" />
124124
<PackageVersion Include="StackExchange.Redis" Version="2.8.0" />
125125
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
@@ -142,14 +142,14 @@
142142
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" />
143143
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24324.3" />
144144
<!-- unit test dependencies -->
145-
<PackageVersion Include="bUnit" Version="1.30.3" />
146-
<PackageVersion Include="JsonSchema.Net" Version="7.1.2" />
145+
<PackageVersion Include="bUnit" Version="1.31.3" />
146+
<PackageVersion Include="JsonSchema.Net" Version="7.2.2" />
147147
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorPackageVersion)" />
148148
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
149149
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingPackageVersion)" />
150150
<PackageVersion Include="Microsoft.NET.Runtime.WorkloadTesting.Internal" Version="$(MicrosoftNETRuntimeWorkloadTestingInternalVersion)" />
151151
<PackageVersion Include="Microsoft.Playwright" Version="1.46.0" />
152-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.0" />
152+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.1" />
153153
<PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
154154
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
155155
<PackageVersion Include="Testcontainers.MySql" Version="$(TestcontainersPackageVersion)" />
@@ -161,7 +161,7 @@
161161
<PackageVersion Include="Testcontainers.Oracle" Version="$(TestcontainersPackageVersion)" />
162162
<PackageVersion Include="Testcontainers.Elasticsearch" Version="$(TestcontainersPackageVersion)" />
163163
<!-- playground apps dependencies -->
164-
<PackageVersion Include="Dapr.AspNetCore" Version="1.13.1" />
164+
<PackageVersion Include="Dapr.AspNetCore" Version="1.14.0" />
165165
<PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="8.2.0" />
166166
<PackageVersion Include="Microsoft.Orleans.Persistence.AzureStorage" Version="8.2.0" />
167167
<PackageVersion Include="Microsoft.Orleans.Client" Version="8.2.0" />

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,42 +121,42 @@
121121
</Dependency>
122122
</ProductDependencies>
123123
<ToolsetDependencies>
124-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24413.2">
124+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24421.4">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
126+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24413.2">
128+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24421.4">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
130+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24413.2">
132+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24421.4">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
134+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24413.2">
136+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24421.4">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
138+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24413.2">
140+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24421.4">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
142+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24413.2">
144+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24421.4">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
146+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24413.2">
148+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24421.4">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
150+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
151151
</Dependency>
152152
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
153153
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
154154
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
155155
</Dependency>
156156
<!-- Intermediate is necessary for source build. -->
157-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24413.2">
157+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="8.0.0-beta.24421.4">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>51321b7e150a2f426cb9e1334687bdfab68ec323</Sha>
159+
<Sha>4460b755f3c7c89e9660d9580ff79afc4218dd85</Sha>
160160
<SourceBuild RepoName="arcade" ManagedOnly="true" />
161161
</Dependency>
162162
<!-- Intermediate is necessary for source build. -->

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup>
33
<!-- This repo version -->
4-
<MajorVersion>8</MajorVersion>
5-
<MinorVersion>2</MinorVersion>
4+
<MajorVersion>9</MajorVersion>
5+
<MinorVersion>0</MinorVersion>
66
<PatchVersion>0</PatchVersion>
7-
<VersionPrefix>8.2.0</VersionPrefix>
7+
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
88
<PreReleaseVersionLabel>preview.1</PreReleaseVersionLabel>
99
<!--
1010
When running package validation as part of the build, we want to ensure we didn't break the API against the previous
@@ -29,10 +29,10 @@
2929
<MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>0.6.2</MicrosoftDeveloperControlPlanewindowsamd64PackageVersion>
3030
<MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>0.6.2</MicrosoftDeveloperControlPlanewindowsarm64PackageVersion>
3131
<!-- Other -->
32-
<MicrosoftDotNetRemoteExecutorPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetRemoteExecutorPackageVersion>
33-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
34-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
35-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24413.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
32+
<MicrosoftDotNetRemoteExecutorPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetRemoteExecutorPackageVersion>
33+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
34+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
35+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24421.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
3636
<MicrosoftExtensionsHttpResiliencePackageVersion>8.8.0</MicrosoftExtensionsHttpResiliencePackageVersion>
3737
<MicrosoftExtensionsDiagnosticsTestingPackageVersion>8.8.0</MicrosoftExtensionsDiagnosticsTestingPackageVersion>
3838
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>

‎eng/common/templates/steps/telemetry-start.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ parameters:
88

99
steps:
1010
- ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}:
11-
- task: AzureKeyVault@1
11+
- task: AzureKeyVault@2
1212
inputs:
1313
azureSubscription: 'HelixProd_KeyVault'
1414
KeyVaultName: HelixProdKV

‎eng/dcppack/Common.projitems

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,17 @@
4848

4949
<Target Name="Build" />
5050

51-
<Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)" DependsOnTargets="Restore">
51+
<Target Name="_CopyDCPBinaryToIntermediateDir" AfterTargets="Build">
52+
<ItemGroup>
53+
<_DcpFilesToCopy Include="$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)\tools\**\*" />
54+
</ItemGroup>
55+
56+
<Copy SourceFiles="@(_DcpFilesToCopy)" DestinationFolder="$(IntermediateOutputPath)\tools\%(RecursiveDir)" />
57+
</Target>
58+
59+
<Target Name="GetDCPBinaryLocation" Returns="$(DCPBinariesLocation)">
5260
<PropertyGroup>
53-
<DCPBinariesLocation>$(NuGetPackageRoot)microsoft.developercontrolplane.$(DcpPlatform)/$(MicrosoftDeveloperControlPlanedarwinamd64PackageVersion)/tools</DCPBinariesLocation>
61+
<DCPBinariesLocation>$(IntermediateOutputPath)/tools</DCPBinariesLocation>
5462
</PropertyGroup>
5563
</Target>
5664

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "8.0.303"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24413.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24413.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24421.4",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24421.4",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.24421.4",
1414
"Microsoft.Build.NoTargets": "3.7.0"
1515
}
1616
}

‎playground/Stress/Stress.ApiService/ConsoleStresser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public static void Stress()
9797
for (var color = 40; color <= 47; color++)
9898
{
9999
Console.Write("\x1b[" + color + "m"); // Set background color
100-
Console.WriteLine($"This is background color {color}");
101-
Console.Write("\x1b[0m"); // Reset colors to default after each background to maintain readability
100+
Console.Write($"This is background color {color}");
101+
Console.WriteLine("\x1b[0m"); // Reset colors to default after each background to maintain readability
102102
}
103103
Console.Write("\x1b[0m"); // Reset all colors to default at the end
104104

‎playground/Stress/Stress.ApiService/Program.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,23 @@
2222

2323
app.MapGet("/", () => "Hello world");
2424

25+
app.MapGet("/write-console", () =>
26+
{
27+
for (var i = 0; i < 5000; i++)
28+
{
29+
if (i % 500 == 0)
30+
{
31+
Console.Error.WriteLine($"{i} Error");
32+
}
33+
else
34+
{
35+
Console.Out.WriteLine($"{i} Out");
36+
}
37+
}
38+
39+
return "Console written";
40+
});
41+
2542
app.MapGet("/increment-counter", (TestMetrics metrics) =>
2643
{
2744
metrics.IncrementCounter(1, new TagList([new KeyValuePair<string, object?>("add-tag", "1")]));

‎playground/kafka/Consumer/ConsumerWorker.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
1919
try
2020
{
2121
result = consumer.Consume(TimeSpan.FromSeconds(1));
22+
if (result is not null)
23+
{
24+
logger.LogInformation($"Consumed message [{result.Message?.Key}] = {result.Message?.Value}");
25+
}
2226
}
2327
catch (ConsumeException ex) when (ex.Error.Code == ErrorCode.UnknownTopicOrPart)
2428
{

‎playground/withdockerfile/WithDockerfile.AppHost/Program.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
builder.AddDockerfile("mycontainer", "qots")
1111
.WithBuildArg("GO_VERSION", goVersion)
12-
.WithBuildSecret("SECRET_ASENV", secret);
12+
.WithBuildSecret("SECRET_ASENV", secret)
13+
.WithEnvironment("DOCKER_BUILDKIT", "1");
1314

1415
#if !SKIP_DASHBOARD_REFERENCE
1516
// This project is only added in playground projects to support development/debugging

0 commit comments

Comments
 (0)