Skip to content
This repository has been archived by the owner on Apr 4, 2020. It is now read-only.

fix: update Octopus.Client NuGet package to support Octopus >3.11.2 #75

Merged
merged 2 commits into from Mar 15, 2017
Merged

fix: update Octopus.Client NuGet package to support Octopus >3.11.2 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd7bd9f
fix: update Octopus.Client NuGet package to support Octopus >3.11.2
p-ob Mar 8, 2017
b57265f
chore: upgrade appveyor to use official VS 2017 image
p-ob Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 17 additions & 17 deletions Kraken.sln
View file
Open in desktop
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26020.0
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "~", "~", "{6E1D3CA4-2CAF-4FF8-B318-CB5D865879EF}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -34,28 +34,28 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x64.ActiveCfg = Debug|x64
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x64.Build.0 = Debug|x64
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x86.ActiveCfg = Debug|x86
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x86.Build.0 = Debug|x86
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x64.ActiveCfg = Debug|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x64.Build.0 = Debug|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x86.ActiveCfg = Debug|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Debug|x86.Build.0 = Debug|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|Any CPU.Build.0 = Release|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x64.ActiveCfg = Release|x64
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x64.Build.0 = Release|x64
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x86.ActiveCfg = Release|x86
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x86.Build.0 = Release|x86
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x64.ActiveCfg = Release|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x64.Build.0 = Release|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x86.ActiveCfg = Release|Any CPU
{B1315FB3-A9A4-446E-B9DE-9B9E56865555}.Release|x86.Build.0 = Release|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x64.ActiveCfg = Debug|x64
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x64.Build.0 = Debug|x64
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x86.ActiveCfg = Debug|x86
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x86.Build.0 = Debug|x86
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x64.ActiveCfg = Debug|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x64.Build.0 = Debug|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x86.ActiveCfg = Debug|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Debug|x86.Build.0 = Debug|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|Any CPU.Build.0 = Release|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x64.ActiveCfg = Release|x64
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x64.Build.0 = Release|x64
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x86.ActiveCfg = Release|x86
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x86.Build.0 = Release|x86
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x64.ActiveCfg = Release|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x64.Build.0 = Release|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x86.ActiveCfg = Release|Any CPU
{80BB68DD-4DDE-4A28-8D53-70D636F58A5A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
@@ -1,5 +1,5 @@
version: '{build}'
os: Visual Studio 2017 RC
os: Visual Studio 2017
cache: C:\Users\appveyor\.nuget\packages
build_script:
- ps: >-
Expand Down
92 changes: 46 additions & 46 deletions src/Kraken/Kraken.csproj
View file
Open in desktop
@@ -1,48 +1,48 @@
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup Label="Configuration">
<AssemblyName>Kraken</AssemblyName>
<RootNamespace>Kraken</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
</PropertyGroup>
<PropertyGroup>
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.0-preview4-final" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.1.0-preview4-final" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink.Loader" Version="14.1.0" />
<PackageReference Include="NuGet.Client" Version="4.0.0-rc3" />
<PackageReference Include="NuGet.Protocol.Core.Types" Version="4.0.0-rc3" />
<PackageReference Include="NuGet.Protocol.Core.v3" Version="4.0.0-rc3" />
<PackageReference Include="Octopus.Client" Version="4.6.1" />
</ItemGroup>
<Target Name="PrepublishScript" BeforeTargets="Publish">
<Exec Command="npm install" />
<Exec Command="bower install" />
<Exec Command="gulp npmlib" />
<Exec Command="gulp clean" />
<Exec Command="gulp build" />
<Exec Command="gulp min" />
</Target>
<PropertyGroup Label="Configuration">
<AssemblyName>Kraken</AssemblyName>
<RootNamespace>Kraken</RootNamespace>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp1.1</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
</PropertyGroup>
<PropertyGroup>
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.1.0-preview4-final" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink.Loader" Version="14.1.0" />
<PackageReference Include="NuGet.Client" Version="4.0.0" />
<PackageReference Include="NuGet.Protocol.Core.Types" Version="4.0.0" />
<PackageReference Include="NuGet.Protocol.Core.v3" Version="4.0.0" />
<PackageReference Include="Octopus.Client" Version="4.13.2" />
</ItemGroup>
<Target Name="PrepublishScript" BeforeTargets="Publish">
<Exec Command="npm install" />
<Exec Command="bower install" />
<Exec Command="gulp npmlib" />
<Exec Command="gulp clean" />
<Exec Command="gulp build" />
<Exec Command="gulp min" />
</Target>
</Project>
30 changes: 15 additions & 15 deletions src/Kraken/Startup.cs
View file
Open in desktop
@@ -1,7 +1,7 @@
namespace Kraken
{
using System;
using Kraken.Filters;
using System;
using Kraken.Filters;
using Kraken.Models;
using Kraken.Security;
using Kraken.Services;
Expand Down Expand Up @@ -100,20 +100,20 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
MigrateDatabase(app, loggerFactory);
}

private void MigrateDatabase(IApplicationBuilder app, ILoggerFactory loggerFactory)
private static void MigrateDatabase(IApplicationBuilder app, ILoggerFactory loggerFactory)
{
var logger = loggerFactory.CreateLogger<Program>();
try
{
using (var serviceScope = app.ApplicationServices.CreateScope())
{
serviceScope.ServiceProvider.GetService<ApplicationDbContext>().Database.Migrate();
}
}
catch (Exception ex)
{
logger.LogCritical("Error while attempting to migrate database", ex);
}
var logger = loggerFactory.CreateLogger<Program>();
try
{
using (var serviceScope = app.ApplicationServices.CreateScope())
{
serviceScope.ServiceProvider.GetService<ApplicationDbContext>().Database.Migrate();
}
}
catch (Exception ex)
{
logger.LogCritical("Error while attempting to migrate database", ex);
}
}
}
}
8 changes: 4 additions & 4 deletions test/Kraken.Tests/Kraken.Tests.csproj
View file
Open in desktop
Expand Up @@ -7,10 +7,10 @@
<EmbeddedResource Include="**\*.resx" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170125-04" />
<PackageReference Include="Moq" Version="4.6.38-alpha" />
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="Moq" Version="4.7.1" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Kraken\Kraken.csproj" />
Expand Down