From a3f17cd2d5de746a462a0ec4500f33945e939602 Mon Sep 17 00:00:00 2001 From: Jimmy Bogard Date: Fri, 1 Jun 2018 09:34:32 -0500 Subject: [PATCH 1/2] Updating packages and marking for release --- Build.ps1 | 10 ++++++---- Directory.Build.props | 2 +- .../MediatR.Examples.AspNetCore.csproj | 8 ++++---- .../MediatR.Examples.Autofac.csproj | 6 +++--- .../MediatR.Examples.DryIoc.csproj | 4 ++-- .../MediatR.Examples.Lamar.csproj | 4 ++-- .../MediatR.Examples.LightInject.csproj | 6 +++--- .../MediatR.Examples.SimpleInjector.csproj | 6 +++--- .../MediatR.Examples.SimpleInjector/Program.cs | 12 ++++++------ .../MediatR.Examples.StructureMap.csproj | 6 +++--- .../MediatR.Examples.Unity.csproj | 9 ++------- .../MediatR.Examples.Windsor.csproj | 4 ++-- samples/MediatR.Examples/MediatR.Examples.csproj | 12 ++++++------ src/MediatR/MediatR.csproj | 4 ++-- test/MediatR.Tests/MediatR.Tests.csproj | 16 ++++++---------- 15 files changed, 51 insertions(+), 58 deletions(-) diff --git a/Build.ps1 b/Build.ps1 index c43b6d9d..1b6fa66d 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -24,8 +24,6 @@ function Exec if(Test-Path .\src\MediatR\artifacts) { Remove-Item .\src\MediatR\artifacts -Force -Recurse } -exec { & dotnet restore } - $branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL]; $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL]; $suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"] @@ -40,7 +38,11 @@ exec { & dotnet build MediatR.sln -c Release --version-suffix=$buildSuffix } Push-Location -Path .\test\MediatR.Tests -exec { & dotnet xunit -configuration Release --no-build } +try { + exec { & dotnet test -c Release --no-build --no-restore } +} finally { + Pop-Location +} Pop-Location @@ -50,7 +52,7 @@ foreach ($sample in $samples) { Push-Location -Path $sample try { - exec { & dotnet run -c Release --no-build } + exec { & dotnet run -c Release --no-build --no-restore } } catch { } finally { Pop-Location diff --git a/Directory.Build.props b/Directory.Build.props index 63346cca..acdebfa1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,6 +2,6 @@ Jimmy Bogard latest - 5.0.1-alpha-0002 + 5.0.1 diff --git a/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj b/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj index b51d5791..f9837c61 100644 --- a/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj +++ b/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 MediatR.Examples.AspNetCore Exe MediatR.Examples.AspNetCore @@ -13,8 +13,8 @@ - - + + diff --git a/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj b/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj index 835bf7bf..fc63a945 100644 --- a/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj +++ b/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 MediatR.Examples.Autofac Exe MediatR.Examples.Autofac @@ -13,7 +13,7 @@ - + diff --git a/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj b/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj index dd9e4ca0..39c71b0d 100644 --- a/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj +++ b/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 MediatR.Examples.DryIoc Exe MediatR.Examples.DryIoc diff --git a/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj b/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj index 6313232c..d3333679 100644 --- a/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj +++ b/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj @@ -2,12 +2,12 @@ Exe - netcoreapp2.0 + netcoreapp2.1 latest - + diff --git a/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj b/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj index 9e82ae76..2ac49014 100644 --- a/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj +++ b/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 MediatR.Examples.LightInject Exe MediatR.Examples.LightInject @@ -13,7 +13,7 @@ - + diff --git a/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj b/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj index 280388fe..dc4bab01 100644 --- a/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj +++ b/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 MediatR.Examples.SimpleInjector Exe MediatR.Examples.SimpleInjector @@ -13,7 +13,7 @@ - + diff --git a/samples/MediatR.Examples.SimpleInjector/Program.cs b/samples/MediatR.Examples.SimpleInjector/Program.cs index ee1202d1..22b743ca 100644 --- a/samples/MediatR.Examples.SimpleInjector/Program.cs +++ b/samples/MediatR.Examples.SimpleInjector/Program.cs @@ -33,21 +33,21 @@ private static IMediator BuildMediator(WrappingWriter writer) IncludeGenericTypeDefinitions = true, IncludeComposites = false, }); - container.RegisterCollection(typeof(INotificationHandler<>), notificationHandlerTypes); + container.Register(typeof(INotificationHandler<>), notificationHandlerTypes); - container.RegisterSingleton(writer); + container.Register(() => (TextWriter)writer, Lifestyle.Singleton); //Pipeline - container.RegisterCollection(typeof(IPipelineBehavior<,>), new [] + container.Register(typeof(IPipelineBehavior<,>), new [] { typeof(RequestPreProcessorBehavior<,>), typeof(RequestPostProcessorBehavior<,>), typeof(GenericPipelineBehavior<,>) }); - container.RegisterCollection(typeof(IRequestPreProcessor<>), new [] { typeof(GenericRequestPreProcessor<>) }); - container.RegisterCollection(typeof(IRequestPostProcessor<,>), new[] { typeof(GenericRequestPostProcessor<,>), typeof(ConstrainedRequestPostProcessor<,>) }); + container.Register(typeof(IRequestPreProcessor<>), new [] { typeof(GenericRequestPreProcessor<>) }); + container.Register(typeof(IRequestPostProcessor<,>), new[] { typeof(GenericRequestPostProcessor<,>), typeof(ConstrainedRequestPostProcessor<,>) }); - container.RegisterSingleton(new ServiceFactory(container.GetInstance)); + container.Register(() => new ServiceFactory(container.GetInstance), Lifestyle.Singleton); container.Verify(); diff --git a/samples/MediatR.Examples.StructureMap/MediatR.Examples.StructureMap.csproj b/samples/MediatR.Examples.StructureMap/MediatR.Examples.StructureMap.csproj index 9c8bcf6a..7ee46bb9 100644 --- a/samples/MediatR.Examples.StructureMap/MediatR.Examples.StructureMap.csproj +++ b/samples/MediatR.Examples.StructureMap/MediatR.Examples.StructureMap.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 MediatR.Examples.StructureMap Exe MediatR.Examples.StructureMap @@ -13,7 +13,7 @@ - + diff --git a/samples/MediatR.Examples.Unity/MediatR.Examples.Unity.csproj b/samples/MediatR.Examples.Unity/MediatR.Examples.Unity.csproj index 3f77d99e..1617a9b4 100644 --- a/samples/MediatR.Examples.Unity/MediatR.Examples.Unity.csproj +++ b/samples/MediatR.Examples.Unity/MediatR.Examples.Unity.csproj @@ -1,7 +1,7 @@  - net451 + netcoreapp2.1 MediatR.Examples.Unity Exe MediatR.Examples.Unity @@ -9,16 +9,11 @@ - + - - - - - diff --git a/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj b/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj index fa7287d3..0cd42412 100644 --- a/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj +++ b/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0 + netcoreapp2.1 MediatR.Examples.Windsor Exe MediatR.Examples.Windsor diff --git a/samples/MediatR.Examples/MediatR.Examples.csproj b/samples/MediatR.Examples/MediatR.Examples.csproj index 43cd2a9a..757b47df 100644 --- a/samples/MediatR.Examples/MediatR.Examples.csproj +++ b/samples/MediatR.Examples/MediatR.Examples.csproj @@ -1,4 +1,4 @@ - + net45;netstandard1.3;netstandard2.0 @@ -6,10 +6,6 @@ MediatR.Examples - - - - @@ -21,11 +17,15 @@ - + + + + + diff --git a/src/MediatR/MediatR.csproj b/src/MediatR/MediatR.csproj index 064bc17c..19dba07a 100644 --- a/src/MediatR/MediatR.csproj +++ b/src/MediatR/MediatR.csproj @@ -1,4 +1,4 @@ - + Simple, unambitious mediator implementation in .NET @@ -14,7 +14,7 @@ git://github.com/jbogard/mediatr - + diff --git a/test/MediatR.Tests/MediatR.Tests.csproj b/test/MediatR.Tests/MediatR.Tests.csproj index 4334b2ac..25cb53b8 100644 --- a/test/MediatR.Tests/MediatR.Tests.csproj +++ b/test/MediatR.Tests/MediatR.Tests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp1.1;netcoreapp2.0 + net461;netcoreapp2.1 MediatR.Tests MediatR.Tests @@ -11,21 +11,17 @@ - - + + - - + + + - - - 2.0.3 - - From cbb714624a05ac455137e83ecbff9d511a3c3a62 Mon Sep 17 00:00:00 2001 From: Jimmy Bogard Date: Fri, 1 Jun 2018 09:58:55 -0500 Subject: [PATCH 2/2] Manually installing 2.1 --- appveyor.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 7423d2db..636aa99b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,15 @@ version: '{build}' pull_requests: do_not_increment_build_number: true image: Visual Studio 2017 +## temporary until 2.1 sdk is installed +install: + - ps: $urlCurrent = "https://dotnetcli.blob.core.windows.net/dotnet/Sdk/2.1.300/dotnet-sdk-2.1.300-win-x64.zip" + - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk" + - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null + - ps: $tempFileCurrent = [System.IO.Path]::GetTempFileName() + - ps: (New-Object System.Net.WebClient).DownloadFile($urlCurrent, $tempFileCurrent) + - ps: Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory($tempFileCurrent, $env:DOTNET_INSTALL_DIR) + - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path" nuget: disable_publish_on_pr: true build_script: