Skip to content

Commit 16c8b63

Browse files
Update FieldWorks.cs to use latest dependencies
* Update L10nSharp calls * Specify the LCModel BackupProjectSettings * Add CommonAsssemblyInfo.cs link lost in conversion * Set Deterministic builds to false for now (evaluate later)
1 parent 0f963d4 commit 16c8b63

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

Src/Common/FieldWorks/FieldWorks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2603,7 +2603,7 @@ private static bool BackupProjectForRestore(FwRestoreProjectSettings restoreSett
26032603
try
26042604
{
26052605
var versionInfoProvider = new VersionInfoProvider(Assembly.GetExecutingAssembly(), false);
2606-
var backupSettings = new BackupProjectSettings(cache, restoreSettings.Settings,
2606+
var backupSettings = new LCModel.DomainServices.BackupRestore.BackupProjectSettings(cache, restoreSettings.Settings,
26072607
FwDirectoryFinder.DefaultBackupDirectory, versionInfoProvider.MajorVersion);
26082608
backupSettings.DestinationFolder = FwDirectoryFinder.DefaultBackupDirectory;
26092609

Src/Common/FieldWorks/FieldWorks.csproj

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
99
<NoWarn>168,169,219,414,649,1635,1702,1701</NoWarn>
1010
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11+
<Deterministic>false</Deterministic>
1112
</PropertyGroup>
1213

1314
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -51,11 +52,14 @@
5152
<PackageReference Include="SIL.Windows.Forms" Version="17.0.0-*" />
5253
<PackageReference Include="SIL.Windows.Forms.Keyboarding" Version="17.0.0-*" />
5354
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
54-
<PackageReference Include="Geckofx60.64" Version="60.0.54" /></ItemGroup>
55+
<PackageReference Include="Geckofx60.64" Version="60.0.54" />
56+
</ItemGroup>
5557

5658
<ItemGroup>
5759
<Reference Include="Microsoft.Build.Framework" />
58-
<Reference Include="PaToFdoInterfaces" />
60+
<Reference Include="PaToFdoInterfaces">
61+
<HintPath>..\..\..\DistFiles\PaToFdoInterfaces.dll</HintPath>
62+
</Reference>
5963
<Reference Include="System.Configuration" />
6064
<Reference Include="System.Drawing" />
6165
<Reference Include="System.Net" />
@@ -83,7 +87,12 @@
8387
<ProjectReference Include="../ViewsInterfaces/ViewsInterfaces.csproj" />
8488
<ProjectReference Include="..\..\LexText\LexTextControls\LexTextControls.csproj" />
8589
</ItemGroup>
86-
87-
8890
<ItemGroup>
89-
<Compile Remove="FieldWorksTests/**" /><None Remove="FieldWorksTests/**" /></ItemGroup></Project>
91+
<Compile Include="..\..\CommonAssemblyInfo.cs">
92+
<Link>Properties\CommonAssemblyInfo.cs</Link>
93+
</Compile>
94+
<EmbeddedResource Update="Properties\Resources.resx" />
95+
<Compile Remove="FieldWorksTests/**" />
96+
<None Remove="FieldWorksTests/**" />
97+
</ItemGroup>
98+
</Project>

0 commit comments

Comments
 (0)