Skip to content

Commit 2656cc4

Browse files
janjanechjanjanech
committed
conversion to VS2017 (net40 and netstandard20 supported)
1 parent 2ef3d4b commit 2656cc4

6 files changed

Lines changed: 61 additions & 476 deletions

File tree

‎SharpDiffLib.Documentation/SharpDiffLib.Documentation.shfbproj‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
33
<PropertyGroup>
44
<!-- The configuration and platform will be used to determine which
55
assemblies to include from solution and project documentation
@@ -8,7 +8,7 @@
88
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
99
<SchemaVersion>2.0</SchemaVersion>
1010
<ProjectGuid>{f8d49743-f840-4ac0-ad14-39d45d6a9123}</ProjectGuid>
11-
<SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
11+
<SHFBSchemaVersion>2017.9.26.0</SHFBSchemaVersion>
1212
<!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
1313
Studio adds them anyway -->
1414
<AssemblyName>SharpDiffLib.Documentation</AssemblyName>
@@ -21,8 +21,9 @@
2121
<ApiFilter />
2222
<ComponentConfigurations />
2323
<DocumentationSources>
24-
<DocumentationSource sourceFile="..\SharpDiffLib\bin\Debug\SharpDiffLib.xml" />
25-
<DocumentationSource sourceFile="..\SharpDiffLib\bin\Debug\SharpDiffLib.dll" /></DocumentationSources>
24+
<DocumentationSource sourceFile="..\SharpDiffLib\bin\Debug\netstandard2.0\SharpDiffLib.dll" />
25+
<DocumentationSource sourceFile="..\SharpDiffLib\bin\Debug\netstandard2.0\SharpDiffLib.xml" />
26+
</DocumentationSources>
2627
<HelpAttributes />
2728
<NamespaceSummaries />
2829
<PlugInConfigurations />
@@ -34,15 +35,15 @@
3435
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
3536
<HelpFileFormat>Website</HelpFileFormat>
3637
<IndentHtml>False</IndentHtml>
37-
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
38+
<FrameworkVersion>Cross-platform (.NET Core/.NET Standard)</FrameworkVersion>
3839
<KeepLogFile>True</KeepLogFile>
3940
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
4041
<CppCommentsFixup>False</CppCommentsFixup>
4142
<CleanIntermediates>True</CleanIntermediates>
42-
<SyntaxFilters>CSharp, VisualBasic</SyntaxFilters>
43+
<SyntaxFilters>C#, Visual Basic</SyntaxFilters>
4344
<SdkLinkTarget>Blank</SdkLinkTarget>
44-
<RootNamespaceContainer>False</RootNamespaceContainer>
45-
<PresentationStyle>VS2010</PresentationStyle>
45+
<RootNamespaceContainer>True</RootNamespaceContainer>
46+
<PresentationStyle>VS2013</PresentationStyle>
4647
<Preliminary>False</Preliminary>
4748
<NamingMethod>Guid</NamingMethod>
4849
<HelpTitle>SharpDiffLib</HelpTitle>
@@ -53,6 +54,10 @@
5354
<SccAuxPath>Svn</SccAuxPath>
5455
<SccLocalPath>Svn</SccLocalPath>
5556
<ComponentPath />
57+
<SaveComponentCacheCapacity>100</SaveComponentCacheCapacity>
58+
<HelpFileVersion>1.0.0.0</HelpFileVersion>
59+
<NamespaceGrouping>True</NamespaceGrouping>
60+
<MaximumGroupParts>2</MaximumGroupParts>
5661
</PropertyGroup>
5762
<!-- There are no properties for these groups. AnyCPU needs to appear in
5863
order for Visual Studio to perform the build. The others are optional

‎SharpDiffLib.Test/Properties/AssemblyInfo.cs‎

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

‎SharpDiffLib.Test/SharpDiffLib.Test.csproj‎

Lines changed: 26 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -1,168 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>
7-
</ProductVersion>
8-
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>{8245A72D-CEEA-4451-B43C-1080EB1F18D3}</ProjectGuid>
10-
<OutputType>Library</OutputType>
11-
<AppDesignerFolder>Properties</AppDesignerFolder>
12-
<RootNamespace>SharpDiffLib.Test</RootNamespace>
13-
<AssemblyName>SharpDiffLib.Test</AssemblyName>
14-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
15-
<FileAlignment>512</FileAlignment>
16-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
17-
<SccProjectName>Svn</SccProjectName>
18-
<SccLocalPath>Svn</SccLocalPath>
19-
<SccAuxPath>Svn</SccAuxPath>
20-
<SccProvider>SubversionScc</SccProvider>
21-
<PublishUrl>publish\</PublishUrl>
22-
<Install>true</Install>
23-
<InstallFrom>Disk</InstallFrom>
24-
<UpdateEnabled>false</UpdateEnabled>
25-
<UpdateMode>Foreground</UpdateMode>
26-
<UpdateInterval>7</UpdateInterval>
27-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
28-
<UpdatePeriodically>false</UpdatePeriodically>
29-
<UpdateRequired>false</UpdateRequired>
30-
<MapFileExtensions>true</MapFileExtensions>
31-
<ApplicationRevision>0</ApplicationRevision>
32-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
33-
<IsWebBootstrapper>false</IsWebBootstrapper>
34-
<UseApplicationTrust>false</UseApplicationTrust>
35-
<BootstrapperEnabled>true</BootstrapperEnabled>
36-
</PropertyGroup>
37-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
38-
<DebugSymbols>true</DebugSymbols>
39-
<DebugType>full</DebugType>
40-
<Optimize>false</Optimize>
41-
<OutputPath>bin\Debug\</OutputPath>
42-
<DefineConstants>DEBUG;TRACE</DefineConstants>
43-
<ErrorReport>prompt</ErrorReport>
44-
<WarningLevel>4</WarningLevel>
45-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
46-
</PropertyGroup>
47-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48-
<DebugType>pdbonly</DebugType>
49-
<Optimize>true</Optimize>
50-
<OutputPath>bin\Release\</OutputPath>
51-
<DefineConstants>TRACE</DefineConstants>
52-
<ErrorReport>prompt</ErrorReport>
53-
<WarningLevel>4</WarningLevel>
54-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
55-
</PropertyGroup>
56-
<ItemGroup>
57-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
58-
<Reference Include="System" />
59-
<Reference Include="System.Core">
60-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
61-
</Reference>
62-
</ItemGroup>
63-
<ItemGroup>
64-
<CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
65-
<Visible>False</Visible>
66-
</CodeAnalysisDependentAssemblyPaths>
67-
</ItemGroup>
68-
<ItemGroup>
69-
<Compile Include="ApplyPatch\AlgorithmGuessing.cs" />
70-
<Compile Include="ApplyPatch\ArrayOfObjects.cs" />
71-
<Compile Include="ApplyPatch\ArrayOfPrimitives.cs" />
72-
<Compile Include="ApplyPatch\BaseDefinition.cs" />
73-
<Compile Include="ApplyPatch\DictionaryOfObjects.cs" />
74-
<Compile Include="ApplyPatch\DictionaryOfPrimitives.cs" />
75-
<Compile Include="ApplyPatch\SetOfObjects.cs" />
76-
<Compile Include="ApplyPatch\SetOfPrimitives.cs" />
77-
<Compile Include="ApplyPatch\SimpleClass.cs" />
78-
<Compile Include="ApplyPatch\SimpleValue.cs" />
79-
<Compile Include="ApplyPatch\StructuredClass.cs" />
80-
<Compile Include="ConflictResolver\ArrayOfObjects.cs" />
81-
<Compile Include="ConflictResolver\ArrayOfPrimitives.cs" />
82-
<Compile Include="ConflictResolver\SimpleClass.cs" />
83-
<Compile Include="ConflictResolver\StructuredClass.cs" />
84-
<Compile Include="Diff\AlwaysInclude.cs" />
85-
<Compile Include="FullRun\SubClass.cs" />
86-
<Compile Include="FullRun\UseAllRight.cs" />
87-
<Compile Include="FullRun\UseAllLeft.cs" />
88-
<Compile Include="FullRun\WithoutConflictsResolving.cs" />
89-
<Compile Include="General\DiffResultFactoryTest.cs" />
90-
<Compile Include="Diff\AlgorithmGuessing.cs" />
91-
<Compile Include="Diff\ArrayOfObjects.cs" />
92-
<Compile Include="Diff\ArrayOfPrimitives.cs" />
93-
<Compile Include="Diff\BaseDefinition.cs" />
94-
<Compile Include="Diff\CollectionAsItem.cs" />
95-
<Compile Include="Diff\DictionaryOfObjects.cs" />
96-
<Compile Include="Diff\IgnoreProperty.cs" />
97-
<Compile Include="Diff\RulesInheritance.cs" />
98-
<Compile Include="Diff\StructDiff.cs" />
99-
<Compile Include="Diff\ValueDiffWithId.cs" />
100-
<Compile Include="Diff\ValueObjectDiff.cs" />
101-
<Compile Include="Diff\DictionaryOfPrimitives.cs" />
102-
<Compile Include="Diff\SetOfObjects.cs" />
103-
<Compile Include="Diff\SetOfPrimitives.cs" />
104-
<Compile Include="Diff\SimpleClassDiff.cs" />
105-
<Compile Include="Diff\StructuredClassDiff.cs" />
106-
<Compile Include="Diff\ValueNonObjectDiff.cs" />
107-
<Compile Include="MergeDiffs\ArrayOfObjects.cs" />
108-
<Compile Include="MergeDiffs\ArrayOfPrimitives.cs" />
109-
<Compile Include="MergeDiffs\DictionaryOfObjects.cs" />
110-
<Compile Include="MergeDiffs\SetOfObjects.cs" />
111-
<Compile Include="MergeDiffs\SetOfPrimitives.cs" />
112-
<Compile Include="MergeDiffs\SimpleClass.cs" />
113-
<Compile Include="MergeDiffs\StructuredClass.cs" />
114-
<Compile Include="MergeDiffs\Value.cs" />
115-
<Compile Include="Properties\AssemblyInfo.cs" />
116-
<Compile Include="_Entities\BaseWithId\SampleBase.cs" />
117-
<Compile Include="_Entities\BaseWithId\SampleDescendant1.cs" />
118-
<Compile Include="_Entities\BaseWithId\SampleDescendant2.cs" />
119-
<Compile Include="_Entities\BaseWithoutId\SampleBase.cs" />
120-
<Compile Include="_Entities\BaseWithoutId\SampleDescendant.cs" />
121-
<Compile Include="_Entities\InnerClassWithId\SampleInner.cs" />
122-
<Compile Include="_Entities\InnerClass\SampleInner.cs" />
123-
<Compile Include="_Entities\InnerStructure\SampleStruct.cs" />
124-
<Compile Include="_Entities\SimpleClass\AnotherSample.cs" />
125-
<Compile Include="_Entities\SimpleWithId\Sample.cs" />
126-
<Compile Include="_Entities\InnerStructure\Sample.cs" />
127-
<Compile Include="_Entities\InnerClass\Sample.cs" />
128-
<Compile Include="_Entities\SimpleClass\Sample.cs" />
129-
<Compile Include="_Entities\IntArrayProperty\Sample.cs" />
130-
<Compile Include="_Entities\InnerClassWithId\Sample.cs" />
131-
</ItemGroup>
132-
<ItemGroup>
133-
<ProjectReference Include="..\SharpDiffLib\SharpDiffLib.csproj">
134-
<Project>{459A6DF9-E02C-4094-A1F4-BE39D51E59E5}</Project>
135-
<Name>SharpDiffLib</Name>
136-
</ProjectReference>
137-
</ItemGroup>
138-
<ItemGroup>
139-
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
140-
<Visible>False</Visible>
141-
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
142-
<Install>true</Install>
143-
</BootstrapperPackage>
144-
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
145-
<Visible>False</Visible>
146-
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
147-
<Install>false</Install>
148-
</BootstrapperPackage>
149-
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
150-
<Visible>False</Visible>
151-
<ProductName>.NET Framework 3.5 SP1</ProductName>
152-
<Install>false</Install>
153-
</BootstrapperPackage>
154-
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
155-
<Visible>False</Visible>
156-
<ProductName>Windows Installer 3.1</ProductName>
157-
<Install>true</Install>
158-
</BootstrapperPackage>
159-
</ItemGroup>
160-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
161-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
162-
Other similar extension points exist, see Microsoft.Common.targets.
163-
<Target Name="BeforeBuild">
164-
</Target>
165-
<Target Name="AfterBuild">
166-
</Target>
167-
-->
168-
</Project>
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
4+
<PropertyGroup>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
7+
<IsPackable>false</IsPackable>
8+
9+
<Configurations>Debug;Release</Configurations>
10+
11+
<ApplicationIcon />
12+
13+
<OutputType>Library</OutputType>
14+
15+
<StartupObject />
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
20+
<PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
21+
<PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\SharpDiffLib\SharpDiffLib.csproj" />
26+
</ItemGroup>
27+
</Project>

‎SharpDiffLib.sln‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11

2-
Microsoft Visual Studio Solution File, Format Version 11.00
3-
# Visual Studio 2010
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDiffLib", "SharpDiffLib\SharpDiffLib.csproj", "{459A6DF9-E02C-4094-A1F4-BE39D51E59E5}"
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27703.2018
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpDiffLib", "SharpDiffLib\SharpDiffLib.csproj", "{459A6DF9-E02C-4094-A1F4-BE39D51E59E5}"
57
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpDiffLib.Test", "SharpDiffLib.Test\SharpDiffLib.Test.csproj", "{8245A72D-CEEA-4451-B43C-1080EB1F18D3}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpDiffLib.Test", "SharpDiffLib.Test\SharpDiffLib.Test.csproj", "{8245A72D-CEEA-4451-B43C-1080EB1F18D3}"
79
EndProject
810
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F190958C-4F91-4CBE-BB92-20483CB18DBF}"
911
ProjectSection(SolutionItems) = preProject
@@ -13,10 +15,6 @@ EndProject
1315
Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "SharpDiffLib.Documentation", "SharpDiffLib.Documentation\SharpDiffLib.Documentation.shfbproj", "{F8D49743-F840-4AC0-AD14-39D45D6A9123}"
1416
EndProject
1517
Global
16-
GlobalSection(SubversionScc) = preSolution
17-
Svn-Managed = True
18-
Manager = AnkhSVN - Subversion Support for Visual Studio
19-
EndGlobalSection
2018
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2119
Debug|Any CPU = Debug|Any CPU
2220
Release|Any CPU = Release|Any CPU
@@ -37,4 +35,7 @@ Global
3735
GlobalSection(SolutionProperties) = preSolution
3836
HideSolutionNode = FALSE
3937
EndGlobalSection
38+
GlobalSection(ExtensibilityGlobals) = postSolution
39+
SolutionGuid = {6D43D0AC-B8FE-485F-A8AC-47AF1EA1FC24}
40+
EndGlobalSection
4041
EndGlobal

‎SharpDiffLib/Properties/AssemblyInfo.cs‎

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

0 commit comments

Comments
 (0)