Skip to content

Commit 4f4212a

Browse files
tomjebotomjebo
authored
Merge pull request #213 from tomjebo/master
Merging to get master up to date with vNext
2 parents d7da29e + 9b2447b commit 4f4212a

38 files changed

+434
-474
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
[Dd]ebugPublic/
1313
[Rr]elease/
1414
x64/
15-
build/
1615
bld/
1716
[Bb]in/
1817
[Oo]bj/
@@ -180,3 +179,6 @@ project.lock.json
180179
.vs/
181180
Tests/
182181
TestFiles/
182+
183+
# git merge files
184+
*.orig

‎BinaryFormatConverter/BinaryFormatConverter.csproj‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>net46</TargetFramework>
6+
<AssemblyName>BinaryFormatConverter</AssemblyName>
7+
<OutputType>Exe</OutputType>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<ProjectReference Include="..\DocumentFormat.OpenXml\DocumentFormat.OpenXml.csproj" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="SourceCodeSerializer" Version="0.2.0" />
16+
</ItemGroup>
17+
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
19+
<Reference Include="System" />
20+
<Reference Include="Microsoft.CSharp" />
21+
</ItemGroup>
22+
23+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
24+
</Project>

‎BinaryFormatConverter/BinaryFormatConverter.xproj‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎BinaryFormatConverter/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static string GetRootDirectory(string path = null)
4646
return GetRootDirectory(Directory.GetCurrentDirectory());
4747
}
4848

49-
if (File.Exists(Path.Combine(path, "global.json")))
49+
if (File.Exists(Path.Combine(path, "Open-XML-SDK.sln")))
5050
{
5151
return Path.GetFullPath(path);
5252
}

‎BinaryFormatConverter/project.json‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎DocumentFormat.OpenXml.Tests/DocumentFormat.OpenXml.Tests.csproj‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
3+
4+
<PropertyGroup>
5+
<TargetFrameworks>net452;net46;netcoreapp1.0</TargetFrameworks>
6+
<AssemblyName>DocumentFormat.OpenXml.Tests</AssemblyName>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<EmbeddedResource Include="..\TestFiles\**\*.*" />
11+
<TestFiles Include="..\TestFiles\**\*" />
12+
<TestDataStorage Include="..\TestDataStorage\**\*.*" />
13+
</ItemGroup>
14+
15+
<Target Name="CopyTestFiles" AfterTargets="Build">
16+
<Copy SourceFiles="@(TestFiles)" DestinationFolder="$(OutputPath)\TestFiles\%(RecursiveDir)" SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true" Retries="3" RetryDelayMilliseconds="300" />
17+
<Copy SourceFiles="@(TestDataStorage)" DestinationFolder="$(OutputPath)\TestDataStorage\%(RecursiveDir)" SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true" Retries="3" RetryDelayMilliseconds="300" />
18+
</Target>
19+
20+
<ItemGroup>
21+
<ProjectReference Include="..\DocumentFormat.OpenXml\DocumentFormat.OpenXml.csproj" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
26+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
27+
<PackageReference Include="xunit.runner.console" Version="2.2.0" />
28+
<PackageReference Include="xunit" Version="2.2.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
32+
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
33+
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
34+
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
35+
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
36+
<PackageReference Include="System.IO.Packaging" Version="4.3.0" />
37+
</ItemGroup>
38+
39+
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
40+
<Reference Include="System" />
41+
<Reference Include="Microsoft.CSharp" />
42+
<PackageReference Include="System.IO.Packaging" Version="4.3.0" />
43+
</ItemGroup>
44+
45+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
46+
<Reference Include="System" />
47+
<Reference Include="Microsoft.CSharp" />
48+
<Reference Include="WindowsBase" />
49+
</ItemGroup>
50+
51+
<ItemGroup>
52+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
53+
</ItemGroup>
54+
55+
<ItemGroup>
56+
<None Update="xunit.runner.json">
57+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
58+
</None>
59+
</ItemGroup>
60+
61+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
62+
</Project>

‎DocumentFormat.OpenXml.Tests/DocumentFormat.OpenXml.Tests.xproj‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎DocumentFormat.OpenXml.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎DocumentFormat.OpenXml.Tests/project.json‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎DocumentFormat.OpenXml.Tests/xunit.runner.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"shadowCopy": false
3+
}

0 commit comments

Comments
 (0)