Updated to latest mse 2.1 +semver: minor

RocketSurgeonsGuild · Jun 3, 2018 · b99e28a · b99e28a
1 parent b06f8d1
commit b99e28a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,8 +18,7 @@ before_script:
 - sudo mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
 - sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
 - sudo apt-get update
-- sudo apt-get install dotnet-dev-1.1.5
-- sudo apt-get install dotnet-sdk-2.1.103
+- sudo apt-get install dotnet-sdk-2.1.300
 script:
 - git fetch --unshallow
 - git fetch origin '+refs/heads/*:refs/heads/*'

diff --git a/Common.Build.props b/Common.Build.props
@@ -10,17 +10,14 @@
         <System_Interactive_Version>3.1.1</System_Interactive_Version>
         <System_Reactive_Version>3.1.1</System_Reactive_Version>
         <SourceLink_Version>2.8.1</SourceLink_Version>
-        <Microsoft_Extensions_Configuration_Version>2.0.0</Microsoft_Extensions_Configuration_Version>
-        <Microsoft_NET_Test_Sdk_Version>15.7.0</Microsoft_NET_Test_Sdk_Version>
+        <Microsoft_Extensions_Configuration_Version>2.1.0</Microsoft_Extensions_Configuration_Version>
+        <Microsoft_NET_Test_Sdk_Version>15.7.2</Microsoft_NET_Test_Sdk_Version>
         <xunit_Version>2.3.1</xunit_Version>
-        <FluentAssertions_Version>5.3.0</FluentAssertions_Version>
-        <FakeItEasy_Version>4.5.1</FakeItEasy_Version>
+        <FluentAssertions_Version>5.3.2</FluentAssertions_Version>
+        <FakeItEasy_Version>4.6.0</FakeItEasy_Version>
         <Autofac_FakeItEasy_Version>5.0.0</Autofac_FakeItEasy_Version>
-        <Bogus_Version>22.0.8</Bogus_Version>
-		<RSG_Testing_Version>0.4.1</RSG_Testing_Version>
-    </PropertyGroup>
-    <!-- Overrides -->
-    <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3' or '$(TargetFramework)'=='netstandard1.6' or '$(TargetFramework)'=='net451'">
-        <Microsoft_Extensions_Configuration_Version>1.1.2</Microsoft_Extensions_Configuration_Version>
+        <Bogus_Version>22.1.2</Bogus_Version>
+		<RSG_Testing_Version>0.5.0</RSG_Testing_Version>
+        <XunitXml_TestLogger_Version>2.0.0</XunitXml_TestLogger_Version>
     </PropertyGroup>
 </Project>
diff --git a/cake.config b/cake.config
diff --git a/cakefile.cake b/cakefile.cake
@@ -1,4 +1,4 @@
-#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.3.2";
+#load "nuget:?package=Rocket.Surgery.Cake.Library&version=0.4.1";
 
 Task("Default")
     .IsDependentOn("dotnet");

diff --git a/src/Extensions/Rocket.Surgery.Extensions.csproj b/src/Extensions/Rocket.Surgery.Extensions.csproj
@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
             <_Parameter1>Rocket.Surgery.Extensions.Tests</_Parameter1>
         </AssemblyAttribute>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-        <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
         <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(Microsoft_Extensions_Configuration_Version)" />
-        <PackageReference Condition="'$(TargetFramework)'=='netstandard1.6'" Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+        <PackageReference Condition="'$(TargetFramework)'=='netstandard2.0'" Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
     </ItemGroup>
 </Project>
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -9,7 +9,7 @@
         <PackageReference Include="Autofac.Extras.FakeItEasy" Version="$(Autofac_FakeItEasy_Version)" />
         <PackageReference Include="Bogus" Version="$(Bogus_Version)" />
 		<PackageReference Include="Rocket.Surgery.Extensions.Testing" Version="$(RSG_Testing_Version)" />
-        <DotNetCliToolReference Include="dotnet-xunit" Version="$(xunit_Version)" />
+        <PackageReference Include="XunitXml.TestLogger" Version="$(XunitXml_TestLogger_Version)" />
     </ItemGroup>
     <ItemGroup>
         <Content Include="xunit.runner.json">

diff --git a/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj b/test/Extensions.Tests/Rocket.Surgery.Extensions.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+        <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;net461</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\Extensions\Rocket.Surgery.Extensions.csproj" />

diff --git a/tools/packages.config b/tools/packages.config
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.26.1" />
-    <package id="Cake.BuildSystems.Module" version="0.2.0" />
-    <package id="Cake.Bakery" version="0.2.0" />
+    <package id="Cake" version="0.28.0" />
 </packages>