Merge pull request #178 from OfficeDev/vNext

Merge vNext to Master

Author: tomjebo

.gitignore

@@ -174,3 +174,9 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
+*.nuget.props
+*.nuget.targets
+project.lock.json
+.vs/
+Tests/
+TestFiles/

.nuget/nuget.exe

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>e97a956d-8113-45b6-9002-2ed651a6cd6c</ProjectGuid>
+    <RootNamespace>BinaryFormatConverter</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
+</Project>

.nuget/packages.config

@@ -0,0 +1,57 @@
+using DocumentFormat.OpenXml.Internal.SchemaValidation;
+using SourceCodeSerializer;
+using SourceCodeSerializer.Generators;
+using System;
+using System.Collections.Immutable;
+using System.IO;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace Converter
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            Write("Office2007Schema", SdbSchemaDatas.GetOffice2007SchemaDatas());
+            Write("Office2010Schema", SdbSchemaDatas.GetOffice2010SchemaDatas());
+            Write("Office2013Schema", SdbSchemaDatas.GetOffice2013SchemaDatas());
+        }
+
+        private static void Write(string name, SdbSchemaDatas data)
+        {
+            Console.WriteLine($"Serializing {name}");
+
+            var path = Path.Combine(GetRootDirectory(), "DocumentFormat.OpenXml", "src", "GeneratedCode", $"{name}.cs");
+
+            using (var fs = File.Open(path, FileMode.Create, FileAccess.Write))
+            using (var writer = new StreamWriter(fs))
+            {
+                var settings = new SerializerSettings
+                {
+                    IgnoreDefaultValues = false,
+                    ObjectInitializationNewLine = false,
+                    Usings = ImmutableArray.Create("DocumentFormat.OpenXml.Internal.SchemaValidation", "DocumentFormat.OpenXml.Validation", "System"),
+                    Generator = new ConstructorGenerator("DocumentFormat.OpenXml.Internal.SchemaValidation", name)
+                };
+
+                SourceCodeSerializer.SourceCodeSerializer.Serialize(writer, data, settings);
+            }
+        }
+
+        private static string GetRootDirectory(string path = null)
+        {
+            if (path == null)
+            {
+                return GetRootDirectory(Directory.GetCurrentDirectory());
+            }
+
+            if (File.Exists(Path.Combine(path, "global.json")))
+            {
+                return Path.GetFullPath(path);
+            }
+
+            return GetRootDirectory(Path.Combine(path, ".."));
+        }
+    }
+}

.travis.yml

@@ -0,0 +1,16 @@
+{
+  "version": "1.0.0-*",
+  "buildOptions": {
+    "debugType": "portable",
+    "emitEntryPoint": true,
+    "keyFile": "../DocumentFormat.OpenXml/DocumentFormat.OpenXml.snk"
+  },
+  "dependencies": {
+    "DocumentFormat.OpenXml": "0.0.1-*",
+    "SourceCodeSerializer": "0.1.0"
+  },
+  "frameworks": {
+    "net46": {
+    }
+  }
+}

BinaryFormatConverter/BinaryFormatConverter.xproj

@@ -29,14 +29,17 @@
 using System.Xml;
 using DocumentFormat.OpenXml.Packaging;
 using Xunit;
+using OxTest;
 
 namespace DocumentFormat.OpenXml.Tests
 {
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     [SuppressMessage("ReSharper", "VirtualMemberNeverOverriden.Global")]
     public class BaseFixture : IDisposable
     {
-        protected const string TestFilesPath = @"..\..\..\TestFiles";
+        protected static string s_TestFileLocation = null;
+
+        public static string TestFilesPath => TestUtil.TestFilesDir;
 
         protected BaseFixture()
         {
@@ -64,7 +67,8 @@ protected static string GetTestFilePath(string path)
             if (path == null)
                 throw new ArgumentNullException("path");
 
-            return Path.Combine(TestFilesPath, Path.GetFileName(path));
+            var combinedPath = Path.Combine(TestFilesPath, Path.GetFileName(path));
+            return combinedPath;
         }
 
         /// <summary>

BinaryFormatConverter/Program.cs

@@ -1,4 +1,5 @@
-using System;
+// Copyright (c) Microsoft Open Technologies, Inc.  All rights reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -28,13 +29,6 @@ public string FullyQualifiedTestClassName
             set;
         }
 
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        public static string GetCurrentMethod()
-        {
-            StackTrace st = new StackTrace();
-            StackFrame sf = st.GetFrame(1);
-
-            return sf.GetMethod().Name;
-        }
+        public static string GetCurrentMethod([CallerMemberName]string name = null) => name;
     }
 }