Skip to content

Commit 850b39f

Browse files
Update .NET SDK to 10.0.100-preview.2.25164.34 (#2138)
* Update .NET SDK Update .NET SDK to version 10.0.100-preview.2.25164.34. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: costellobot <[email protected]> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 10.0.100-preview.2.25164.34 SDK. Bumps Microsoft.AspNetCore.Mvc.Testing from 10.0.0-preview.1.25120.3 to 10.0.0-preview.2.25164.1. Bumps Microsoft.AspNetCore.OpenApi from 10.0.0-preview.1.25120.3 to 10.0.0-preview.2.25164.1. Bumps Microsoft.Extensions.Caching.Memory from 10.0.0-preview.1.25080.5 to 10.0.0-preview.2.25163.2. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.AspNetCore.OpenApi dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Caching.Memory dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: costellobot <[email protected]> * Bump OpenAPI package Update to Microsoft.OpenApi 2.0.0-preview7. * Fix build Disable OpenAPI XML source generator due to compilation issues. --------- Signed-off-by: costellobot <[email protected]> Co-authored-by: martincostello <[email protected]>
1 parent 77d7112 commit 850b39f

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed

Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
1212
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.5.1" />
1313
<PackageVersion Include="MartinCostello.Testing.AwsLambdaTestServer" Version="0.9.0" />
14-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.1.25120.3" />
15-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-preview.1.25120.3" />
16-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.1.25080.5" />
14+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0-preview.2.25164.1" />
15+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-preview.2.25164.1" />
16+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.2.25163.2" />
1717
<PackageVersion Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
1818
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
19-
<PackageVersion Include="Microsoft.OpenApi" Version="2.0.0-preview5" />
19+
<PackageVersion Include="Microsoft.OpenApi" Version="2.0.0-preview7" />
2020
<PackageVersion Include="Microsoft.Playwright" Version="1.51.0" />
2121
<PackageVersion Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
2222
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="5.8.1" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.1.25120.13",
3+
"version": "10.0.100-preview.2.25164.34",
44
"allowPrerelease": false,
55
"rollForward": "latestMajor",
66
"paths": [ ".dotnet", "$host$" ],

src/AdventOfCode.Site/AdventOfCode.Site.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ItemGroup>
2626
<PackageReference Include="Amazon.Lambda.AspNetCoreServer.Hosting" />
2727
<PackageReference Include="Amazon.Lambda.RuntimeSupport" />
28-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
28+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" GeneratePathProperty="true" />
2929
<PackageReference Include="Microsoft.TypeScript.MSBuild" PrivateAssets="all" />
3030
<PackageReference Include="RazorSlices" />
3131
</ItemGroup>
@@ -60,4 +60,12 @@
6060
<RuntimeHostConfigurationOption Condition=" '%(PackageVersion.Identity)' == 'Microsoft.ICU.ICU4C.Runtime' " Include="System.Globalization.AppLocalIcu" Value="%(PackageVersion.Version)" />
6161
</ItemGroup>
6262
</Target>
63+
<!--
64+
HACK Workaround for https://github.com/dotnet/aspnetcore/issues/61037
65+
-->
66+
<Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
67+
<ItemGroup>
68+
<Analyzer Remove="$(PkgMicrosoft_AspNetCore_OpenApi)\analyzers\dotnet\cs\Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" />
69+
</ItemGroup>
70+
</Target>
6371
</Project>

tests/AdventOfCode.Tests/AdventOfCode.Tests.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,19 @@
2020
<PackageReference Include="MartinCostello.Logging.XUnit.v3" />
2121
<PackageReference Include="MartinCostello.Testing.AwsLambdaTestServer" />
2222
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
23+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" GeneratePathProperty="true" />
2324
<PackageReference Include="Microsoft.NET.Test.Sdk" />
2425
<PackageReference Include="Microsoft.Playwright" />
2526
<PackageReference Include="Shouldly" />
2627
<PackageReference Include="xunit.runner.visualstudio" />
2728
<PackageReference Include="xunit.v3" />
2829
</ItemGroup>
30+
<!--
31+
HACK Workaround for https://github.com/dotnet/aspnetcore/issues/61037
32+
-->
33+
<Target Name="DisableCompileTimeOpenApiXmlGenerator" BeforeTargets="CoreCompile">
34+
<ItemGroup>
35+
<Analyzer Remove="$(PkgMicrosoft_AspNetCore_OpenApi)\analyzers\dotnet\cs\Microsoft.AspNetCore.OpenApi.SourceGenerators.dll" />
36+
</ItemGroup>
37+
</Target>
2938
</Project>

0 commit comments

Comments
 (0)