Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ generated_code = true

# C# files
[*.cs]
# Formatting follows CSharpier; `dotnet csharpier check` enforces it in CI. These keys keep the IDE
# formatter consistent with it, and IDE0055 is off because some layouts, such as a multi-line
# constructor initializer before an empty body, cannot be expressed to it.
dotnet_diagnostic.IDE0055.severity = none

# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
Expand Down Expand Up @@ -82,8 +87,8 @@ dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
csharp_using_directive_placement = outside_namespace:suggestion
dotnet_sort_system_directives_first = true
csharp_prefer_braces = true:silent
csharp_preserve_single_line_blocks = true:none
csharp_preserve_single_line_statements = false:none
csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false
csharp_prefer_static_local_function = true:suggestion
csharp_prefer_simple_using_statement = false:none
csharp_style_prefer_switch_expression = true:suggestion
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
- name: Restore for the AOT RID graph
run: >
dotnet restore ObsWebSocket.Example/ObsWebSocket.Example.csproj
-p:TargetFramework=net10.0
-p:TargetFramework=net11.0
--runtime ${{ matrix.rid }}
-p:SelfContained=true
-p:PublishAot=true
Expand All @@ -190,7 +190,7 @@ jobs:
run: >
dotnet publish ObsWebSocket.Example/ObsWebSocket.Example.csproj
--configuration Release
--framework net10.0
--framework net11.0
--runtime ${{ matrix.rid }}
--self-contained true
-p:PublishAot=true
Expand Down
6 changes: 3 additions & 3 deletions ObsWebSocket.Codegen.Tasks/ObsWebSocket.Codegen.Tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Framework" Version="18.3.3" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.3.3" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="5.6.0" />
<PackageReference Include="Microsoft.Build.Framework" Version="18.10.1" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.10.1" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="5.9.0" />
</ItemGroup>
</Project>
8 changes: 3 additions & 5 deletions ObsWebSocket.Example/ObsWebSocket.Example.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
<TargetFramework>net11.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PublishAot>true</PublishAot>
<!-- PublishAot puts the runtime pack in the dependency graph, where the SDK baseline resolves to
an unpatched 10.0.x. Pin the patched one so security scanning sees what actually ships. -->
<RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'net10.0'"
>10.0.11</RuntimeFrameworkVersion>
<IsAotCompatible>true</IsAotCompatible>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion ObsWebSocket.StubAudit/ObsWebSocket.StubAudit.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<TargetFramework>net11.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 2 additions & 0 deletions ObsWebSocket.Tests/ObsWebSocket.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net10.0;net9.0;net11.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<OutputType>Exe</OutputType>
<EnableMSTestRunner>true</EnableMSTestRunner>
<LangVersion>15.0</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ integration.
[![NuGet Version](https://img.shields.io/nuget/v/ObsWebSocket.Core.svg?style=flat-square&logo=nuget&logoColor=white)](https://www.nuget.org/packages/ObsWebSocket.Core/)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg?style=flat-square)](https://opensource.org/licenses/MIT)

Targets `net11.0`, `net10.0` and `net9.0`. The `net11.0` target is built against a .NET 11 preview
Targets `net11.0`, `net10.0` and `net9.0`. The `net11.0` target is built against a .NET 11 prerelease
SDK until .NET 11 is released; `net10.0` and `net9.0` carry no preview dependency.

## Install
Expand Down
Loading