Merge pull request #273 from jbogard/update-packages

Updating packages and marking for release
jbogard · Jun 1, 2018 · 242edcd · 242edcd
2 parents a833811 + cbb7146
commit 242edcd
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 58 deletions.
diff --git 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
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Authors>Jimmy Bogard</Authors>
     <LangVersion>latest</LangVersion>
-    <VersionPrefix>5.0.1-alpha-0002</VersionPrefix>
+    <VersionPrefix>5.0.1</VersionPrefix>
   </PropertyGroup>
 </Project>
diff --git 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:

diff --git a/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj b/samples/MediatR.Examples.AspNetCore/MediatR.Examples.AspNetCore.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.AspNetCore</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.AspNetCore</PackageId>
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="Scrutor" Version="2.1.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
+    <PackageReference Include="Scrutor" Version="2.2.2" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj b/samples/MediatR.Examples.Autofac/MediatR.Examples.Autofac.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.Autofac</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.Autofac</PackageId>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="4.6.2" />
+    <PackageReference Include="Autofac" Version="4.8.1" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj b/samples/MediatR.Examples.DryIoc/MediatR.Examples.DryIoc.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.DryIoc</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.DryIoc</PackageId>

diff --git a/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj b/samples/MediatR.Examples.Lamar/MediatR.Examples.Lamar.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Lamar" Version="0.9.1" />
+    <PackageReference Include="Lamar" Version="0.9.9" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj b/samples/MediatR.Examples.LightInject/MediatR.Examples.LightInject.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.LightInject</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.LightInject</PackageId>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LightInject" Version="5.1.2" />
+    <PackageReference Include="LightInject" Version="5.1.3" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj b/samples/MediatR.Examples.SimpleInjector/MediatR.Examples.SimpleInjector.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.SimpleInjector</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.SimpleInjector</PackageId>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SimpleInjector" Version="4.0.12" />
+    <PackageReference Include="SimpleInjector" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git 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<TextWriter>(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
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.StructureMap</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.StructureMap</PackageId>
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="structuremap" Version="4.5.3" />
+    <PackageReference Include="structuremap" Version="4.6.1" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/MediatR.Examples.Unity/MediatR.Examples.Unity.csproj b/samples/MediatR.Examples.Unity/MediatR.Examples.Unity.csproj
@@ -1,24 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.Unity</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.Unity</PackageId>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Unity" Version="5.8.4" />
+    <PackageReference Include="Unity.Container" Version="5.8.6" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MediatR.Examples\MediatR.Examples.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj b/samples/MediatR.Examples.Windsor/MediatR.Examples.Windsor.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>MediatR.Examples.Windsor</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>MediatR.Examples.Windsor</PackageId>

diff --git a/samples/MediatR.Examples/MediatR.Examples.csproj b/samples/MediatR.Examples/MediatR.Examples.csproj
@@ -1,15 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <AssemblyName>MediatR.Examples</AssemblyName>
     <PackageId>MediatR.Examples</PackageId>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.4.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\MediatR\MediatR.csproj" />
   </ItemGroup>
@@ -21,11 +17,15 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Linq" Version="4.3.0" />
     <PackageReference Include="System.Runtime" Version="4.3.0" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/MediatR/MediatR.csproj b/src/MediatR/MediatR.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Simple, unambitious mediator implementation in .NET</Description>
@@ -14,7 +14,7 @@
     <RepositoryUrl>git://github.com/jbogard/mediatr</RepositoryUrl>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>

diff --git a/test/MediatR.Tests/MediatR.Tests.csproj b/test/MediatR.Tests/MediatR.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>MediatR.Tests</AssemblyName>
     <PackageId>MediatR.Tests</PackageId>
   </PropertyGroup>
@@ -11,21 +11,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.0-beta.2.build4010" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="Shouldly" Version="3.0.0" />
-    <PackageReference Include="structuremap" Version="4.5.3" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+    <PackageReference Include="structuremap" Version="4.6.1" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.2.build4010" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.1" />
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <RuntimeFrameworkVersion>2.0.3</RuntimeFrameworkVersion>
-  </PropertyGroup>
-
 </Project>