Skip to content

Commit 89dea30

Browse files
committed
Update everything to support .NET 6.0 correctly
1 parent 7563634 commit 89dea30

File tree

4 files changed

+94
-75
lines changed

4 files changed

+94
-75
lines changed

BurnOutSharp/BurnOutSharp.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
55
<Title>BurnOutSharp</Title>
66
<AssemblyName>BurnOutSharp</AssemblyName>
77
<Description>Port of BurnOut to C#, with additions</Description>
@@ -57,14 +57,23 @@
5757
</ItemGroup>
5858

5959
<ItemGroup>
60-
<ProjectReference Include="..\BurnOutSharp.Matching\BurnOutSharp.Matching.csproj" />
61-
<ProjectReference Include="..\BurnOutSharp.Models\BurnOutSharp.Models.csproj" />
62-
<ProjectReference Include="..\BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj" />
63-
<ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj">
60+
<ProjectReference Include="..\BurnOutSharp.Matching\BurnOutSharp.Matching.csproj">
6461
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6562
<PrivateAssets>all</PrivateAssets>
6663
</ProjectReference>
67-
<ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj">
64+
<ProjectReference Include="..\BurnOutSharp.Models\BurnOutSharp.Models.csproj">
65+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
66+
<PrivateAssets>all</PrivateAssets>
67+
</ProjectReference>
68+
<ProjectReference Include="..\BurnOutSharp.Wrappers\BurnOutSharp.Wrappers.csproj">
69+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
70+
<PrivateAssets>all</PrivateAssets>
71+
</ProjectReference>
72+
<ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" Condition="'$(TargetFramework)' != 'net6.0'">
73+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
74+
<PrivateAssets>all</PrivateAssets>
75+
</ProjectReference>
76+
<ProjectReference Include="..\Dtf\src\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" Condition="'$(TargetFramework)' != 'net6.0'">
6877
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6978
<PrivateAssets>all</PrivateAssets>
7079
</ProjectReference>
@@ -76,7 +85,10 @@
7685
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7786
<PrivateAssets>all</PrivateAssets>
7887
</ProjectReference>
79-
<ProjectReference Include="..\psxt001z\psxt001z.csproj" />
88+
<ProjectReference Include="..\psxt001z\psxt001z.csproj">
89+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
90+
<PrivateAssets>all</PrivateAssets>
91+
</ProjectReference>
8092
</ItemGroup>
8193

8294
</Project>

0 commit comments

Comments
 (0)