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
18 changes: 9 additions & 9 deletions .github/workflows/dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
variables:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: Create variables
outputs:
istag: ${{ steps.vars.outputs.is_tag }}
Expand All @@ -36,18 +36,19 @@ jobs:

strategy:
matrix:
os: [ macos-latest, windows-latest, ubuntu-latest ]
os: [ macos-26, windows-2025, ubuntu-24.04 ]


steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup .NET versions
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.0.x
9.0.x
10.0.x

- name: Install dependencies
run: dotnet restore
Expand All @@ -64,20 +65,19 @@ jobs:
run: dotnet test -v normal

- name: Save NuGet artifact
if: success() && needs.variables.outputs.istag == 'true' && matrix.os == 'ubuntu-latest'
uses: actions/upload-artifact@v4
if: success() && needs.variables.outputs.istag == 'true' && matrix.os == 'ubuntu-24.04'
uses: actions/upload-artifact@v7
with:
name: nuget-package
path: EventAggregator/bin/Release/Micky5991.EventAggregator.${{ needs.variables.outputs.ref }}.nupkg

release:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [ variables, build ]
if: needs.build.result == 'success' && needs.variables.outputs.istag == 'true'

steps:

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: nuget-package
path: artifacts/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Copyright>2024 Micky5991</Copyright>
<WarningsAsErrors>true</WarningsAsErrors>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion EventAggregator.Sample/EventAggregator.Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<AssemblyName>Micky5991.EventAggregator.Sample</AssemblyName>
<RootNamespace>Micky5991.EventAggregator.Sample</RootNamespace>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<LangVersion>13</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion EventAggregator.Tests/EventAggregator.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<IsPackable>false</IsPackable>
<LangVersion>13</LangVersion>

<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>

<AssemblyName>Micky5991.EventAggregator.Tests</AssemblyName>

Expand Down
34 changes: 0 additions & 34 deletions EventAggregator.sln

This file was deleted.

12 changes: 12 additions & 0 deletions EventAggregator.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Solution>
<Folder Name="/Solution Files/">
<File Path=".gitignore" />
<File Path="global.json" />
<File Path="LICENSE" />
<File Path="README.md" />
</Folder>
<Project Path="EventAggregator.OpenTelemetry/EventAggregator.OpenTelemetry.csproj" />
<Project Path="EventAggregator.Sample/EventAggregator.Sample.csproj" />
<Project Path="EventAggregator.Tests/EventAggregator.Tests.csproj" />
<Project Path="EventAggregator/EventAggregator.csproj" />
</Solution>
3 changes: 1 addition & 2 deletions EventAggregator/EventAggregator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Copyright>2024 Micky5991</Copyright>
<Nullable>enable</Nullable>
<WarningsAsErrors>true</WarningsAsErrors>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<PackageReadmeFile>README.md</PackageReadmeFile>
<LangVersion>13</LangVersion>
</PropertyGroup>
Expand All @@ -23,7 +23,6 @@
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.3.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "9.0.0",
"rollForward": "latestMajor",
"version": "10.0.100",
"rollForward": "latestMinor",
"allowPrerelease": false
}
}