Skip to content

Commit a742d02

Browse files
joperezrjoperezr
authored
Merge internal changes (#6437)
2 parents 7b2620c + 5aab00e commit a742d02

File tree

103 files changed

+3413
-1671
lines changed

Some content is hidden

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

103 files changed

+3413
-1671
lines changed

‎eng/MSBuild/LegacySupport.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\RequiredMemberAttribute\*.cs" LinkBase="LegacySupport\RequiredMemberAttribute" />
88
</ItemGroup>
99

10+
<ItemGroup Condition="'$(InjectSystemIndexOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
11+
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\SystemIndex\*.cs" LinkBase="LegacySupport\SystemIndex" />
12+
</ItemGroup>
13+
1014
<ItemGroup Condition="'$(InjectDiagnosticAttributesOnLegacy)' == 'true' AND ('$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp3.1')">
1115
<Compile Include="$(MSBuildThisFileDirectory)\..\..\src\LegacySupport\DiagnosticAttributes\*.cs" LinkBase="LegacySupport\DiagnosticAttributes" />
1216
</ItemGroup>

‎eng/Version.Details.xml

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<!--
1212
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1313
-->
14-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
14+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1515
<!--
1616
When DotNetFinalVersionKind is set to 'release' (only for the release branches),
1717
the build will produce stable outputs for 'Shipping' packages.
1818
1919
This is used by the Arcade SDK (Publish.proj) to determine if the build is a release build or not.
2020
-->
21-
<DotNetFinalVersionKind />
21+
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
2222
<!-- Enabling this rule will cause build failures on undocumented public APIs. -->
2323
<SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
2424
</PropertyGroup>
@@ -34,55 +34,55 @@
3434
-->
3535
<PropertyGroup Label="Automated Maestro dependency updates">
3636
<!-- Packages from dotnet/runtime -->
37-
<MicrosoftBclAsyncInterfacesVersion>9.0.4</MicrosoftBclAsyncInterfacesVersion>
38-
<MicrosoftBclTimeProviderVersion>9.0.4</MicrosoftBclTimeProviderVersion>
39-
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.4</MicrosoftExtensionsCachingAbstractionsVersion>
40-
<MicrosoftExtensionsCachingMemoryVersion>9.0.4</MicrosoftExtensionsCachingMemoryVersion>
41-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.4</MicrosoftExtensionsConfigurationAbstractionsVersion>
42-
<MicrosoftExtensionsConfigurationBinderVersion>9.0.4</MicrosoftExtensionsConfigurationBinderVersion>
43-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.4</MicrosoftExtensionsConfigurationJsonVersion>
44-
<MicrosoftExtensionsConfigurationVersion>9.0.4</MicrosoftExtensionsConfigurationVersion>
45-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.4</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
46-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.4</MicrosoftExtensionsDependencyInjectionVersion>
47-
<MicrosoftExtensionsDiagnosticsVersion>9.0.4</MicrosoftExtensionsDiagnosticsVersion>
48-
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.4</MicrosoftExtensionsHostingAbstractionsVersion>
49-
<MicrosoftExtensionsHostingVersion>9.0.4</MicrosoftExtensionsHostingVersion>
50-
<MicrosoftExtensionsHttpVersion>9.0.4</MicrosoftExtensionsHttpVersion>
51-
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.4</MicrosoftExtensionsLoggingAbstractionsVersion>
52-
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.4</MicrosoftExtensionsLoggingConfigurationVersion>
53-
<MicrosoftExtensionsLoggingConsoleVersion>9.0.4</MicrosoftExtensionsLoggingConsoleVersion>
54-
<MicrosoftExtensionsLoggingVersion>9.0.4</MicrosoftExtensionsLoggingVersion>
55-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.4</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
56-
<MicrosoftExtensionsOptionsVersion>9.0.4</MicrosoftExtensionsOptionsVersion>
57-
<MicrosoftNETCoreAppRefVersion>9.0.4</MicrosoftNETCoreAppRefVersion>
58-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
59-
<SystemCollectionsImmutableVersion>9.0.4</SystemCollectionsImmutableVersion>
60-
<SystemConfigurationConfigurationManagerVersion>9.0.4</SystemConfigurationConfigurationManagerVersion>
61-
<SystemDiagnosticsDiagnosticSourceVersion>9.0.4</SystemDiagnosticsDiagnosticSourceVersion>
62-
<SystemDiagnosticsPerformanceCounterVersion>9.0.4</SystemDiagnosticsPerformanceCounterVersion>
63-
<SystemIOHashingVersion>9.0.4</SystemIOHashingVersion>
64-
<SystemIOPipelinesVersion>9.0.4</SystemIOPipelinesVersion>
65-
<SystemMemoryDataVersion>9.0.4</SystemMemoryDataVersion>
66-
<SystemNetHttpJsonVersion>9.0.4</SystemNetHttpJsonVersion>
67-
<SystemRuntimeCachingVersion>9.0.4</SystemRuntimeCachingVersion>
68-
<SystemSecurityCryptographyPkcsVersion>9.0.4</SystemSecurityCryptographyPkcsVersion>
69-
<SystemSecurityCryptographyXmlVersion>9.0.4</SystemSecurityCryptographyXmlVersion>
70-
<SystemTextEncodingsWebVersion>9.0.4</SystemTextEncodingsWebVersion>
71-
<SystemNumericsTensorsVersion>9.0.4</SystemNumericsTensorsVersion>
72-
<SystemTextJsonVersion>9.0.4</SystemTextJsonVersion>
73-
<SystemThreadingChannelsVersion>9.0.4</SystemThreadingChannelsVersion>
37+
<MicrosoftBclAsyncInterfacesVersion>9.0.5</MicrosoftBclAsyncInterfacesVersion>
38+
<MicrosoftBclTimeProviderVersion>9.0.5</MicrosoftBclTimeProviderVersion>
39+
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.5</MicrosoftExtensionsCachingAbstractionsVersion>
40+
<MicrosoftExtensionsCachingMemoryVersion>9.0.5</MicrosoftExtensionsCachingMemoryVersion>
41+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
42+
<MicrosoftExtensionsConfigurationBinderVersion>9.0.5</MicrosoftExtensionsConfigurationBinderVersion>
43+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.5</MicrosoftExtensionsConfigurationJsonVersion>
44+
<MicrosoftExtensionsConfigurationVersion>9.0.5</MicrosoftExtensionsConfigurationVersion>
45+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
46+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.5</MicrosoftExtensionsDependencyInjectionVersion>
47+
<MicrosoftExtensionsDiagnosticsVersion>9.0.5</MicrosoftExtensionsDiagnosticsVersion>
48+
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.5</MicrosoftExtensionsHostingAbstractionsVersion>
49+
<MicrosoftExtensionsHostingVersion>9.0.5</MicrosoftExtensionsHostingVersion>
50+
<MicrosoftExtensionsHttpVersion>9.0.5</MicrosoftExtensionsHttpVersion>
51+
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.5</MicrosoftExtensionsLoggingAbstractionsVersion>
52+
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.5</MicrosoftExtensionsLoggingConfigurationVersion>
53+
<MicrosoftExtensionsLoggingConsoleVersion>9.0.5</MicrosoftExtensionsLoggingConsoleVersion>
54+
<MicrosoftExtensionsLoggingVersion>9.0.5</MicrosoftExtensionsLoggingVersion>
55+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
56+
<MicrosoftExtensionsOptionsVersion>9.0.5</MicrosoftExtensionsOptionsVersion>
57+
<MicrosoftNETCoreAppRefVersion>9.0.5</MicrosoftNETCoreAppRefVersion>
58+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.5</MicrosoftNETCoreAppRuntimewinx64Version>
59+
<SystemCollectionsImmutableVersion>9.0.5</SystemCollectionsImmutableVersion>
60+
<SystemConfigurationConfigurationManagerVersion>9.0.5</SystemConfigurationConfigurationManagerVersion>
61+
<SystemDiagnosticsDiagnosticSourceVersion>9.0.5</SystemDiagnosticsDiagnosticSourceVersion>
62+
<SystemDiagnosticsPerformanceCounterVersion>9.0.5</SystemDiagnosticsPerformanceCounterVersion>
63+
<SystemIOHashingVersion>9.0.5</SystemIOHashingVersion>
64+
<SystemIOPipelinesVersion>9.0.5</SystemIOPipelinesVersion>
65+
<SystemMemoryDataVersion>9.0.5</SystemMemoryDataVersion>
66+
<SystemNetHttpJsonVersion>9.0.5</SystemNetHttpJsonVersion>
67+
<SystemRuntimeCachingVersion>9.0.5</SystemRuntimeCachingVersion>
68+
<SystemSecurityCryptographyPkcsVersion>9.0.5</SystemSecurityCryptographyPkcsVersion>
69+
<SystemSecurityCryptographyXmlVersion>9.0.5</SystemSecurityCryptographyXmlVersion>
70+
<SystemTextEncodingsWebVersion>9.0.5</SystemTextEncodingsWebVersion>
71+
<SystemNumericsTensorsVersion>9.0.5</SystemNumericsTensorsVersion>
72+
<SystemTextJsonVersion>9.0.5</SystemTextJsonVersion>
73+
<SystemThreadingChannelsVersion>9.0.5</SystemThreadingChannelsVersion>
7474
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
75-
<MicrosoftAspNetCoreAppRefVersion>9.0.4</MicrosoftAspNetCoreAppRefVersion>
76-
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.4</MicrosoftAspNetCoreAppRuntimewinx64Version>
77-
<MicrosoftAspNetCoreMvcTestingVersion>9.0.4</MicrosoftAspNetCoreMvcTestingVersion>
78-
<MicrosoftAspNetCoreTestHostVersion>9.0.4</MicrosoftAspNetCoreTestHostVersion>
79-
<MicrosoftExtensionsCachingSqlServerVersion>9.0.4</MicrosoftExtensionsCachingSqlServerVersion>
80-
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.4</MicrosoftExtensionsCachingStackExchangeRedisVersion>
81-
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.4</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
82-
<MicrosoftExtensionsHttpPollyVersion>9.0.4</MicrosoftExtensionsHttpPollyVersion>
83-
<MicrosoftExtensionsObjectPoolVersion>9.0.4</MicrosoftExtensionsObjectPoolVersion>
75+
<MicrosoftAspNetCoreAppRefVersion>9.0.5</MicrosoftAspNetCoreAppRefVersion>
76+
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
77+
<MicrosoftAspNetCoreMvcTestingVersion>9.0.5</MicrosoftAspNetCoreMvcTestingVersion>
78+
<MicrosoftAspNetCoreTestHostVersion>9.0.5</MicrosoftAspNetCoreTestHostVersion>
79+
<MicrosoftExtensionsCachingSqlServerVersion>9.0.5</MicrosoftExtensionsCachingSqlServerVersion>
80+
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
81+
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
82+
<MicrosoftExtensionsHttpPollyVersion>9.0.5</MicrosoftExtensionsHttpPollyVersion>
83+
<MicrosoftExtensionsObjectPoolVersion>9.0.5</MicrosoftExtensionsObjectPoolVersion>
8484
<!-- Dependencies from https://github.com/dotnet/efcore -->
85-
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.4</MicrosoftEntityFrameworkCoreSqliteVersion>
85+
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.5</MicrosoftEntityFrameworkCoreSqliteVersion>
8686
<!-- Dependencies from https://github.com/dotnet/arcade -->
8787
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25225.6</MicrosoftDotNetBuildTasksTemplatingVersion>
8888
</PropertyGroup>
@@ -108,8 +108,8 @@
108108
<MicrosoftExtensionsLoggingLTSVersion>8.0.1</MicrosoftExtensionsLoggingLTSVersion>
109109
<MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>
110110
<MicrosoftExtensionsOptionsLTSVersion>8.0.2</MicrosoftExtensionsOptionsLTSVersion>
111-
<MicrosoftNETCoreAppRefLTSVersion>8.0.14</MicrosoftNETCoreAppRefLTSVersion>
112-
<MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.14</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
111+
<MicrosoftNETCoreAppRefLTSVersion>8.0.16</MicrosoftNETCoreAppRefLTSVersion>
112+
<MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.16</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
113113
<SystemCollectionsImmutableLTSVersion>8.0.0</SystemCollectionsImmutableLTSVersion>
114114
<SystemConfigurationConfigurationManagerLTSVersion>8.0.1</SystemConfigurationConfigurationManagerLTSVersion>
115115
<SystemDiagnosticsDiagnosticSourceLTSVersion>8.0.1</SystemDiagnosticsDiagnosticSourceLTSVersion>
@@ -126,15 +126,17 @@
126126
<SystemTextJsonLTSVersion>8.0.5</SystemTextJsonLTSVersion>
127127
<SystemThreadingChannelsLTSVersion>8.0.0</SystemThreadingChannelsLTSVersion>
128128
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
129-
<MicrosoftAspNetCoreAppRefLTSVersion>8.0.15</MicrosoftAspNetCoreAppRefLTSVersion>
130-
<MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.15</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
131-
<MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.15</MicrosoftAspNetCoreMvcTestingLTSVersion>
132-
<MicrosoftAspNetCoreTestHostLTSVersion>8.0.15</MicrosoftAspNetCoreTestHostLTSVersion>
133-
<MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.15</MicrosoftExtensionsCachingSqlServerLTSVersion>
134-
<MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.15</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
135-
<MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.15</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
136-
<MicrosoftExtensionsHttpPollyLTSVersion>8.0.15</MicrosoftExtensionsHttpPollyLTSVersion>
137-
<MicrosoftExtensionsObjectPoolLTSVersion>8.0.15</MicrosoftExtensionsObjectPoolLTSVersion>
129+
<MicrosoftAspNetCoreAppRefLTSVersion>8.0.16</MicrosoftAspNetCoreAppRefLTSVersion>
130+
<MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.16</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
131+
<MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.16</MicrosoftAspNetCoreMvcTestingLTSVersion>
132+
<MicrosoftAspNetCoreTestHostLTSVersion>8.0.16</MicrosoftAspNetCoreTestHostLTSVersion>
133+
<MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.16</MicrosoftExtensionsCachingSqlServerLTSVersion>
134+
<MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.16</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
135+
<MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.16</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
136+
<MicrosoftExtensionsHttpPollyLTSVersion>8.0.16</MicrosoftExtensionsHttpPollyLTSVersion>
137+
<MicrosoftExtensionsObjectPoolLTSVersion>8.0.16</MicrosoftExtensionsObjectPoolLTSVersion>
138+
<!-- Dependencies from https://github.com/dotnet/efcore -->
139+
<MicrosoftEntityFrameworkCoreSqliteLTSVersion>8.0.16</MicrosoftEntityFrameworkCoreSqliteLTSVersion>
138140
</PropertyGroup>
139141
<!--
140142
@@ -154,21 +156,21 @@
154156
<MicrosoftCodeAnalysisVersion>4.8.0</MicrosoftCodeAnalysisVersion>
155157
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
156158
<!-- AI templates -->
157-
<AspireVersion>9.1.0</AspireVersion>
158-
<AspireAzureAIOpenAIVersion>9.1.0-preview.1.25121.10</AspireAzureAIOpenAIVersion>
159+
<AspireVersion>9.2.1</AspireVersion>
160+
<AspireAzureAIOpenAIVersion>9.2.1-preview.1.25222.1</AspireAzureAIOpenAIVersion>
159161
<AzureAIProjectsVersion>1.0.0-beta.6</AzureAIProjectsVersion>
160162
<AzureAIOpenAIVersion>2.2.0-beta.4</AzureAIOpenAIVersion>
161163
<AzureIdentityVersion>1.13.2</AzureIdentityVersion>
162164
<AzureSearchDocumentsVersion>11.6.0</AzureSearchDocumentsVersion>
163-
<CommunityToolkitAspireHostingOllamaVersion>9.3.1-beta.260</CommunityToolkitAspireHostingOllamaVersion>
164-
<CommunityToolkitAspireHostingSqliteVersion>9.3.1-beta.260</CommunityToolkitAspireHostingSqliteVersion>
165-
<CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion>9.3.1-beta.260</CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion>
166-
<CommunityToolkitAspireOllamaSharpVersion>9.3.1-beta.260</CommunityToolkitAspireOllamaSharpVersion>
165+
<CommunityToolkitAspireHostingOllamaVersion>9.4.1-beta.277</CommunityToolkitAspireHostingOllamaVersion>
166+
<CommunityToolkitAspireHostingSqliteVersion>9.4.1-beta.277</CommunityToolkitAspireHostingSqliteVersion>
167+
<CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion>9.4.1-beta.277</CommunityToolkitAspireMicrosoftEntityFrameworkCoreSqliteVersion>
168+
<CommunityToolkitAspireOllamaSharpVersion>9.4.1-beta.277</CommunityToolkitAspireOllamaSharpVersion>
167169
<MicrosoftExtensionsServiceDiscoveryVersion>9.2.0</MicrosoftExtensionsServiceDiscoveryVersion>
168-
<MicrosoftSemanticKernelConnectorsAzureAISearchVersion>1.45.0-preview</MicrosoftSemanticKernelConnectorsAzureAISearchVersion>
169-
<MicrosoftSemanticKernelConnectorsQdrantVersion>1.45.0-preview</MicrosoftSemanticKernelConnectorsQdrantVersion>
170-
<MicrosoftSemanticKernelCoreVersion>1.45.0</MicrosoftSemanticKernelCoreVersion>
171-
<OllamaSharpVersion>5.1.12</OllamaSharpVersion>
170+
<MicrosoftSemanticKernelConnectorsAzureAISearchVersion>1.47.0-preview</MicrosoftSemanticKernelConnectorsAzureAISearchVersion>
171+
<MicrosoftSemanticKernelConnectorsQdrantVersion>1.47.0-preview</MicrosoftSemanticKernelConnectorsQdrantVersion>
172+
<MicrosoftSemanticKernelCoreVersion>1.47.0</MicrosoftSemanticKernelCoreVersion>
173+
<OllamaSharpVersion>5.1.13</OllamaSharpVersion>
172174
<OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
173175
<PdfPigVersion>0.1.9</PdfPigVersion>
174176
<SystemLinqAsyncVersion>6.0.1</SystemLinqAsyncVersion>

0 commit comments

Comments
 (0)