Skip to content

Commit b85b05d

Browse files
committed
Fix build (not ideally)
1 parent 186f907 commit b85b05d

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

Directory.Build.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,15 @@
6666
<VersionDependsOn>SilkShippingControl;$(VersionDependsOn)</VersionDependsOn>
6767
<PackageVersionDependsOn>SilkShippingControl;$(PackageVersionDependsOn)</PackageVersionDependsOn>
6868
<TargetsForTfmSpecificContentInPackage>SilkNativePackaging;$(TargetsForTfmSpecificContentInPackage)</TargetsForTfmSpecificContentInPackage>
69+
<GenerateNuspecDependsOn>SilkShippingControl;$(GenerateNuspecDependsOn)</GenerateNuspecDependsOn>
70+
</PropertyGroup>
71+
72+
<!-- SourceLink -->
73+
<PropertyGroup Condition="'$(SilkSourceLinkExempt)' == '' and '$(SilkNativePackage)' != 'true' and '$(SilkMetapackage)' != 'true'">
74+
<DebugType>portable</DebugType>
75+
<EmbedAllSources>true</EmbedAllSources>
76+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
77+
<IncludeSymbols>true</IncludeSymbols>
78+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
6979
</PropertyGroup>
7080
</Project>

Directory.Build.targets

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,6 @@
139139
</UsingTask>
140140

141141
<Target Name="SilkShippingControl" BeforeTargets="BeforeBuild">
142-
<!-- SourceLink -->
143-
<PropertyGroup Condition="'$(SilkSourceLinkExempt)' == '' and '$(SilkNativePackage)' != 'true' and '$(SilkMetapackage)' != 'true'">
144-
<DebugType>portable</DebugType>
145-
<EmbedAllSources>true</EmbedAllSources>
146-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
147-
<IncludeSymbols>true</IncludeSymbols>
148-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
149-
</PropertyGroup>
150-
151142
<!-- Non-C# packages (i.e. metapackages, natives) -->
152143
<PropertyGroup Condition="'$(SilkNativePackage)' == 'true' or '$(SilkMetapackage)' == 'true'">
153144
<IncludeBuildOutput Condition="'$(SilkNativeHasAndroidJars)' != 'true'">false</IncludeBuildOutput>

sources/Core/Core/Silk.NET.Core.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<!-- NOTE: Multitargeting here will be a PITA due to the references to TFM below -->
45
<TargetFramework>net8.0</TargetFramework>
56
<ImplicitUsings>enable</ImplicitUsings>
67
<Nullable>enable</Nullable>
@@ -9,8 +10,8 @@
910
<ItemGroup>
1011
<Compile Remove="Silk.NET.Core.cs" />
1112
<None Include="FodyWeavers.xml" />
12-
<Content Include="Silk.NET.Core.cs" />
13-
<Content Include="Silk.NET.Core.targets" PackagePath="build\$(TargetFramework)\$(PackageId).targets" />
13+
<None Include="Silk.NET.Core.cs" Pack="true" PackagePath="build\$(TargetFramework)\Silk.NET.Core.cs" />
14+
<None Include="Silk.NET.Core.targets" Pack="true" PackagePath="build\$(TargetFramework)\$(PackageId).targets" />
1415
</ItemGroup>
1516

1617
<ItemGroup>

0 commit comments

Comments
 (0)