From a8e867b2fb7eaa3df0e7bf37107b8a7074466d69 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Fri, 30 Dec 2016 18:01:59 +0000 Subject: [PATCH] add missing stylecop file and fix local warnings --- build/Program.cs | 4 ++++ src/ImageSharp.Drawing/project.json | 4 ++-- src/ImageSharp.Formats.Bmp/project.json | 2 +- src/ImageSharp.Formats.Gif/project.json | 2 +- src/ImageSharp.Formats.Jpeg/project.json | 2 +- src/ImageSharp.Formats.Png/project.json | 2 +- src/ImageSharp.Formats/project.json | 10 +++++----- src/ImageSharp.Processing/stylecop.json | 9 +++++++++ tests/ImageSharp.Benchmarks/project.json | 10 +++++----- tests/ImageSharp.Tests/project.json | 8 ++++---- 10 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 src/ImageSharp.Processing/stylecop.json diff --git a/build/Program.cs b/build/Program.cs index 13056a6eb..cda3f6236 100644 --- a/build/Program.cs +++ b/build/Program.cs @@ -16,6 +16,8 @@ namespace ConsoleApplication public static void Main(string[] args) { + // TODO add options to updating the version number for indirvidual projects + var resetmode = args.Contains("reset"); // find the project root where glbal.json lives @@ -97,6 +99,8 @@ namespace ConsoleApplication var sb = new StringBuilder(); foreach (var p in projects) { + //TODO force update of all dependent projects to point to the newest build. + //we skip the build number and standard CI prefix on first commits var newVersion = p.CalculateVersionNumber(branch); File.Copy(p.FullProjectFilePath, $"{p.FullProjectFilePath}.bak", true); diff --git a/src/ImageSharp.Drawing/project.json b/src/ImageSharp.Drawing/project.json index 1a0512981..487c26da8 100644 --- a/src/ImageSharp.Drawing/project.json +++ b/src/ImageSharp.Drawing/project.json @@ -39,11 +39,11 @@ "dependencies": { "ImageSharp": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "ImageSharp.Processing": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "StyleCop.Analyzers": { "version": "1.0.0", diff --git a/src/ImageSharp.Formats.Bmp/project.json b/src/ImageSharp.Formats.Bmp/project.json index 9c5da69b6..a646b9a72 100644 --- a/src/ImageSharp.Formats.Bmp/project.json +++ b/src/ImageSharp.Formats.Bmp/project.json @@ -37,7 +37,7 @@ "dependencies": { "ImageSharp": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "StyleCop.Analyzers": { "version": "1.1.0-beta001", diff --git a/src/ImageSharp.Formats.Gif/project.json b/src/ImageSharp.Formats.Gif/project.json index 90db84c5c..e1aa864d1 100644 --- a/src/ImageSharp.Formats.Gif/project.json +++ b/src/ImageSharp.Formats.Gif/project.json @@ -37,7 +37,7 @@ "dependencies": { "ImageSharp": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "StyleCop.Analyzers": { "version": "1.1.0-beta001", diff --git a/src/ImageSharp.Formats.Jpeg/project.json b/src/ImageSharp.Formats.Jpeg/project.json index 6ca42be0d..c920fe69e 100644 --- a/src/ImageSharp.Formats.Jpeg/project.json +++ b/src/ImageSharp.Formats.Jpeg/project.json @@ -37,7 +37,7 @@ "dependencies": { "ImageSharp": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "StyleCop.Analyzers": { "version": "1.1.0-beta001", diff --git a/src/ImageSharp.Formats.Png/project.json b/src/ImageSharp.Formats.Png/project.json index 097bce1c1..014935b08 100644 --- a/src/ImageSharp.Formats.Png/project.json +++ b/src/ImageSharp.Formats.Png/project.json @@ -37,7 +37,7 @@ "dependencies": { "ImageSharp": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "StyleCop.Analyzers": { "version": "1.1.0-beta001", diff --git a/src/ImageSharp.Formats/project.json b/src/ImageSharp.Formats/project.json index a2e204001..80b7f0141 100644 --- a/src/ImageSharp.Formats/project.json +++ b/src/ImageSharp.Formats/project.json @@ -37,23 +37,23 @@ "dependencies": { "ImageSharp": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "ImageSharp.Formats.Png": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "ImageSharp.Formats.Bmp": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "ImageSharp.Formats.Jpeg": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "ImageSharp.Formats.Gif": { "target": "project", - "version": "1.0.0-alpha1-*" + "version": "1.0.0-*" }, "StyleCop.Analyzers": { "version": "1.1.0-beta001", diff --git a/src/ImageSharp.Processing/stylecop.json b/src/ImageSharp.Processing/stylecop.json new file mode 100644 index 000000000..df8f120a5 --- /dev/null +++ b/src/ImageSharp.Processing/stylecop.json @@ -0,0 +1,9 @@ +{ + "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", + "settings": { + "documentationRules": { + "companyName": "James Jackson-South", + "copyrightText": "Copyright (c) James Jackson-South and contributors.\nLicensed under the Apache License, Version 2.0." + } + } +} \ No newline at end of file diff --git a/tests/ImageSharp.Benchmarks/project.json b/tests/ImageSharp.Benchmarks/project.json index 74f091c34..329a58ec1 100644 --- a/tests/ImageSharp.Benchmarks/project.json +++ b/tests/ImageSharp.Benchmarks/project.json @@ -17,20 +17,20 @@ "BenchmarkDotNet.Diagnostics.Windows": "0.10.1", "ImageSharp": { "target": "project", - "version": "*" + "version": "1.0.0-*" }, "ImageSharp.Drawing": { "target": "project", - "version": "*" + "version": "1.0.0-*" }, "ImageSharp.Formats": { "target": "project", - "version": "*" + "version": "1.0.0-*" }, "ImageSharp.Processing": { "target": "project", - "version": "*" - }, + "version": "1.0.0-*" + } }, "commands": { "ImageSharp.Benchmarks": "ImageSharp.Benchmarks" diff --git a/tests/ImageSharp.Tests/project.json b/tests/ImageSharp.Tests/project.json index 396aa5236..f295f7fa3 100644 --- a/tests/ImageSharp.Tests/project.json +++ b/tests/ImageSharp.Tests/project.json @@ -22,21 +22,21 @@ "dependencies": { "ImageSharp": { "target": "project", - "version": "*" + "version": "1.0.0-*" }, "xunit": "2.2.0-*", "dotnet-test-xunit": "2.2.0-*", "ImageSharp.Drawing": { "target": "project", - "version": "*" + "version": "1.0.0-*" }, "ImageSharp.Formats": { "target": "project", - "version": "*" + "version": "1.0.0-*" }, "ImageSharp.Processing": { "target": "project", - "version": "*" + "version": "1.0.0-*" } }, "frameworks": {