Skip to content

Commit 25aee73

Browse files
ShawnLaMountainShawnLaMountain
authored
Merge pull request #44 from ShawnLaMountain/Net10-Upgrade
Added Toolkit Package reference
2 parents b3ed373 + 2f19916 commit 25aee73

3 files changed

Lines changed: 29 additions & 8 deletions

File tree

‎src/ThunderDesign.Net-PCL.Threading.Shared/ThunderDesign.Net-PCL.Threading.Shared.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<None Include="**\*.config" Pack="true" PackagePath="contentFiles\any\any\" />
2222
</ItemGroup>
2323

24-
<ItemGroup>
24+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.0' AND '$(TargetFramework)' != 'netstandard1.3' ">
2525
<PackageReference Include="ThunderDesign.Net-PCL.ToolBox" Version="1.1.1" />
2626
</ItemGroup>
2727

‎src/ThunderDesign.Net-PCL.Threading.nuspec.in‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,50 @@
1515
<repository type="git" url="${{ env.REPOSITORY_URL }}" />
1616
<readme>README.md</readme>
1717
<dependencies>
18-
<group targetFramework="netstandard1.0" />
18+
<!-- Explicitly declare empty groups for netstandard1.x so they don't inherit the Toolkit --> <group targetFramework="netstandard1.0" />
1919
<group targetFramework="netstandard1.3" />
20-
<group targetFramework="netstandard2.0" />
21-
<group targetFramework="net6.0" />
22-
<group targetFramework="net8.0" />
23-
<group targetFramework="net9.0" />
24-
<group targetFramework="net10.0" />
20+
21+
<!-- Require the Toolkit for everything else -->
22+
<group targetFramework="netstandard2.0" >
23+
<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
24+
</group>
25+
<group targetFramework="net6.0" >
26+
<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
27+
</group>
28+
<group targetFramework="net8.0" >
29+
<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
30+
</group>
31+
<group targetFramework="net9.0" >
32+
<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
33+
</group>
34+
<group targetFramework="net10.0" >
35+
<dependency id="ThunderDesign.Net-PCL.ToolBox" version="1.1.1" />
36+
</group>
2537
</dependencies>
2638
</metadata>
2739
<files>
40+
<!-- Include main library output -->
2841
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/netstandard1.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/netstandard1.0/" />
2942
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/netstandard1.3/ThunderDesign.Net-PCL.Threading.dll" target="lib/netstandard1.3/" />
3043
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/netstandard2.0/" />
3144
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net6.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net6.0/" />
3245
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net8.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net8.0/" />
3346
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net9.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net9.0/" />
3447
<file src="src/ThunderDesign.Net-PCL.Threading/bin/Release/net10.0/ThunderDesign.Net-PCL.Threading.dll" target="lib/net10.0/" />
48+
49+
<!-- Include shared library output -->
3550
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard1.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard1.0/" />
3651
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard1.3/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard1.3/" />
3752
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/netstandard2.0/" />
3853
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net6.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net6.0/" />
3954
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net8.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net8.0/" />
4055
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net9.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net9.0/" />
4156
<file src="src/ThunderDesign.Net-PCL.Threading.Shared/bin/Release/net10.0/ThunderDesign.Net-PCL.Threading.Shared.dll" target="lib/net10.0/" />
57+
58+
<!-- The global Analyzer folder (safely guarded by csproj targeting limits) -->
4259
<file src="src/ThunderDesign.Net-PCL.SourceGenerators/bin/Release/netstandard2.0/ThunderDesign.Net-PCL.SourceGenerators.dll" target="analyzers/dotnet/cs/" />
60+
61+
<!-- Include the README -->
4362
<file src="README.md" target="" />
4463
</files>
4564
</package>

‎src/ThunderDesign.Net-PCL.Threading/ThunderDesign.Net-PCL.Threading.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
<PackagePath>\</PackagePath>
1717
</None>
1818
</ItemGroup>
19+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.0' AND '$(TargetFramework)' != 'netstandard1.3' ">
20+
<ProjectReference Include="..\ThunderDesign.Net-PCL.SourceGenerators\ThunderDesign.Net-PCL.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
21+
</ItemGroup>
1922
<ItemGroup>
20-
<ProjectReference Include="..\ThunderDesign.Net-PCL.SourceGenerators\ThunderDesign.Net-PCL.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0'" />
2123
<ProjectReference Include="..\ThunderDesign.Net-PCL.Threading.Shared\ThunderDesign.Net-PCL.Threading.Shared.csproj" />
2224
</ItemGroup>
2325

0 commit comments

Comments
 (0)