Skip to content

Modernize infrastructure #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jskeet merged 1 commit into from
Mar 31, 2026
Merged

Modernize infrastructure #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
with:
submodules: true

# Build with .NET 8.0 SDK
# Test with .NET 6.0 and 8.0
- name: Setup .NET 6.0 and 8.0
uses: actions/setup-dotnet@v3
# Build with .NET 10.0 SDK
# Test with .NET 8.0 and 10.0
- name: Setup .NET 8.0 and 10.0
uses: actions/setup-dotnet@v5.2.0
with:
dotnet-version: |
8.0.x
6.0.x
10.0.x
- name: Build
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
with:
submodules: true

# Build with .NET 8.0 SDK
# Test with .NET 6.0 and 8.0
- name: Setup .NET 6.0 and 8.0
uses: actions/setup-dotnet@v3
# Build with .NET 10.0 SDK
# Test with .NET 8.0 and 10.0
- name: Setup .NET 8.0 and 10.0
uses: actions/setup-dotnet@v5.2.0
with:
dotnet-version: |
8.0.x
6.0.x
10.0.x

- name: Build
run: |
Expand Down
254 changes: 0 additions & 254 deletions CloudEvents.sln
View file
Open in desktop

This file was deleted.

53 changes: 53 additions & 0 deletions CloudEvents.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/conformance/" />
<Folder Name="/conformance/format/">
<File Path="conformance/format/README.md" />
</Folder>
<Folder Name="/conformance/format/json/">
<File Path="conformance/format/json/invalid-batches.json" />
<File Path="conformance/format/json/invalid-events.json" />
<File Path="conformance/format/json/README.md" />
<File Path="conformance/format/json/valid-batches.json" />
<File Path="conformance/format/json/valid-events.json" />
</Folder>
<Folder Name="/conformance/format/protobuf/">
<File Path="conformance/format/protobuf/conformance_tests.proto" />
<File Path="conformance/format/protobuf/invalid-batches.json" />
<File Path="conformance/format/protobuf/invalid-events.json" />
<File Path="conformance/format/protobuf/README.md" />
<File Path="conformance/format/protobuf/valid-batches.json" />
<File Path="conformance/format/protobuf/valid-events.json" />
</Folder>
<Folder Name="/conformance/format/xml/">
<File Path="conformance/format/xml/invalid-batches.xml" />
<File Path="conformance/format/xml/invalid-events.xml" />
<File Path="conformance/format/xml/README.md" />
<File Path="conformance/format/xml/valid-batches.xml" />
<File Path="conformance/format/xml/valid-events.xml" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".gitignore" />
<File Path="appveyor.yml" />
<File Path="Directory.Packages.props" />
<File Path="LICENSE" />
<File Path="README.md" />
</Folder>
<Project Path="samples/CloudNative.CloudEvents.AspNetCoreSample/CloudNative.CloudEvents.AspNetCoreSample.csproj" />
<Project Path="samples/HttpSend/HttpSend.csproj" />
<Project Path="src/CloudNative.CloudEvents.Amqp/CloudNative.CloudEvents.Amqp.csproj" />
<Project Path="src/CloudNative.CloudEvents.AspNetCore/CloudNative.CloudEvents.AspNetCore.csproj" />
<Project Path="src/CloudNative.CloudEvents.Avro/CloudNative.CloudEvents.Avro.csproj" />
<Project Path="src/CloudNative.CloudEvents.Kafka/CloudNative.CloudEvents.Kafka.csproj" />
<Project Path="src/CloudNative.CloudEvents.Mqtt/CloudNative.CloudEvents.Mqtt.csproj" />
<Project Path="src/CloudNative.CloudEvents.NewtonsoftJson/CloudNative.CloudEvents.NewtonsoftJson.csproj" />
<Project Path="src/CloudNative.CloudEvents.Protobuf/CloudNative.CloudEvents.Protobuf.csproj" />
<Project Path="src/CloudNative.CloudEvents.SystemTextJson/CloudNative.CloudEvents.SystemTextJson.csproj" />
<Project Path="src/CloudNative.CloudEvents/CloudNative.CloudEvents.csproj" />
<Project Path="test/CloudNative.CloudEvents.IntegrationTests/CloudNative.CloudEvents.IntegrationTests.csproj" />
<Project Path="test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj" />
</Solution>
46 changes: 23 additions & 23 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<Project>
<ItemGroup>
<PackageVersion Include="AMQPNetLite" Version="2.4.11" />
<PackageVersion Include="AMQPNetLite.Serialization" Version="2.4.11" />
<PackageVersion Include="Apache.Avro" Version="1.11.3" />
<PackageVersion Include="Confluent.Kafka" Version="1.9.3" />
<PackageVersion Include="Google.Protobuf" Version="3.27.3" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.1.34" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.32" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="MQTTnet" Version="4.3.6.1152" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.runner.console" Version="2.9.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
</Project>
<ItemGroup>
<PackageVersion Include="AMQPNetLite" Version="2.5.1" />
<PackageVersion Include="AMQPNetLite.Serialization" Version="2.5.1" />
<PackageVersion Include="Apache.Avro" Version="1.12.1" />
<PackageVersion Include="Confluent.Kafka" Version="2.13.2" />
<PackageVersion Include="Google.Protobuf" Version="3.34.1" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="5.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.3.9" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.25" />
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201" />
<PackageVersion Include="MQTTnet" Version="4.3.7.1207" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="Nullable" Version="1.3.1" />
<PackageVersion Include="System.Memory" Version="4.6.3" />
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.5" />
<PackageVersion Include="System.Text.Json" Version="10.0.5" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.console" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion generate_protos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# See LICENSE file in the project root for full license information.

set -e
PROTOBUF_VERSION=22.0
PROTOBUF_VERSION=34.0

# Generates the classes for the protobuf event format

Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.400",
"version": "10.0.201",
"allowPrerelease": false,
"rollForward": "latestMinor"
}
Expand Down
4 changes: 2 additions & 2 deletions .../CloudNative.CloudEvents.AspNetCoreSample/CloudNative.CloudEvents.AspNetCoreSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/HttpSend/HttpSend.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This directory contains a sample ASP.NET Core application that exposes two endpo
To run the sample, execute the `dotnet run` command in the `CloudNative.CloudEvents.AspNetCoreSample` directory.

```shell
dotnet run --framework net6.0
dotnet run --framework net8.0
```

After running the web service using the command above, there are three strategies for sending requests to the web service.
Expand All @@ -20,7 +20,7 @@ After running the web service using the command above, there are three strategie
The `HttpSend` project provides a CLI tool for sending requests to the `/api/events/receive` endpoint exposed by the service. To use the tool, navigate to the `HttpSend` directory and execute the following command:

```shell
dotnet run --framework net6.0 --url https://localhost:5001/api/events/receive
dotnet run --framework net8.0 --url https://localhost:5001/api/events/receive
```

### Using the `.http` file
Expand Down
Loading
Loading