Skip to content

Commit 74336bb

Browse files
johnml1135johnml1135
committed
Enable GeneratePathPropery for SIL.LCModel.Core
* As well as for NativeBuild * Fix LcmArtifactsDir in mkall.targets
1 parent b6c86fe commit 74336bb

File tree

67 files changed

+135
-134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+135
-134
lines changed

‎Build/Src/NativeBuild/NativeBuild.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@
3535
<DownloadsDir>$(fwrt)/Downloads</DownloadsDir>
3636
<!-- Don't override LcmArtifactsDir - let mkall.targets set it from the package -->
3737
</PropertyGroup>
38-
<!-- Reference to sil.lcmodel.core package for contentFiles.
39-
We don't use GeneratePathProperty because it requires a full restore,
40-
so we compute the path manually in mkall.targets using LcmNugetVersion. -->
38+
<!-- Reference to sil.lcmodel.core package for contentFiles. -->
4139
<ItemGroup>
42-
<PackageReference Include="SIL.LCModel.Core" Version="$(LcmNugetVersion)">
40+
<PackageReference Include="SIL.LCModel.Core" Version="$(LcmNugetVersion)" GeneratePathProperty="true">
4341
<IncludeAssets>none</IncludeAssets>
4442
<PrivateAssets>all</PrivateAssets>
4543
</PackageReference>

‎Build/mkall.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,9 @@
520520
>$(DownloadsDir)</ChorusArtifactsDir
521521
>
522522
<!-- LCM Core artifacts (native interfaces, ICU data) from sil.lcmodel.core NuGet package -->
523+
<LcmArtifactsDir Condition="'$(LcmArtifactsDir)'=='' AND '$(PkgSIL_LCModel_Core)'!=''"
524+
>$(PkgSIL_LCModel_Core)/contentFiles</LcmArtifactsDir
525+
>
523526
<LcmArtifactsDir Condition="'$(LcmArtifactsDir)'==''"
524527
>$(PackagesDir)/sil.lcmodel.core/$(LcmNugetVersion)/contentFiles</LcmArtifactsDir
525528
>

‎Lib/src/ScrChecks/ScrChecks.csproj‎

Lines changed: 2 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>ScrChecks</AssemblyName>
@@ -22,7 +22,7 @@
2222
<DefineConstants>TRACE</DefineConstants>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
25+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<Reference Include="System.Deployment" />

‎Lib/src/ScrChecks/ScrChecksTests/ScrChecksTests.csproj‎

Lines changed: 2 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>ScrChecksTests</AssemblyName>
@@ -25,7 +25,7 @@
2525
<ItemGroup>
2626
<PackageReference Include="NUnit" Version="4.4.0" />
2727
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.9" />
28-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
28+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
2929
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
3030
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
3131
</ItemGroup>

‎Src/CacheLight/CacheLight.csproj‎

Lines changed: 2 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
<TargetFramework>net48</TargetFramework>
@@ -43,7 +43,7 @@
4343
<None Remove="CacheLightTests\**" />
4444
</ItemGroup>
4545
<ItemGroup>
46-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
46+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
4747
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
4848
</ItemGroup>
4949
<ItemGroup>

‎Src/CacheLight/CacheLightTests/CacheLightTests.csproj‎

Lines changed: 2 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>CacheLightTests</AssemblyName>
@@ -24,7 +24,7 @@
2424
<DebugType>none</DebugType>
2525
</PropertyGroup>
2626
<ItemGroup>
27-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
27+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
2828
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
2929
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
3030
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />

‎Src/Common/Controls/DetailControls/DetailControls.csproj‎

Lines changed: 2 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>DetailControls</AssemblyName>
@@ -26,7 +26,7 @@
2626
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
2727
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
2828
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
29-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
29+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
3030
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
3131
<PackageReference Include="SIL.WritingSystems" Version="17.0.0-*" />
3232
</ItemGroup>

‎Src/Common/Controls/DetailControls/DetailControlsTests/DetailControlsTests.csproj‎

Lines changed: 2 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>DetailControlsTests</AssemblyName>
@@ -26,7 +26,7 @@
2626
<ItemGroup>
2727
<PackageReference Include="CommonServiceLocator" Version="2.0.7" Exclude="Build,Analyzers" />
2828
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
29-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
29+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
3030
<PackageReference Include="SIL.LCModel.Core.Tests" Version="11.0.0-*" PrivateAssets="All" />
3131
<PackageReference Include="SIL.LCModel.Tests" Version="11.0.0-*" PrivateAssets="All" />
3232
<PackageReference Include="SIL.LCModel.Utils.Tests" Version="11.0.0-*" PrivateAssets="All" />

‎Src/Common/Controls/FwControls/FwControls.csproj‎

Lines changed: 2 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>FwControls</AssemblyName>
@@ -29,7 +29,7 @@
2929
<PackageReference Include="SIL.Core.Desktop" Version="17.0.0-*" />
3030
<PackageReference Include="SIL.DesktopAnalytics" Version="4.0.0" />
3131
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
32-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
32+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
3333
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
3434
<PackageReference Include="SIL.ParatextShared" Version="7.4.0.1" />
3535
<PackageReference Include="SIL.Windows.Forms" Version="17.0.0-*" />

‎Src/Common/Controls/Widgets/Widgets.csproj‎

Lines changed: 2 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>Widgets</AssemblyName>
@@ -28,7 +28,7 @@
2828
<PackageReference Include="SIL.Core" Version="17.0.0-*" />
2929
<PackageReference Include="SIL.Core.Desktop" Version="17.0.0-*" />
3030
<PackageReference Include="SIL.LCModel" Version="11.0.0-*" />
31-
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" />
31+
<PackageReference Include="SIL.LCModel.Core" Version="11.0.0-*" GeneratePathProperty="true" />
3232
<PackageReference Include="SIL.LCModel.Utils" Version="11.0.0-*" />
3333
<PackageReference Include="SIL.Media" Version="17.0.0-*" />
3434
<PackageReference Include="SIL.Windows.Forms" Version="17.0.0-*" />

0 commit comments

Comments
 (0)