From 49fa56c9fb445b199905926e06eadd9f0b769948 Mon Sep 17 00:00:00 2001 From: David Rhodes Date: Tue, 4 Apr 2017 11:01:02 -0600 Subject: [PATCH 01/15] Sample code and document formatting Public docs test [publish docs] --- src/Map/RasterTile.cs | 51 ++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/src/Map/RasterTile.cs b/src/Map/RasterTile.cs index a3eae8c..2010e11 100644 --- a/src/Map/RasterTile.cs +++ b/src/Map/RasterTile.cs @@ -4,40 +4,57 @@ // //----------------------------------------------------------------------- -using System; - -namespace Mapbox.Map { - - +namespace Mapbox.Map +{ /// - /// A raster tile from the Mapbox Style API, a encoded image representing a geographic - /// bounding box. Usually JPEG or PNG encoded. + /// A raster tile from the Mapbox Style API, an encoded image representing a geographic + /// bounding box. Usually JPEG or PNG encoded. + /// + /// How to use 'RasterTile': + /// + /// var parameters = new Tile.Parameters(); + /// parameters.Fs = MapboxAccess.Instance; + /// parameters.Id = new CanonicalTileId(_zoom, _tileCoorindateX, _tileCoordinateY); + /// parameters.MapId = "mapbox://styles/mapbox/satellite-v9"; + /// var rasterTile = new RasterTile(); + /// rasterTile.Initialize(parameters, (Action)(() => + /// { + /// if (string.IsNullOrEmpty(rasterTile.Error)) + /// { + /// return; + /// } + /// var texture = new Texture2D(0, 0); + /// texture.LoadImage(rasterTile.Data); + /// _sampleMaterial.mainTexture = texture; + /// })); + /// + /// /// - public class RasterTile : Tile { - + public class RasterTile : Tile + { private byte[] data; /// Gets the raster tile raw data. /// The raw data, usually an encoded JPEG or PNG. - public byte[] Data { - get { + public byte[] Data + { + get + { return this.data; } } - - internal override TileResource MakeTileResource(string styleUrl) { + internal override TileResource MakeTileResource(string styleUrl) + { return TileResource.MakeRaster(Id, styleUrl); } - - internal override bool ParseTileData(byte[] data) { + internal override bool ParseTileData(byte[] data) + { // We do not parse raster tiles as they are this.data = data; return true; } - - } } From a091f5ced7fe6536412ddf82b633e033b99567f5 Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Tue, 4 Apr 2017 19:39:54 +0200 Subject: [PATCH 02/15] commit message consisting of serveral lines and trying to [publish docs] --- scripts/build.csx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/build.csx b/scripts/build.csx index d3b0c53..82c2fce 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -20,6 +20,8 @@ Console.WriteLine("cwd [build.csx]: {0}", Directory.GetCurrentDirectory()); Directory.SetCurrentDirectory(rootDir); Console.WriteLine("cwd [build.csx]: {0}", Directory.GetCurrentDirectory()); string commitMessage = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE"); +string commitMessageEx = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED"); +if (!string.IsNullOrWhiteSpace(commitMessageEx)) { commitMessage += " " + commitMessageEx; } Console.WriteLine("commit message: \"{0}\"", commitMessage); string configuration = Environment.GetEnvironmentVariable("configuration"); From 4df08bcd02f1217cfa5221e6d7b7456bc0007e34 Mon Sep 17 00:00:00 2001 From: David Rhodes Date: Tue, 4 Apr 2017 12:53:04 -0600 Subject: [PATCH 03/15] Fixing tests that broke when introducing Vector2d (which flips latitude and longitude). --- test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs | 4 ++-- test/UnitTest/LonLatToGeoCoordinateConverterTest.cs | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs b/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs index eed7acd..2c57b52 100644 --- a/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs +++ b/test/UnitTest/BboxToGeoCoordinateBoundsConverterTest.cs @@ -17,8 +17,8 @@ internal class BboxToVector2dBoundsConverterTest private string geoCoordinateBoundsStr = "[38.9165,-77.0295,30.2211,-80.5521]"; private Vector2dBounds geoCoordinateBoundsObj = new Vector2dBounds( - sw: new Vector2d(x: -77.0295, y: 38.9165), - ne: new Vector2d(x: -80.5521, y: 30.2211)); + sw: new Vector2d(y: -77.0295, x: 38.9165), + ne: new Vector2d(y: -80.5521, x: 30.2211)); [Test] public void Deserialize() diff --git a/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs b/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs index 515ca33..e83fc61 100644 --- a/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs +++ b/test/UnitTest/LonLatToGeoCoordinateConverterTest.cs @@ -14,20 +14,23 @@ namespace Mapbox.UnitTest [TestFixture] internal class LonLatToVector2dConverterTest { + // Mapbox API returns longitude,latitude private string lonLatStr = "[-77.0295,38.9165]"; - private Vector2d lonLatObj = new Vector2d(x: -77.0295, y: 38.9165); + // In Unity, x = latitude, y = longitude + private Vector2d latLonObject = new Vector2d(y: -77.0295, x: 38.9165); + [Test] public void Deserialize() { Vector2d deserializedLonLat = JsonConvert.DeserializeObject(this.lonLatStr, JsonConverters.Converters); - Assert.AreEqual(this.lonLatObj.ToString(), deserializedLonLat.ToString()); + Assert.AreEqual(this.latLonObject.ToString(), deserializedLonLat.ToString()); } [Test] public void Serialize() { - string serializedLonLat = JsonConvert.SerializeObject(this.lonLatObj, JsonConverters.Converters); + string serializedLonLat = JsonConvert.SerializeObject(this.latLonObject, JsonConverters.Converters); Assert.AreEqual(this.lonLatStr, serializedLonLat); } } From 84e671dc1a653628ed08b6dfc53505c861bf79fe Mon Sep 17 00:00:00 2001 From: David Rhodes Date: Tue, 4 Apr 2017 12:53:42 -0600 Subject: [PATCH 04/15] Example comments and experimenting with syntax [publish docs] --- src/Map/RasterTile.cs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Map/RasterTile.cs b/src/Map/RasterTile.cs index 2010e11..c4bce38 100644 --- a/src/Map/RasterTile.cs +++ b/src/Map/RasterTile.cs @@ -17,15 +17,16 @@ namespace Mapbox.Map /// parameters.Id = new CanonicalTileId(_zoom, _tileCoorindateX, _tileCoordinateY); /// parameters.MapId = "mapbox://styles/mapbox/satellite-v9"; /// var rasterTile = new RasterTile(); + /// + /// // Make the request. /// rasterTile.Initialize(parameters, (Action)(() => /// { /// if (string.IsNullOrEmpty(rasterTile.Error)) /// { - /// return; + /// // Handle the error. /// } - /// var texture = new Texture2D(0, 0); - /// texture.LoadImage(rasterTile.Data); - /// _sampleMaterial.mainTexture = texture; + /// + /// // Consume the . /// })); /// /// @@ -36,6 +37,13 @@ public class RasterTile : Tile /// Gets the raster tile raw data. /// The raw data, usually an encoded JPEG or PNG. + /// What does this tag do? + /// + /// // Example usage in Unity + /// var texture = new Texture2D(0, 0); + /// texture.LoadImage(rasterTile.Data); + /// _sampleMaterial.mainTexture = texture; + /// public byte[] Data { get From 73cf8cb5a5fd003e1c84c670b15694faa8b4362d Mon Sep 17 00:00:00 2001 From: David Rhodes Date: Tue, 4 Apr 2017 13:09:19 -0600 Subject: [PATCH 05/15] order of commits failed proper doc publish? [publish docs] From 5eff5bc8a538864866500bd4f1c31fda98abeb36 Mon Sep 17 00:00:00 2001 From: David Rhodes Date: Tue, 4 Apr 2017 13:20:24 -0600 Subject: [PATCH 06/15] Fixing syntax [publish docs] --- src/Map/RasterTile.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Map/RasterTile.cs b/src/Map/RasterTile.cs index c4bce38..91820c0 100644 --- a/src/Map/RasterTile.cs +++ b/src/Map/RasterTile.cs @@ -9,8 +9,9 @@ namespace Mapbox.Map /// /// A raster tile from the Mapbox Style API, an encoded image representing a geographic /// bounding box. Usually JPEG or PNG encoded. + /// /// - /// How to use 'RasterTile': + /// Making a RasterTile request: /// /// var parameters = new Tile.Parameters(); /// parameters.Fs = MapboxAccess.Instance; @@ -30,20 +31,20 @@ namespace Mapbox.Map /// })); /// /// - /// public class RasterTile : Tile { private byte[] data; /// Gets the raster tile raw data. /// The raw data, usually an encoded JPEG or PNG. - /// What does this tag do? + /// + /// Consuming data in Unity to create a Texture2D: /// - /// // Example usage in Unity /// var texture = new Texture2D(0, 0); /// texture.LoadImage(rasterTile.Data); /// _sampleMaterial.mainTexture = texture; /// + /// public byte[] Data { get From 5c3ebf61202c799dcce0732d32093626ea0aba3b Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Wed, 5 Apr 2017 12:56:14 +0200 Subject: [PATCH 07/15] use newer docfx (remove deprecated 'docfx.msbuild') add build--docs.sh [publish docs] --- .gitignore | 2 + build-appveyor.bat | 1 + scripts/build-docs.sh | 12 ++ scripts/build.csx | 191 ++++++++++++------------- scripts/omnisharp.json | 54 +++++++ src/Documentation/Documentation.csproj | 11 +- src/Documentation/packages.config | 4 - 7 files changed, 165 insertions(+), 110 deletions(-) create mode 100644 scripts/build-docs.sh create mode 100644 scripts/omnisharp.json delete mode 100644 src/Documentation/packages.config diff --git a/.gitignore b/.gitignore index 6c002b0..428b431 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ # Autosave files *~ +docfx.zip +/docfx scriptcs/ nuget.exe *project.lock.json diff --git a/build-appveyor.bat b/build-appveyor.bat index aae9082..0b9bbf4 100644 --- a/build-appveyor.bat +++ b/build-appveyor.bat @@ -6,6 +6,7 @@ ECHO ~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~ SET ROOTDIR=%CD% SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% SET PATH=%CD%\scriptcs;%PATH% +SET PATH=%CD%\docfx;%PATH% FOR /F "tokens=*" %%i in ('powershell Get-ExecutionPolicy') do SET PSPOLICY=%%i ECHO Powershell execution policy^: %PSPOLICY% diff --git a/scripts/build-docs.sh b/scripts/build-docs.sh new file mode 100644 index 0000000..4642d99 --- /dev/null +++ b/scripts/build-docs.sh @@ -0,0 +1,12 @@ +set -eu + +echo docfx needs mono-devel to run + +if [ ! -f "docfx.zip" ]; then curl -o docfx.zip -L https://github.com/dotnet/docfx/releases/download/v2.15.1/docfx.zip; fi +if [ ! -d "docfx" ]; then mkdir -p docfx && unzip -o docfx.zip -d docfx; fi + +#Generating docs in one step ('docfx.exe docfx.json') fails with: +#System.Reflection.ReflectionTypeLoadException +#splitting in two steps works +mono ./docfx/docfx.exe metadata ./src/Documentation/docfx.json +mono ./docfx/docfx.exe build ./src/Documentatio/docfx.json diff --git a/scripts/build.csx b/scripts/build.csx index 82c2fce..1b9ed9b 100644 --- a/scripts/build.csx +++ b/scripts/build.csx @@ -8,9 +8,9 @@ using System.Text; using System.Text.RegularExpressions; string access_token = Environment.GetEnvironmentVariable("MAPBOX_ACCESS_TOKEN"); -if(string.IsNullOrWhiteSpace(access_token)){ - Console.Error.WriteLine("%MAPBOX_ACCESS_TOKEN% not set - cannot run tests"); - Environment.Exit(1); +if (string.IsNullOrWhiteSpace(access_token)) { + Console.Error.WriteLine("%MAPBOX_ACCESS_TOKEN% not set - cannot run tests"); + Environment.Exit(1); } //ATTENTION: latest version of `srciptcs` seems to change the current directory @@ -37,35 +37,30 @@ if (publishNuget) { Console.WriteLine("going to publish to nuget.org"); } if (publishDocs) { Console.WriteLine("going to publish docs"); } string nugetApiKey; -if (publishNuget) -{ - nugetApiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY"); - if (string.IsNullOrWhiteSpace(nugetApiKey)) - { - Console.Error.WriteLine("cannot publish to nuget.org without %NUGET_API_KEY%"); - Environment.Exit(1); - } +if (publishNuget) { + nugetApiKey = Environment.GetEnvironmentVariable("NUGET_API_KEY"); + if (string.IsNullOrWhiteSpace(nugetApiKey)) { + Console.Error.WriteLine("cannot publish to nuget.org without %NUGET_API_KEY%"); + Environment.Exit(1); + } } string githubToken; -if (publishDocs) -{ - githubToken = Environment.GetEnvironmentVariable("GITHUB_TOKEN"); - if (string.IsNullOrWhiteSpace(githubToken)) - { - Console.Error.WriteLine("cannot publish docs without %GITHUB_TOKEN%"); - Environment.Exit(1); - } +if (publishDocs) { + githubToken = Environment.GetEnvironmentVariable("GITHUB_TOKEN"); + if (string.IsNullOrWhiteSpace(githubToken)) { + Console.Error.WriteLine("cannot publish docs without %GITHUB_TOKEN%"); + Environment.Exit(1); + } } string versionDLL; string versionNupkg; -using (TextReader tr = new StreamReader("versions.txt")) -{ - versionDLL = tr.ReadLine().Split(":".ToCharArray())[1].Trim(); - versionNupkg = tr.ReadLine().Split(":".ToCharArray())[1].Trim(); +using (TextReader tr = new StreamReader("versions.txt")) { + versionDLL = tr.ReadLine().Split(":".ToCharArray())[1].Trim(); + versionNupkg = tr.ReadLine().Split(":".ToCharArray())[1].Trim(); } Console.WriteLine("configuration: {0}", configuration); @@ -76,15 +71,14 @@ Console.WriteLine(" - nupkg : {0}", versionNupkg); //////// PATCH SharedAssemblyInfo.cs string sharedAssemblyInfo = Path.Combine( - rootDir - , "src" - , "SharedAssemblyInfo.cs" + rootDir + , "src" + , "SharedAssemblyInfo.cs" ); Console.WriteLine("Patching [{0}] to version [{1}]", sharedAssemblyInfo, versionDLL); string assemblyInfo; -using (TextReader tr = new StreamReader(sharedAssemblyInfo, Encoding.UTF8)) -{ - assemblyInfo = tr.ReadToEnd(); +using (TextReader tr = new StreamReader(sharedAssemblyInfo, new UTF8Encoding(false))) { + assemblyInfo = tr.ReadToEnd(); } Console.WriteLine("old assemblyInfo:" + Environment.NewLine + assemblyInfo); Regex regex = new Regex("AssemblyVersion\\(\"([^)]*)"); @@ -93,25 +87,24 @@ regex = new Regex("AssemblyFileVersion\\(\"([^)]*)"); assemblyInfo = regex.Replace(assemblyInfo, string.Format("AssemblyFileVersion(\"{0}\"", versionDLL)); Console.WriteLine("new assemblyInfo:" + Environment.NewLine + assemblyInfo); -using (TextWriter tw = new StreamWriter(sharedAssemblyInfo, false, Encoding.UTF8)) -{ - tw.Write(assemblyInfo); +using (TextWriter tw = new StreamWriter(sharedAssemblyInfo, false, Encoding.UTF8)) { + tw.Write(assemblyInfo); } //////// PATCH SharedAssemblyInfo.cs string buildCmd = string.Format( - "msbuild MapboxSdkCs.sln /p:Configuration={0}", - configuration + "msbuild MapboxSdkCs.sln /p:Configuration={0}", + configuration ); Console.WriteLine("building [{0}]", buildCmd); -if (!RunCommand(buildCmd, true)) -{ - Console.Error.WriteLine("build failed"); - Environment.Exit(1); +if (!RunCommand(buildCmd, true)) { + Console.Error.WriteLine("build failed"); + Environment.Exit(1); } +//---------- nupkg string nugetCmd = string.Format("nuget pack -properties version={0}", versionNupkg); Console.WriteLine("creating nupkg: [{0}]", nugetCmd); Console.WriteLine("Skipping nuget pack! TODO: Build 'DebugNet' and 'DebugUWP' on one configuration!"); @@ -121,73 +114,75 @@ Console.WriteLine("Skipping nuget pack! TODO: Build 'DebugNet' and 'DebugUWP' on // Environment.Exit(1); // } +if (!publishNuget) { + Console.WriteLine("NOT publishing to nuget.org"); +} else { + Console.WriteLine("publishing to nuget.org"); + string nugetCmd = string.Format("nuget push MapboxSdkCs.{0}.nupkg {1} -Source https://www.nuget.org/api/v2/package", versionNupkg, nugetApiKey); + if (!RunCommand(nugetCmd)) { + Console.Error.WriteLine("publishing to nuget.org failed"); + Environment.Exit(1); + } +} - -if (!publishNuget) -{ - Console.WriteLine("NOT publishing to nuget.org"); +//---------- documentation +Console.WriteLine("downloading docfx ..."); +if (!RunCommand("powershell Invoke-WebRequest https://github.com/dotnet/docfx/releases/download/v2.14.1/docfx.zip -OutFile docfx.zip", true)) { + Console.Error.WriteLine("could not download docfx"); + Environment.Exit(1); } -else -{ - Console.WriteLine("publishing to nuget.org"); - string nugetCmd = string.Format("nuget push MapboxSdkCs.{0}.nupkg {1} -Source https://www.nuget.org/api/v2/package", versionNupkg, nugetApiKey); - if (!RunCommand(nugetCmd)) - { - Console.Error.WriteLine("publishing to nuget.org failed"); - Environment.Exit(1); - } + +Console.WriteLine("extracting docfx ..."); +if (!RunCommand("7z x docfx.zip -aoa -o%CD%\\docfx | %windir%\\system32\\find \"ing archive\"", true)) { + Console.Error.WriteLine("could not extract docfx"); + Environment.Exit(1); } +Console.WriteLine("building docs ...."); -if (!publishDocs) -{ - Console.WriteLine("NOT publishing docs"); +if (!RunCommand(@"docfx src\Documentation\docfx.json", true)) { + Console.Error.WriteLine("generating docs failed"); + Environment.Exit(1); } -else -{ - Console.WriteLine("publishing dcos"); - try - { - string originalCommit = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT"); - if (string.IsNullOrWhiteSpace(originalCommit)) - { - originalCommit = "no SHA available"; - } - else - { - originalCommit = "https://github.com/mapbox/mapbox-sdk-cs/commit/" + originalCommit; - } - - string commitAuthor = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR"); - if (string.IsNullOrWhiteSpace(commitAuthor)) - { - commitAuthor = "no commit author available"; - } - - string docsDir = Path.Combine(rootDir, "src", "Documentation", "_site"); - Console.WriteLine("docs directory: {0}", docsDir); - Environment.CurrentDirectory = docsDir; - List cmds = new List(new string[]{ +Console.WriteLine("docs successfully generated"); + +if (!publishDocs) { + Console.WriteLine("NOT publishing docs"); +} else { + Console.WriteLine("publishing dcos"); + try { + string originalCommit = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT"); + if (string.IsNullOrWhiteSpace(originalCommit)) { + originalCommit = "no SHA available"; + } else { + originalCommit = "https://github.com/mapbox/mapbox-sdk-cs/commit/" + originalCommit; + } + + string commitAuthor = Environment.GetEnvironmentVariable("APPVEYOR_REPO_COMMIT_AUTHOR"); + if (string.IsNullOrWhiteSpace(commitAuthor)) { + commitAuthor = "no commit author available"; + } + + string docsDir = Path.Combine(rootDir, "src", "Documentation", "_site"); + Console.WriteLine("docs directory: {0}", docsDir); + Environment.CurrentDirectory = docsDir; + List cmds = new List(new string[]{ //"dir", "git init .", - "git add .", - string.Format("git commit -m \"pushed via [{0}] by [{1}]\"", originalCommit,commitAuthor), - string.Format("git remote add origin https://{0}@github.com/mapbox/mapbox-sdk-cs.git", githubToken), - "git checkout -b gh-pages", - "git push -f origin gh-pages" - }); - foreach (var cmd in cmds) - { - if (!RunCommand(cmd)) - { - Console.Error.WriteLine("publishing docs failed"); - Environment.Exit(1); - } - } - } - finally - { - Environment.CurrentDirectory = rootDir; - } + "git add .", + string.Format("git commit -m \"pushed via [{0}] by [{1}]\"", originalCommit,commitAuthor), + string.Format("git remote add origin https://{0}@github.com/mapbox/mapbox-sdk-cs.git", githubToken), + "git checkout -b gh-pages", + "git push -f origin gh-pages" + }); + foreach (var cmd in cmds) { + if (!RunCommand(cmd)) { + Console.Error.WriteLine("publishing docs failed"); + Environment.Exit(1); + } + } + } finally { + Environment.CurrentDirectory = rootDir; + } } diff --git a/scripts/omnisharp.json b/scripts/omnisharp.json new file mode 100644 index 0000000..d048b15 --- /dev/null +++ b/scripts/omnisharp.json @@ -0,0 +1,54 @@ +{ + "FormattingOptions": { + //"NewLine": "\n", + "UseTabs": true, + "TabSize": 4, + "IndentationSize": 4, + "SpacingAfterMethodDeclarationName": false, + "SpaceWithinMethodDeclarationParenthesis": false, + "SpaceBetweenEmptyMethodDeclarationParentheses": false, + "SpaceAfterMethodCallName": false, + "SpaceWithinMethodCallParentheses": false, + "SpaceBetweenEmptyMethodCallParentheses": false, + "SpaceAfterControlFlowStatementKeyword": true, + "SpaceWithinExpressionParentheses": false, + "SpaceWithinCastParentheses": false, + "SpaceWithinOtherParentheses": false, + "SpaceAfterCast": false, + "SpacesIgnoreAroundVariableDeclaration": false, + "SpaceBeforeOpenSquareBracket": false, + "SpaceBetweenEmptySquareBrackets": false, + "SpaceWithinSquareBrackets": false, + "SpaceAfterColonInBaseTypeDeclaration": true, + "SpaceAfterComma": true, + "SpaceAfterDot": false, + "SpaceAfterSemicolonsInForStatement": true, + "SpaceBeforeColonInBaseTypeDeclaration": true, + "SpaceBeforeComma": false, + "SpaceBeforeDot": false, + "SpaceBeforeSemicolonsInForStatement": false, + "SpacingAroundBinaryOperator": "single", + "IndentBraces": false, + "IndentBlock": true, + "IndentSwitchSection": true, + "IndentSwitchCaseSection": true, + "LabelPositioning": "oneLess", + "WrappingPreserveSingleLine": true, + "WrappingKeepStatementsOnSingleLine": true, + "NewLinesForBracesInTypes": false, + "NewLinesForBracesInMethods": false, + "NewLinesForBracesInProperties": false, + "NewLinesForBracesInAccessors": false, + "NewLinesForBracesInAnonymousMethods": false, + "NewLinesForBracesInControlBlocks": false, + "NewLinesForBracesInAnonymousTypes": false, + "NewLinesForBracesInObjectCollectionArrayInitializers": false, + "NewLinesForBracesInLambdaExpressionBody": false, + "NewLineForElse": false, + "NewLineForCatch": false, + "NewLineForFinally": false, + "NewLineForMembersInObjectInit": false, + "NewLineForMembersInAnonymousTypes": false, + "NewLineForClausesInQuery": false + } +} \ No newline at end of file diff --git a/src/Documentation/Documentation.csproj b/src/Documentation/Documentation.csproj index 4188227..63a0c1f 100644 --- a/src/Documentation/Documentation.csproj +++ b/src/Documentation/Documentation.csproj @@ -53,20 +53,15 @@ - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - copy /Y "$(ProjectDir)docfx.msbuild.targets" "$(SolutionDir)packages/docfx.msbuild.2.4.0/build/" cp -f "$(ProjectDir)docfx.msbuild.targets" "$(SolutionDir)packages/docfx.msbuild.2.4.0/build/" + + +