Updated azure to latest +semver:minor

RocketSurgeonsGuild · Jun 4, 2018 · d539a90 · d539a90
1 parent 4cd994c
commit d539a90
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,8 +18,7 @@ before_script:
 - 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
@@ -7,33 +7,29 @@
     </PropertyGroup>
     <PropertyGroup>
         <RSG_Build_Version>2.0.0</RSG_Build_Version>
-        <RSG_Builders_Version>1.0.2</RSG_Builders_Version>
-        <RSG_Configuration_Version>0.4.2</RSG_Configuration_Version>
-        <RSG_DependencyInjection_Version>0.6.2</RSG_DependencyInjection_Version>
-        <RSG_Extensions_Version>0.7.0</RSG_Extensions_Version>
-        <RSG_Hosting_Version>0.2.7</RSG_Hosting_Version>
+        <RSG_Builders_Version>2.0.1</RSG_Builders_Version>
+        <RSG_Configuration_Version>0.5.0</RSG_Configuration_Version>
+        <RSG_DependencyInjection_Version>0.7.0</RSG_DependencyInjection_Version>
+        <RSG_Extensions_Version>0.8.1</RSG_Extensions_Version>
         <Microsoft_NET_Sdk_Functions_Version>1.0.7</Microsoft_NET_Sdk_Functions_Version>
         <Autofac_Extras_CommonServiceLocator_Version>5.0.0</Autofac_Extras_CommonServiceLocator_Version>
         <Autofac_Version>4.6.2</Autofac_Version>
-        <NodaTime_Version>2.2.4</NodaTime_Version>
+        <NodaTime_Version>2.3.0</NodaTime_Version>
         <NodaTime_Serialization_Version>2.0.0</NodaTime_Serialization_Version>
-        <Newtonsoft_Json_Version>11.0.1</Newtonsoft_Json_Version>
+        <Newtonsoft_Json_Version>11.0.2</Newtonsoft_Json_Version>
         <WindowsAzure_Storage_Version>9.1.0</WindowsAzure_Storage_Version>
         <Microsoft_Azure_WebJobs_Version>3.0.0-beta5</Microsoft_Azure_WebJobs_Version>
-        <Microsoft_Extensions_Logging_Version>2.0.0</Microsoft_Extensions_Logging_Version>
-        <Microsoft_Extensions_Options_Version>2.0.0</Microsoft_Extensions_Options_Version>
-        <SourceLink_Version>2.8.0</SourceLink_Version>
-        <Microsoft_NET_Test_Sdk_Version>15.6.1</Microsoft_NET_Test_Sdk_Version>
+        <Microsoft_Extensions_Logging_Version>2.1.0</Microsoft_Extensions_Logging_Version>
+        <Microsoft_Extensions_Hosting_Version>2.1.0</Microsoft_Extensions_Hosting_Version>
+        <Microsoft_Extensions_Options_Version>2.1.0</Microsoft_Extensions_Options_Version>
+        <SourceLink_Version>2.8.1</SourceLink_Version>
+        <Microsoft_NET_Test_Sdk_Version>15.7.2</Microsoft_NET_Test_Sdk_Version>
         <xunit_Version>2.3.1</xunit_Version>
-        <FluentAssertions_Version>5.2.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.5</Bogus_Version>
-        <RSG_Testing_Version>0.4.1</RSG_Testing_Version>
-    </PropertyGroup>
-    <!-- Overrides -->
-    <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3' or '$(TargetFramework)'=='net451'">
-        <Microsoft_Extensions_Logging_Version>1.1.2</Microsoft_Extensions_Logging_Version>
-        <Microsoft_Extensions_Options_Version>1.1.2</Microsoft_Extensions_Options_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/samples/FunctionApp1/Function1.cs b/samples/FunctionApp1/Function1.cs
@@ -25,7 +25,6 @@
 using Rocket.Surgery.Conventions.Scanners;
 using Rocket.Surgery.Extensions.Configuration;
 using Rocket.Surgery.Extensions.DependencyInjection;
-using Rocket.Surgery.Hosting;
 using ConfigurationBuilder = Rocket.Surgery.Extensions.Configuration.ConfigurationBuilder;
 using ExecutionContext = Microsoft.Azure.WebJobs.ExecutionContext;
 

diff --git a/samples/FunctionApp1/FunctionApp1.csproj b/samples/FunctionApp1/FunctionApp1.csproj
@@ -7,6 +7,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.13" />
+        <PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_Version)" />
         <PackageReference Include="Microsoft.Azure.WebJobs" Version="$(Microsoft_Azure_WebJobs_Version)" />
         <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="$(Microsoft_Azure_WebJobs_Version)" />
         <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="$(Microsoft_Azure_WebJobs_Version)" />

diff --git a/src/Azure.Functions/FunctionExecutor.cs b/src/Azure.Functions/FunctionExecutor.cs
@@ -4,12 +4,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting.Internal;
 using Microsoft.Extensions.Logging;
 using Rocket.Surgery.Conventions.Reflection;
 using Rocket.Surgery.Conventions.Scanners;
 using Rocket.Surgery.Extensions.Configuration;
 using Rocket.Surgery.Extensions.DependencyInjection;
-using Rocket.Surgery.Hosting;
 using Rocket.Surgery.Reflection.Extensions;
 using EnvironmentVariablesExtensions = Microsoft.Extensions.Configuration.EnvironmentVariablesExtensions;
 using ExecutionContext = Microsoft.Azure.WebJobs.ExecutionContext;
@@ -39,12 +39,12 @@ static IServiceProvider Init(ILogger logger, ExecutionContext executionContext)
                     "Functions"
                 };
 
-                var envionment = new HostingEnvironment(
-                    environmentNames.First(x => !string.IsNullOrEmpty(x)),
-                    applicationNames.First(x => !string.IsNullOrEmpty(x)),
-                    executionContext.FunctionAppDirectory,
-                    executionContext.FunctionDirectory
-                );
+                var envionment = new HostingEnvironment {
+                    EnvironmentName = environmentNames.First(x => !string.IsNullOrEmpty(x)),
+                    ApplicationName = applicationNames.First(x => !string.IsNullOrEmpty(x)),
+                    ContentRootPath = executionContext.FunctionAppDirectory,
+                    ContentRootFileProvider = null
+                };
 
                 var services = new ServiceCollection();
 

diff --git a/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj b/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj
@@ -3,22 +3,14 @@
         <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
-      <PackageReference Include="Microsoft.Azure.WebJobs" Version="$(Microsoft_Azure_WebJobs_Version)" />
-      <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="$(Microsoft_Azure_WebJobs_Version)" />
-      <!--        <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="$(Microsoft_Azure_WebJobs_Version)" />-->
-        <!--<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="$(Microsoft_NET_Sdk_Functions_Version)" NoWarn="True" />-->
+		<PackageReference Include="Microsoft.Azure.WebJobs" Version="$(Microsoft_Azure_WebJobs_Version)" />
+		<PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="$(Microsoft_Azure_WebJobs_Version)" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(Microsoft_Extensions_Hosting_Version)" />
         <PackageReference Include="Rocket.Surgery.Extensions" Version="$(RSG_Extensions_Version)" />
         <PackageReference Include="Rocket.Surgery.Extensions.DependencyInjection" Version="$(RSG_DependencyInjection_Version)" />
         <PackageReference Include="Rocket.Surgery.Extensions.Configuration" Version="$(RSG_Configuration_Version)" />
-        <PackageReference Include="Rocket.Surgery.Hosting" Version="$(RSG_Hosting_Version)" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="$(Microsoft_Extensions_Logging_Version)" />
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net461'">
-        <PackageReference Include="NETStandard.Library" Version="2.0.0" NoWarn="true" PrivateAssets="All" />
-    </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3' or '$(TargetFramework)'=='net451'">
-        <PackageReference Include="NETStandard.Library" Version="1.6.1" NoWarn="true" PrivateAssets="All" />
-    </ItemGroup>
     <ItemGroup>
         <None Include="build/*.*" Pack="true" PackagePath="build" />
         <None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />

diff --git a/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj b/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard1.3;net451;netstandard2.0;net461</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzure_Storage_Version)" />

diff --git a/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj b/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj
@@ -1,14 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+        <TargetFrameworks>netcoreapp2.0;netcoreapp2.1;net461</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\src\Azure.Functions\Rocket.Surgery.Azure.Functions.csproj" />
         <ProjectReference Include="..\..\src\Azure.Storage\Rocket.Surgery.Azure.Storage.csproj" />
-        <PackageReference Include="Rocket.Surgery.Hosting" Version="$(RSG_Hosting_Version)" />
         <PackageReference Include="Newtonsoft.Json" Version="$(Newtonsoft_Json_Version)" />
     </ItemGroup>
-    <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0' or '$(TargetFramework)'=='net461'">
-        <PackageReference Include="NETStandard.Library" Version="2.0.1" NoWarn="true" PrivateAssets="All" />
-    </ItemGroup>
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))" />
     <PropertyGroup>
-        <RuntimeFrameworkVersion>2.0.6</RuntimeFrameworkVersion>
         <IsPackable>false</IsPackable>
         <PreserveCompilationContext>true</PreserveCompilationContext>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

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/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>