Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<Configurations>Debug;Release</Configurations>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2021 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]></AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<ChangelogFile>../../CHANGELOG.md</ChangelogFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>TRACE;DEBUG;DBVERSION_7000072</DefineConstants>
<IsPackable>false</IsPackable>
</PropertyGroup>
</Project>
24 changes: 2 additions & 22 deletions LfMerge.TestApp/LfMerge.TestApp.csproj
Original file line number Diff line number Diff line change
@@ -1,33 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>LfMerge.TestApp</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMerge.TestApp</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputType>Exe</OutputType>
<OutputPath>../output/$(Configuration)</OutputPath>
<PackageOutputPath>../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<IsPackable>false</IsPackable>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>DEBUG</DefineConstants>
<ChangelogFile>../CHANGELOG.md</ChangelogFile>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions LfMerge.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
build\NuGet.targets = build\NuGet.targets
README.md = README.md
CHANGELOG.md = CHANGELOG.md
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LfMerge", "src\LfMerge\LfMerge.csproj", "{0E79BC8D-9AE4-4B2C-ACFB-D8C1B2BC3D4F}"
Expand Down
1 change: 0 additions & 1 deletion build/LfMerge.proj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<Configuration Condition="'$(Configuration)'==''">Release</Configuration>
<useNUnit-x86 Condition="'$(OS)'=='Windows_NT'">true</useNUnit-x86>
<useNUnit-x86 Condition="'$(OS)'!='Windows_NT'">false</useNUnit-x86>
<NUnitVersion>2.6.4</NUnitVersion>
<RestartBuild Condition="!Exists('$(RootDir)/packages/MSBuildTasks/tools/MSBuild.Community.Tasks.dll') Or !Exists('$(RootDir)/packages/SIL.BuildTasks/tools/SIL.BuildTasks.dll') Or !Exists('$(RootDir)/packages/NUnit.ConsoleRunner/tools/nunit3-console.exe')">true</RestartBuild>
<RestartBuild Condition="Exists('$(RootDir)/packages/MSBuildTasks/tools/MSBuild.Community.Tasks.dll') And Exists('$(RootDir)/packages/SIL.BuildTasks/tools/SIL.BuildTasks.dll') And Exists('$(RootDir)/packages/NUnit.ConsoleRunner/tools/nunit3-console.exe')">false</RestartBuild>
<TestOutputXmlFile Condition="'$(teamcity_version)' == ''">$(RootDir)/output/$(Configuration)/TestResults.xml</TestOutputXmlFile>
Expand Down
29 changes: 2 additions & 27 deletions src/FixFwData/FixFwData.csproj
Original file line number Diff line number Diff line change
@@ -1,41 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<OutputType>WinExe</OutputType>
<RootNamespace>FixFwData</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>FixFwData</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<ChangelogFile>../../CHANGELOG.md</ChangelogFile>
<OutputType>WinExe</OutputType>
<DefinePlatformConstants Condition="'$(OS)'!='Windows_NT'">LINUX</DefinePlatformConstants>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>DEBUG;TRACE;DBVERSION_7000072;</DefineConstants>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.LCModel.FixData" Version="10.1.0-beta0382" />
<PackageReference Include="SIL.LCModel.FixData" Version="10.1.0" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
29 changes: 3 additions & 26 deletions src/LfMerge.Core.Tests/LfMerge.Core.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,40 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<RootNamespace>LfMerge.Core.Tests</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMerge.Core.Tests</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<IsPackable>false</IsPackable>
<DefineConstants>TRACE;DEBUG;DBVERSION_7000072</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Moq" Version="4.2.1510.2205" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="SIL.Chorus.Mercurial" Version="3.0.1-beta5" />
<PackageReference Include="SIL.LCModel.Core.Tests" Version="10.1.0-beta0382" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="SIL.Chorus.Mercurial" Version="3.0.1" />
<PackageReference Include="SIL.LCModel.Core.Tests" Version="10.1.0" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
37 changes: 6 additions & 31 deletions src/LfMerge.Core/LfMerge.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,48 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<RootNamespace>LfMerge.Core</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMerge.Core</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<ChangelogFile>../../CHANGELOG.md</ChangelogFile>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>TRACE;DEBUG;DBVERSION_7000072</DefineConstants>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="3.5.2" />
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0" PrivateAssets="All" />
<PackageReference Include="icu.net" Version="2.6.0" />
<PackageReference Include="icu.net" Version="2.7.1" />
<PackageReference Include="INIFileParserDotNetCore.Signed" Version="2.5.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="MongoDB.Driver.signed" Version="2.2.4" />
<PackageReference Include="SIL.Bugsnag.Signed" Version="2.2.1" />
<PackageReference Include="SIL.Chorus.ChorusMerge" Version="3.1.0-beta0046" />
<PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" Version="3.2.0-beta0329" />
<PackageReference Include="SIL.Core.Desktop" Version="8.0.0-beta0166" />
<PackageReference Include="SIL.LCModel" Version="10.1.0-beta0382" />
<PackageReference Include="SIL.Linux.Logging" Version="8.0.0-beta0166" />
<PackageReference Include="SIL.Chorus.ChorusMerge" Version="4.0.0" />
<PackageReference Include="SIL.ChorusPlugin.LfMergeBridge" Version="3.3.0" />
<PackageReference Include="SIL.Core.Desktop" Version="8.0.0" />
<PackageReference Include="SIL.LCModel" Version="10.1.0" />
<PackageReference Include="SIL.Linux.Logging" Version="8.0.0" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
26 changes: 1 addition & 25 deletions src/LfMerge.Tests/LfMerge.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,38 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<RootNamespace>LfMerge.Tests</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMerge.Tests</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<IsPackable>false</IsPackable>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>TRACE;DEBUG;DBVERSION_7000072</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.7.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" />
</ItemGroup>

Expand Down
27 changes: 1 addition & 26 deletions src/LfMerge/LfMerge.csproj
Original file line number Diff line number Diff line change
@@ -1,35 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<OutputType>Exe</OutputType>
<RootNamespace>LfMerge</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMerge</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<ChangelogFile>../../CHANGELOG.md</ChangelogFile>
<OutputType>Exe</OutputType>
<DefinePlatformConstants Condition="'$(OS)'!='Windows_NT'">LINUX</DefinePlatformConstants>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>DEBUG;TRACE;$(DefinePlatformConstants)</DefineConstants>
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net462|AnyCPU'">
Expand Down
24 changes: 0 additions & 24 deletions src/LfMergeAuxTool/LfMergeAuxTool.csproj
Original file line number Diff line number Diff line change
@@ -1,32 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<RootNamespace>LfMergeAuxTool</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMergeAuxTool</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<IsPackable>false</IsPackable>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>TRACE;DEBUG;DBVERSION_7000072</DefineConstants>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down
24 changes: 0 additions & 24 deletions src/LfMergeQueueManager/LfMergeQueueManager.csproj
Original file line number Diff line number Diff line change
@@ -1,32 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462</TargetFrameworks>
<RootNamespace>LfMerge.QueueManager</RootNamespace>
<Configurations>Debug;Release</Configurations>
<Description>LfMergeQueueManager</Description>
<Company>SIL International</Company>
<Authors>SIL International</Authors>
<Product>LfMerge</Product>
<Copyright>Copyright © 2010-2020 SIL International</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/sillsdev/LfMerge</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<OutputPath>../../output/$(Configuration)</OutputPath>
<PackageOutputPath>../../output</PackageOutputPath>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>../../LfMerge.snk</AssemblyOriginatorKeyFile>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<AppendToReleaseNotesProperty><![CDATA[
See full changelog at https://github.com/sillsdev/LfMerge/blob/master/CHANGELOG.md]]>
</AppendToReleaseNotesProperty>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<IsPackable>false</IsPackable>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<DefineConstants>TRACE;DEBUG;DBVERSION_7000072</DefineConstants>
<OutputType>Exe</OutputType>
</PropertyGroup>

Expand Down