Skip to content

Commit 9d3fe4e

Browse files
author
Chris Young
committed
Merge branch 'hotfix/4.1.0' into develop
2 parents bfe6bf4 + aaf03c7 commit 9d3fe4e

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

build.cake

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var configuration = Argument("configuration", "Release");
1313
var treatWarningsAsErrors = Argument("treatWarningsAsErrors", "false");
1414
var solutionPath = MakeAbsolute(File(Argument("solutionPath", "./ArchitectNow.Framework.sln")));
1515
var includeSymbols = Argument("includeSymbols", "false");
16+
var myGetApiKey = Argument("myGetApiKey", "")
1617

1718
//////////////////////////////////////////////////////////////////////
1819
// PREPARATION
@@ -22,7 +23,7 @@ var testAssemblies = "./tests/**/bin/" +configuration +"/*.Tests.dll";
2223

2324
var artifacts = MakeAbsolute(Directory(Argument("artifactPath", "./artifacts")));
2425
var versionAssemblyInfo = MakeAbsolute(File(Argument("versionAssemblyInfo", "VersionAssemblyInfo.cs")));
25-
var analysisReports = MakeAbsolute(Directory(Argument("analysisReports", "./analysis")));
26+
var analysisReports = MakeAbsolute(Directory(Argument("analysisReports", "./analysis")));
2627

2728
IEnumerable<FilePath> nugetProjectPaths = null;
2829
SolutionParserResult solution = null;
@@ -291,9 +292,13 @@ Task("MyGet-Upload-Artifacts")
291292

292293
foreach(var nupkg in GetFiles(artifacts + "/*.nupkg")) {
293294
Information("Pushing: " + nupkg);
294-
NuGetPush(nupkg, new NuGetPushSettings {
295+
var settings = new NuGetPushSettings {
295296
Source = nugetFeed
296-
});
297+
};
298+
if(string.IsNullOrEmpty(myGetApiKey)){
299+
settings.ApiKey = myGetApiKey
300+
}
301+
NuGetPush(nupkg, settings);
297302
}
298303
});
299304

src/ArchitectNow.Web/Configuration/WebApiExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void ConfigureApi(this IServiceCollection services)
2121
*************************/
2222

2323
services.AddAntiforgery(options => options.HeaderName = "X-XSRF-TOKEN");
24-
24+
services.AddRouting(options => options.LowercaseUrls = true);
2525
services.AddMvc(o =>
2626
{
2727
o.Filters.AddService(typeof(GlobalExceptionFilter));

src/ArchitectNow.Web/Models/SwaggerOptions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class SwaggerOptions
2020
public string SwaggerUiRoute { get; set; } = "/docs";
2121
public IEnumerable<Type> Controllers { get; set; }
2222
public Action<SwaggerUiSettings> Configure { get; set; }
23+
2324
public IList<IDocumentProcessor> DocumentProcessors { get; set; } = new List<IDocumentProcessor>();
2425

2526
public SwaggerOptions(bool includeAuthorizationHeader = true)

0 commit comments

Comments
 (0)