Skip to content

Commit 1a42fa7

Browse files
committed
Fix build issues
1 parent 6f581b1 commit 1a42fa7

5 files changed

Lines changed: 23 additions & 9 deletions

File tree

Src/Common/FieldWorks/FieldWorks.csproj

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<AssemblyName>FieldWorks</AssemblyName>
@@ -10,8 +10,10 @@
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1111
<Deterministic>false</Deterministic>
1212
<ApplicationIcon>Branding\LT.ico</ApplicationIcon>
13+
<NoWin32Manifest>true</NoWin32Manifest>
1314
<EnableRegFreeCom>true</EnableRegFreeCom>
1415
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
16+
<UseDevTraceConfig Condition="'$(UseDevTraceConfig)'=='' and '$(FW_TRACE_LOG)'!=''">true</UseDevTraceConfig>
1517
</PropertyGroup>
1618
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
1719
<DebugSymbols>true</DebugSymbols>
@@ -61,6 +63,7 @@
6163
<ProjectReference Include="../../FdoUi/FdoUi.csproj" />
6264
<ProjectReference Include="../../FwCoreDlgs/FwCoreDlgs.csproj" />
6365
<ProjectReference Include="../../FwResources/FwResources.csproj" />
66+
<ProjectReference Include="../../LexText/LexTextDll/LexTextDll.csproj" />
6467
<ProjectReference Include="../../Utilities/Reporting/Reporting.csproj" />
6568
<ProjectReference Include="../../Utilities/XMLUtils/XMLUtils.csproj" />
6669
<ProjectReference Include="../../XCore/xCoreInterfaces/xCoreInterfaces.csproj" />
@@ -87,6 +90,13 @@
8790
<None Include="Branding\LT.png" />
8891
<None Include="Branding\LT64.png" />
8992
<None Include="Branding\LT128.png" />
93+
<None Include="FieldWorks.Diagnostics.config" Condition="'$(UseDevTraceConfig)'!='true'">
94+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
95+
</None>
96+
<None Include="FieldWorks.Diagnostics.dev.config" Condition="'$(UseDevTraceConfig)'=='true'">
97+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
98+
<TargetPath>FieldWorks.Diagnostics.config</TargetPath>
99+
</None>
90100
</ItemGroup>
91101
<Import Project="BuildInclude.targets" />
92102
<ItemGroup>
@@ -100,4 +110,4 @@
100110
<EmbeddedResource Include="SmallBookOnCube.ico" />
101111
<EmbeddedResource Include="SmallBookOnCubeVersion.ico" />
102112
</ItemGroup>
103-
</Project>
113+
</Project>

Src/Common/FieldWorks/FieldWorksTests/FieldWorksTests.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version='1.0' encoding='utf-8'?>
1+
<?xml version='1.0' encoding='utf-8'?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<AssemblyName>FieldWorksTests</AssemblyName>
@@ -33,7 +33,9 @@
3333
<PackageReference Include="SIL.TestUtilities" Version="17.0.0-*" />
3434
</ItemGroup>
3535
<ItemGroup>
36-
<Reference Include="PaToFdoInterfaces" />
36+
<Reference Include="PaToFdoInterfaces">
37+
<HintPath>..\\..\\..\\..\\DistFiles\\PaToFdoInterfaces.dll</HintPath>
38+
</Reference>
3739
<Reference Include="System.Windows.Forms" />
3840
<Reference Include="netstandard" />
3941
</ItemGroup>

Src/Common/Filters/Filters.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version='1.0' encoding='utf-8'?>
1+
<?xml version='1.0' encoding='utf-8'?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<AssemblyName>Filters</AssemblyName>

Src/Common/Filters/FiltersTests/FiltersTests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version='1.0' encoding='utf-8'?>
1+
<?xml version='1.0' encoding='utf-8'?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<AssemblyName>FiltersTests</AssemblyName>
@@ -46,7 +46,6 @@
4646
<ProjectReference Include="../Filters.csproj" />
4747
</ItemGroup>
4848
<ItemGroup>
49-
<Compile Include="../../../AssemblyInfoForTests.cs" Link="Properties/AssemblyInfoForTests.cs" />
5049
<Compile Include="..\..\..\CommonAssemblyInfo.cs">
5150
<Link>Properties\CommonAssemblyInfo.cs</Link>
5251
</Compile>

Src/Common/Framework/StylesXmlAccessor.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,12 @@ private ContextValues GetContext(XmlAttributeCollection attributes,
634634
{ // convert the string to a valid enum case insensitive
635635
return (ContextValues)Enum.Parse(typeof(ContextValues), sContext, true);
636636
}
637-
catch (Exception)
637+
catch (Exception ex)
638638
{
639-
throw new Exception($"Unrecognized context attribute for style {styleName} in {ResourceFileName}: {sContext}", ex);
639+
throw new Exception(
640+
$"Unrecognized context attribute for style {styleName} in {ResourceFileName}: {sContext}",
641+
ex
642+
);
640643
}
641644
}
642645

0 commit comments

Comments
 (0)