Skip to content

Commit a244ff1

Browse files
committed
Merge in 'release/8.0' changes
2 parents 9cd97f4 + 9ee54e5 commit a244ff1

File tree

66 files changed

+1604
-604
lines changed

Some content is hidden

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

66 files changed

+1604
-604
lines changed

eng/Baseline.Designer.props

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

eng/Baseline.xml

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

eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ and are generated based on the last package release.
186186

187187
<ItemGroup Label="External dependencies" Condition="'$(DotNetBuildFromSource)' != 'true'">
188188
<LatestPackageReference Include="AngleSharp" />
189+
<LatestPackageReference Include="Azure.Identity" />
189190
<LatestPackageReference Include="BenchmarkDotNet" />
190191
<LatestPackageReference Include="CommandLineParser" />
191192
<LatestPackageReference Include="FSharp.Core" />

eng/Tools.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Since this project is evaluated before .npmproj files are loaded, this should cause the package to end up in
88
the NuGet cache ahead of time. This is not needed in source build.
99
-->
10-
<PackageReference Include="Yarn.MSBuild" Version="1.22.10" />
10+
<PackageReference Include="Yarn.MSBuild" Version="1.22.19" />
1111
</ItemGroup>
1212

1313
<!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->

eng/Versions.props

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PropertyGroup Label="Version settings">
99
<AspNetCoreMajorVersion>8</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
11-
<AspNetCorePatchVersion>2</AspNetCorePatchVersion>
11+
<AspNetCorePatchVersion>3</AspNetCorePatchVersion>
1212
<PreReleaseVersionIteration>
1313
</PreReleaseVersionIteration>
1414
<ValidateBaseline>true</ValidateBaseline>
@@ -285,6 +285,7 @@
285285
<MicrosoftAspNetCoreAzureAppServicesSiteExtension70x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension70x64Version>
286286
<MicrosoftAspNetCoreAzureAppServicesSiteExtension70x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension70Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension70x86Version>
287287
<!-- 3rd party dependencies -->
288+
<AzureIdentityVersion>1.10.2</AzureIdentityVersion>
288289
<AngleSharpVersion>0.9.9</AngleSharpVersion>
289290
<BenchmarkDotNetVersion>0.13.0</BenchmarkDotNetVersion>
290291
<CastleCoreVersion>4.2.1</CastleCoreVersion>
@@ -313,8 +314,8 @@
313314
<MicrosoftPlaywrightVersion>1.28.0</MicrosoftPlaywrightVersion>
314315
<PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
315316
<PollyVersion>7.2.4</PollyVersion>
316-
<SeleniumSupportVersion>4.14.1</SeleniumSupportVersion>
317-
<SeleniumWebDriverVersion>4.14.1</SeleniumWebDriverVersion>
317+
<SeleniumSupportVersion>4.17.0</SeleniumSupportVersion>
318+
<SeleniumWebDriverVersion>4.17.0</SeleniumWebDriverVersion>
318319
<SerilogExtensionsLoggingVersion>1.4.0</SerilogExtensionsLoggingVersion>
319320
<SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion>
320321
<StackExchangeRedisVersion>2.6.122</StackExchangeRedisVersion>
@@ -327,7 +328,7 @@
327328
<XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
328329
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
329330
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
330-
<MicrosoftDataSqlClientVersion>4.0.1</MicrosoftDataSqlClientVersion>
331+
<MicrosoftDataSqlClientVersion>4.0.5</MicrosoftDataSqlClientVersion>
331332
<MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
332333
<MicrosoftOpenApiVersion>1.4.3</MicrosoftOpenApiVersion>
333334
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->

eng/targets/Wix.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PropertyGroup>
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProductVersion>3.14</ProductVersion>
7-
<WixVersion>1.0.0-v3.14.0.5722</WixVersion>
7+
<WixVersion>3.14.0-8606.20240208.1</WixVersion>
88
</PropertyGroup>
99

1010
<PropertyGroup>

eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
37-
<PackageReference Include="Microsoft.Signed.Wix" Version="1.0.0-v3.14.0.5722" />
37+
<PackageReference Include="Microsoft.Signed.Wix" Version="3.14.0-8606.20240208.1" />
3838
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3939

4040
<Reference Include="Microsoft.Build" />

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "8.0.101"
3+
"version": "8.0.102"
44
},
55
"tools": {
6-
"dotnet": "8.0.101",
6+
"dotnet": "8.0.102",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
@@ -26,7 +26,7 @@
2626
"xcopy-msbuild": "17.1.0"
2727
},
2828
"msbuild-sdks": {
29-
"Yarn.MSBuild": "1.22.10",
29+
"Yarn.MSBuild": "1.22.19",
3030
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4",
3131
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4"
3232
}

src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<Reference Include="Microsoft.Extensions.Caching.Abstractions" />
2020
<Reference Include="Microsoft.Extensions.Options" />
2121
<Reference Include="Microsoft.Data.SqlClient" />
22+
<Reference Include="Azure.Identity" />
2223
</ItemGroup>
2324

2425
<ItemGroup>

src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
<Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
2020
<Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
2121
<Compile Include="$(SharedSourceRoot)QueryStringEnumerable.cs" LinkBase="Shared" />
22+
<Compile Include="$(SharedSourceRoot)UrlDecoder\UrlDecoder.cs" LinkBase="Shared" />
2223
</ItemGroup>
2324

2425
<Import Project="Microsoft.AspNetCore.Components.Routing.targets" />
25-
26+
2627
<ItemGroup>
2728
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
2829
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />

0 commit comments

Comments
 (0)