Skip to content

Commit 3f5d538

Browse files
authored
Merge pull request #905 from Sergio0694/dev/update-packages
Update to .NET 9.0.200 SDK, fix build errors
2 parents 0ec9d7a + ba9d37b commit 3f5d538

File tree

41 files changed

+81
-84
lines changed

Some content is hidden

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

41 files changed

+81
-84
lines changed

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ dotnet_style_prefer_inferred_tuple_names = true:warning
9595
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
9696
csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
9797

98+
# Disable 'Use collection expression for fluent (IDE0305)'. The rationale is that it's that collection
99+
# expressions can be hard to read when having sequences of multiple chained fluent invocations (eg. LINQ).
100+
# See: https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0305.
101+
dotnet_style_prefer_collection_expression = false
102+
98103
# Field preferences
99104
dotnet_style_readonly_field = true:warning
100105

.globalconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ dotnet_diagnostic.CA2242.severity = warning
6969

7070
dotnet_diagnostic.IDE0010.severity = none
7171
dotnet_diagnostic.IDE0130.severity = none
72-
dotnet_diagnostic.IDE0060.severity = none
7372
dotnet_diagnostic.IDE1006.severity = warning
7473
dotnet_diagnostic.IDE0023.severity = none
7574
dotnet_diagnostic.IDE0024.severity = none
76-
dotnet_diagnostic.IDE0060.severity = none
7775
dotnet_diagnostic.IDE0057.severity = none
7876
dotnet_diagnostic.IDE0046.severity = none
7977
dotnet_diagnostic.IDE0072.severity = none

build/Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@
5959
since in order to use these APIs the caller already has to be in an unsafe context.
6060
-->
6161
<NoWarn>$(NoWarn);CS8500</NoWarn>
62-
63-
<!--
64-
We are using the UWP support for .NET 9, which is currently in preview. The warning from the .NET 9 SDK
65-
about this feature being in preview is unnecessary and it just produces a lot of noise, so we can disable it.
66-
-->
67-
<NoWarn>$(NoWarn);NETSDK1219</NoWarn>
6862
</PropertyGroup>
6963

7064
<!-- Centralized location for all generated artifacts -->

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": "9.0.100",
3+
"version": "9.0.200",
44
"rollForward": "latestFeature",
55
"allowPrerelease": false
66
}

samples/ComputeSharp.Benchmark/ComputeSharp.Benchmark.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
22-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
22+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

samples/ComputeSharp.ImageProcessing/ComputeSharp.ImageProcessing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
12+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

samples/ComputeSharp.Sample.FSharp/ComputeSharp.Sample.FSharp.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Update="FSharp.Core" Version="9.0.100" />
10+
<PackageReference Update="FSharp.Core" Version="9.0.201" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

samples/ComputeSharp.SwapChain.Cli/ComputeSharp.SwapChain.Cli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</ItemGroup>
5959

6060
<ItemGroup>
61-
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.1" />
61+
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
6262
</ItemGroup>
6363

6464
<ItemGroup>

samples/ComputeSharp.SwapChain.D2D1.Cli/ComputeSharp.SwapChain.D2D1.Cli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</PropertyGroup>
6161

6262
<ItemGroup>
63-
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.1" />
63+
<PackageReference Include="TerraFX.Interop.Windows" Version="10.0.26100.2" />
6464

6565
<!--
6666
Reference CsWinRT locally for the source generators (see comments in ComputeSharp.D2D1.WinUI).

samples/ComputeSharp.SwapChain.D2D1.Uwp/ComputeSharp.SwapChain.D2D1.Uwp.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1212
<EnableMsixTooling>true</EnableMsixTooling>
1313
<EnableXamlCompilerTargetsForUwpApps>false</EnableXamlCompilerTargetsForUwpApps>
14+
15+
<!-- Temporary workaround until VS 17.14 GA -->
16+
<MicrosoftWindowsSdkBuildToolsMSIXPackageVersion>1.3.20250314.1</MicrosoftWindowsSdkBuildToolsMSIXPackageVersion>
1417
</PropertyGroup>
1518

1619
<!-- NativeAOT settings, and size saving options for unnecessary features (optimize for speed otherwise) -->

0 commit comments

Comments
 (0)