diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e34b4cc0..cc2146b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
- master
jobs:
build:
- runs-on: windows-latest
+ runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -19,10 +19,6 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- - name: Setup dotnet 3.1
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: '3.1.x'
- name: Build and Test
run: ./Build.ps1
shell: pwsh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d694e1ae..8a6c1e84 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,9 +8,9 @@ jobs:
build:
strategy:
matrix:
- os: [windows-latest]
+ os: [ubuntu-latest]
fail-fast: false
- runs-on: windows-latest
+ runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
@@ -20,10 +20,6 @@ jobs:
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- - name: Setup dotnet 3.1
- uses: actions/setup-dotnet@v1
- with:
- dotnet-version: '3.1.x'
- name: Build and Test
run: ./Build.ps1
shell: pwsh
diff --git a/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj b/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
index dd3724de..dd0af346 100644
--- a/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
+++ b/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj b/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
index 452d8480..ecc05080 100644
--- a/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
+++ b/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj b/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
index c3e6d9af..379a8cfe 100644
--- a/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
+++ b/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/MediatR.Examples.DryIoc/Program.cs b/samples/MediatR.Examples.DryIoc/Program.cs
index c08dabe5..eb3d9763 100644
--- a/samples/MediatR.Examples.DryIoc/Program.cs
+++ b/samples/MediatR.Examples.DryIoc/Program.cs
@@ -20,7 +20,7 @@ private static IMediator BuildMediator(WrappingWriter writer)
var container = new Container();
container.RegisterDelegate(r => r.Resolve);
- container.UseInstance(writer);
+ container.Use(writer);
//Pipeline works out of the box here
diff --git a/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj b/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj
index aa790fa1..ae542eb6 100644
--- a/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj
+++ b/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj b/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj
index b9b3011c..fc7d0ea3 100644
--- a/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj
+++ b/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj b/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj
index ae5f9cc7..8257e437 100644
--- a/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj
+++ b/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj b/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj
index 043dffb4..23a54e24 100644
--- a/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj
+++ b/samples/MediatR.Examples.Stashbox/MediatR.Examples.Stashbox.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj b/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj
index a182e9e3..42de0193 100644
--- a/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj
+++ b/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/MediatR/MediatR.csproj b/src/MediatR/MediatR.csproj
index 0ed2df5f..a5085668 100644
--- a/src/MediatR/MediatR.csproj
+++ b/src/MediatR/MediatR.csproj
@@ -29,6 +29,6 @@
-
+
diff --git a/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj b/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj
index ea39b27a..92133dc5 100644
--- a/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj
+++ b/test/MediatR.Benchmarks/MediatR.Benchmarks.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/test/MediatR.Tests/MediatR.Tests.csproj b/test/MediatR.Tests/MediatR.Tests.csproj
index ead9d545..e83c46ce 100644
--- a/test/MediatR.Tests/MediatR.Tests.csproj
+++ b/test/MediatR.Tests/MediatR.Tests.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.1
+ net6.0
@@ -10,11 +10,11 @@
-
+
-
+
all
runtime; build; native; contentfiles; analyzers