From d539a90d6331eeb2121ed964068a69fc009a4f0e Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Sun, 3 Jun 2018 21:46:37 -0400 Subject: [PATCH] Updated azure to latest +semver:minor --- .travis.yml | 3 +- Common.Build.props | 36 +++++++++---------- cake.config | 6 ---- cakefile.cake | 2 +- samples/FunctionApp1/Function1.cs | 1 - samples/FunctionApp1/FunctionApp1.csproj | 1 + src/Azure.Functions/FunctionExecutor.cs | 14 ++++---- .../Rocket.Surgery.Azure.Functions.csproj | 14 ++------ .../Rocket.Surgery.Azure.Storage.csproj | 2 +- .../Rocket.Surgery.Azure.Tests.csproj | 6 +--- test/Directory.Build.props | 1 - test/Directory.Build.targets | 2 +- tools/packages.config | 4 +-- 13 files changed, 33 insertions(+), 59 deletions(-) delete mode 100644 cake.config diff --git a/.travis.yml b/.travis.yml index d29d1af0..fe444c06 100644 --- 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 index 25dedcd1..36c0b4f7 100644 --- a/Common.Build.props +++ b/Common.Build.props @@ -7,33 +7,29 @@ 2.0.0 - 1.0.2 - 0.4.2 - 0.6.2 - 0.7.0 - 0.2.7 + 2.0.1 + 0.5.0 + 0.7.0 + 0.8.1 1.0.7 5.0.0 4.6.2 - 2.2.4 + 2.3.0 2.0.0 - 11.0.1 + 11.0.2 9.1.0 3.0.0-beta5 - 2.0.0 - 2.0.0 - 2.8.0 - 15.6.1 + 2.1.0 + 2.1.0 + 2.1.0 + 2.8.1 + 15.7.2 2.3.1 - 5.2.0 - 4.5.1 + 5.3.2 + 4.6.0 5.0.0 - 22.0.5 - 0.4.1 - - - - 1.1.2 - 1.1.2 + 22.1.2 + 0.5.0 + 2.0.0 diff --git a/cake.config b/cake.config deleted file mode 100644 index d79d70ff..00000000 --- a/cake.config +++ /dev/null @@ -1,6 +0,0 @@ -[Paths] -Tools=./tools -Addins=./tools -[Nuget] -UseInprocessClient=true -LoadDependencies=true diff --git a/cakefile.cake b/cakefile.cake index 2a7055ac..60f787d5 100644 --- 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 index f40b6103..a3452675 100644 --- 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 index cf6925bc..4403609a 100644 --- a/samples/FunctionApp1/FunctionApp1.csproj +++ b/samples/FunctionApp1/FunctionApp1.csproj @@ -7,6 +7,7 @@ + diff --git a/src/Azure.Functions/FunctionExecutor.cs b/src/Azure.Functions/FunctionExecutor.cs index b931dbff..861b689c 100644 --- 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 index b7569ceb..e2cd3926 100644 --- a/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj +++ b/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj @@ -3,22 +3,14 @@ netstandard2.0;net461 - - - - + + + - - - - - - - diff --git a/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj b/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj index 3789f9c8..17ac266c 100644 --- a/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj +++ b/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj @@ -1,6 +1,6 @@ - netstandard1.3;net451;netstandard2.0;net461 + netstandard2.0;net461 diff --git a/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj b/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj index a231c1ae..1b89583c 100644 --- a/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj +++ b/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj @@ -1,14 +1,10 @@ - netcoreapp2.0;net461 + netcoreapp2.0;netcoreapp2.1;net461 - - - - diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 9c3ade48..929f7bfe 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,7 +1,6 @@ - 2.0.6 false true true diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 92710a89..8ae553c5 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -9,7 +9,7 @@ - + diff --git a/tools/packages.config b/tools/packages.config index d585e781..3c65df89 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -1,6 +1,4 @@ - - - +