Skip to content

Commit 805ea22

Browse files
RussKieRussKie
committed
Merge changes from internal branch
2 parents 915184d + 6902c57 commit 805ea22

File tree

247 files changed

+15019
-19171
lines changed

Some content is hidden

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

247 files changed

+15019
-19171
lines changed

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
/docs/ @dotnet/dotnet-extensions-infra
1818
/eng/ @dotnet/dotnet-extensions-infra
1919

20+
/src/Libraries/Microsoft.Extensions.AI.Evaluation @dotnet/dotnet-extensions-ai-evaluation
21+
/src/Libraries/Microsoft.Extensions.AI.Evaluation.* @dotnet/dotnet-extensions-ai-evaluation
22+
/test/Libraries/Microsoft.Extensions.AI.Evaluation.* @dotnet/dotnet-extensions-ai-evaluation
23+
2024
/src/Libraries/Microsoft.Extensions.AI @dotnet/dotnet-extensions-ai
2125
/src/Libraries/Microsoft.Extensions.AI.* @dotnet/dotnet-extensions-ai
2226
/test/Libraries/Microsoft.Extensions.AI @dotnet/dotnet-extensions-ai

‎Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@
3434
<TestNetCoreTargetFrameworks>$(NetCoreTargetFrameworks)</TestNetCoreTargetFrameworks>
3535
</PropertyGroup>
3636

37-
<!-- Internal branches don't use package source mapping feature due to internal feeds, so disable NU1507 warning saying it should be used. -->
38-
<PropertyGroup>
39-
<NoWarn>$(NoWarn);NU1507</NoWarn>
40-
</PropertyGroup>
41-
4237
<PropertyGroup>
4338
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
4439
<LangVersion>latest</LangVersion>

‎NuGet.config‎

Lines changed: 23 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,6 @@
22
<configuration>
33
<packageSources>
44
<clear />
5-
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6-
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-8/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-7/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-6/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-5/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-4/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-3/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-2/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca-1/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-9/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-8/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-7/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-6/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-5/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-4/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-3/nuget/v3/index.json" />
24-
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-2/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-15/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-14/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-13/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-12/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-11/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-10/nuget/v3/index.json" />
31-
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-1/nuget/v3/index.json" />
32-
<!-- End: Package sources from dotnet-aspnetcore -->
33-
<!-- Begin: Package sources from dotnet-runtime -->
34-
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
35-
<add key="darc-int-dotnet-runtime-eba546b-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0-6/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-runtime-80aa709-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-2/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-runtime-80aa709-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-15/nuget/v3/index.json" />
39-
<add key="darc-int-dotnet-runtime-80aa709-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-14/nuget/v3/index.json" />
40-
<add key="darc-int-dotnet-runtime-80aa709-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-12/nuget/v3/index.json" />
41-
<add key="darc-int-dotnet-runtime-80aa709-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-10/nuget/v3/index.json" />
42-
<!-- End: Package sources from dotnet-runtime -->
43-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
445
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
456
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
467
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -49,45 +10,27 @@
4910
<!-- Used for the Rich Navigation indexing task -->
5011
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
5112
</packageSources>
52-
<disabledPackageSources>
53-
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
54-
<!-- Begin: Package sources from dotnet-aspnetcore -->
55-
<add key="darc-int-dotnet-aspnetcore-009e1cc-1" value="true" />
56-
<add key="darc-int-dotnet-aspnetcore-009e1cc-2" value="true" />
57-
<add key="darc-int-dotnet-aspnetcore-009e1cc-3" value="true" />
58-
<add key="darc-int-dotnet-aspnetcore-009e1cc-4" value="true" />
59-
<add key="darc-int-dotnet-aspnetcore-009e1cc-5" value="true" />
60-
<add key="darc-int-dotnet-aspnetcore-009e1cc-6" value="true" />
61-
<add key="darc-int-dotnet-aspnetcore-009e1cc-7" value="true" />
62-
<add key="darc-int-dotnet-aspnetcore-009e1cc-8" value="true" />
63-
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
64-
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="true" />
65-
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="true" />
66-
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="true" />
67-
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="true" />
68-
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="true" />
69-
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="true" />
70-
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="true" />
71-
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="true" />
72-
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="true" />
73-
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="true" />
74-
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="true" />
75-
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="true" />
76-
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="true" />
77-
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="true" />
78-
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="true" />
79-
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="true" />
80-
<!-- End: Package sources from dotnet-aspnetcore -->
81-
<!-- Begin: Package sources from dotnet-runtime -->
82-
<add key="darc-int-dotnet-runtime-eba546b-6" value="true" />
83-
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
84-
<add key="darc-int-dotnet-runtime-80aa709-10" value="true" />
85-
<add key="darc-int-dotnet-runtime-80aa709-12" value="true" />
86-
<add key="darc-int-dotnet-runtime-80aa709-14" value="true" />
87-
<add key="darc-int-dotnet-runtime-80aa709-15" value="true" />
88-
<add key="darc-int-dotnet-runtime-80aa709-2" value="true" />
89-
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
90-
<!-- End: Package sources from dotnet-runtime -->
91-
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
92-
</disabledPackageSources>
13+
<!-- Define mappings by adding package patterns beneath the target source.
14+
https://aka.ms/nuget-package-source-mapping -->
15+
<packageSourceMapping>
16+
<packageSource key="dotnet-public">
17+
<package pattern="*" />
18+
</packageSource>
19+
<packageSource key="dotnet-eng">
20+
<package pattern="*" />
21+
</packageSource>
22+
<packageSource key="dotnet-tools">
23+
<package pattern="*" />
24+
</packageSource>
25+
<packageSource key="dotnet9">
26+
<package pattern="*" />
27+
</packageSource>
28+
<packageSource key="dotnet9-transport">
29+
<package pattern="*" />
30+
</packageSource>
31+
<packageSource key="richnav">
32+
<package pattern="*" />
33+
</packageSource>
34+
</packageSourceMapping>
35+
<disabledPackageSources/>
9336
</configuration>

‎azure-pipelines.yml‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ extends:
143143
parameters:
144144
enableMicrobuild: true
145145
enableTelemetry: true
146-
enableSourceIndex: false
146+
enableSourceIndex: true
147147
runAsPublic: ${{ variables['runAsPublic'] }}
148148
# Publish build logs
149149
enablePublishBuildArtifacts: true
@@ -220,6 +220,51 @@ extends:
220220
isWindows: false
221221
warnAsError: 0
222222

223+
# ----------------------------------------------------------------
224+
# This stage performs quality gates enforcements
225+
# ----------------------------------------------------------------
226+
- stage: codecoverage
227+
displayName: CodeCoverage
228+
dependsOn:
229+
- build
230+
condition: and(succeeded('build'), ne(variables['SkipQualityGates'], 'true'))
231+
variables:
232+
- template: /eng/common/templates-official/variables/pool-providers.yml@self
233+
jobs:
234+
- template: /eng/common/templates-official/jobs/jobs.yml@self
235+
parameters:
236+
enableMicrobuild: true
237+
enableTelemetry: true
238+
runAsPublic: ${{ variables['runAsPublic'] }}
239+
workspace:
240+
clean: all
241+
242+
# ----------------------------------------------------------------
243+
# This stage downloads the code coverage reports from the build jobs,
244+
# merges those and validates the combined test coverage.
245+
# ----------------------------------------------------------------
246+
jobs:
247+
- job: CodeCoverageReport
248+
timeoutInMinutes: 180
249+
250+
pool:
251+
name: NetCore1ESPool-Internal
252+
image: 1es-mariner-2
253+
os: linux
254+
255+
preSteps:
256+
- checkout: self
257+
clean: true
258+
persistCredentials: true
259+
fetchDepth: 1
260+
261+
steps:
262+
- script: $(Build.SourcesDirectory)/build.sh --ci --restore
263+
displayName: Init toolset
264+
265+
- template: /eng/pipelines/templates/VerifyCoverageReport.yml
266+
267+
223268
# ----------------------------------------------------------------
224269
# This stage only performs a build treating warnings as errors
225270
# to detect any kind of code style violations
@@ -275,6 +320,7 @@ extends:
275320
parameters:
276321
validateDependsOn:
277322
- build
323+
- codecoverage
278324
- correctness
279325
publishingInfraVersion: 3
280326
enableSymbolValidation: false

‎eng/MSBuild/Shared.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\EmptyCollections\*.cs" LinkBase="Shared\EmptyCollections" />
1212
</ItemGroup>
1313

14+
<ItemGroup Condition="'$(InjectSharedInstruments)' == 'true'">
15+
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\Instruments\*.cs" LinkBase="Shared\Instruments" />
16+
</ItemGroup>
17+
1418
<ItemGroup Condition="'$(InjectSharedRentedSpan)' == 'true'">
1519
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\Shared\RentedSpan\*.cs" LinkBase="Shared\RentedSpan" />
1620
</ItemGroup>

‎eng/Versions.props‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
33
<MajorVersion>9</MajorVersion>
4-
<MinorVersion>2</MinorVersion>
4+
<MinorVersion>3</MinorVersion>
55
<PatchVersion>0</PatchVersion>
66
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
77
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
@@ -10,11 +10,8 @@
1010
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
1111
<!--
1212
When DotNetFinalVersionKind is set to 'release', this branch will produce stable outputs for 'Shipping' packages
13-
14-
In 8.0, we shipped this package as stable even when it was in the dev stage, so we
15-
keep it as stable for compatiblity.
1613
-->
17-
<DotNetFinalVersionKind Condition="'$(DotNetFinalVersionKind)' == '' And ('$(Stage)' != 'dev' Or '$(Stage)' != 'preview' Or '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.Testing')">release</DotNetFinalVersionKind>
14+
<DotNetFinalVersionKind />
1815
<!-- Enabling this rule will cause build failures on undocumented public APIs. -->
1916
<SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
2017
</PropertyGroup>
@@ -66,7 +63,7 @@
6663
<SystemTextEncodingsWebVersion>9.0.2</SystemTextEncodingsWebVersion>
6764
<SystemNumericsTensorsVersion>9.0.2</SystemNumericsTensorsVersion>
6865
<SystemTextJsonVersion>9.0.2</SystemTextJsonVersion>
69-
<SystemThreadingChannelsVersion>9.0.1</SystemThreadingChannelsVersion>
66+
<SystemThreadingChannelsVersion>9.0.2</SystemThreadingChannelsVersion>
7067
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
7168
<MicrosoftAspNetCoreAppRefVersion>9.0.2</MicrosoftAspNetCoreAppRefVersion>
7269
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.2</MicrosoftAspNetCoreAppRuntimewinx64Version>

‎eng/packages/General.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
1212
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
1313
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
14-
<PackageVersion Include="OpenAI" Version="2.1.0" />
14+
<PackageVersion Include="OpenAI" Version="2.2.0-beta.1" />
1515
<PackageVersion Include="Polly" Version="8.4.2" />
1616
<PackageVersion Include="Polly.Core" Version="8.4.2" />
1717
<PackageVersion Include="Polly.Extensions" Version="8.4.2" />

‎eng/packages/TestOnly.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<PackageVersion Include="AutoFixture.AutoMoq" Version="4.17.0" />
5-
<PackageVersion Include="Azure.AI.OpenAI" Version="2.1.0" />
5+
<PackageVersion Include="Azure.AI.OpenAI" Version="2.2.0-beta.1" />
66
<PackageVersion Include="autofixture" Version="4.17.0" />
77
<PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
88
<PackageVersion Include="FluentAssertions" Version="6.11.0" />

‎eng/pipelines/templates/BuildAndTest.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,6 @@ parameters:
2323
default: false
2424

2525
steps:
26-
- task: PowerShell@2
27-
displayName: Setup Private Feeds Credentials
28-
condition: eq(variables['Agent.OS'], 'Windows_NT')
29-
inputs:
30-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
31-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
32-
env:
33-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
34-
35-
- task: Bash@3
36-
displayName: Setup Private Feeds Credentials
37-
condition: ne(variables['Agent.OS'], 'Windows_NT')
38-
inputs:
39-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
40-
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
41-
env:
42-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
43-
4426
- script: ${{ parameters.buildScript }}
4527
-restore
4628
/bl:${{ parameters.repoLogPath }}/restore.binlog

0 commit comments

Comments
 (0)