Skip to content

Commit 0971acf

Browse files
author
dahall
committed
Updated NuGetpackages and cleaned up solution settings
1 parent c247243 commit 0971acf

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net48;net5.0;net6.0;net7.0;net8.0-windows;net9.0-windows;net10.0-windows;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
3+
<TargetFrameworks Condition="'$(ExclSlnTargets)' != 'true'" >net48;net5.0;net6.0;net7.0;net8.0-windows;net9.0-windows;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
44
<!-- Defined variable for projects that do not support .NET Standard -->
5-
<TargetFrameworksNotStd>net48;net6.0;net7.0;net8.0-windows;net9.0-windows;net10.0-windows;netcoreapp3.1</TargetFrameworksNotStd>
5+
<TargetFrameworksNotStd>net48;net6.0;net7.0;net8.0-windows;net9.0-windows;netcoreapp3.1</TargetFrameworksNotStd>
66
<Configurations>Debug;Release</Configurations>
77
<Platforms>AnyCPU</Platforms>
88
<Version>4.3.0</Version>

Directory.Build.targets

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,14 @@
4040
<None Include="**\pkgreadme.md" Pack="true" PackagePath="\" />
4141
</ItemGroup>
4242

43+
<PropertyGroup>
44+
<ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
45+
</PropertyGroup>
46+
4347
<!-- Define Net5OrAbove variable -->
4448
<PropertyGroup>
4549
<Net5OrAbove>false</Net5OrAbove>
46-
<Net5OrAbove Condition=" $(TargetFramework.StartsWith('net5')) Or $(TargetFramework.StartsWith('net6')) Or $(TargetFramework.StartsWith('net7')) ">true</Net5OrAbove>
50+
<Net5OrAbove Condition=" $(TargetFramework.StartsWith('net5')) Or $(TargetFramework.StartsWith('net6')) Or $(TargetFramework.StartsWith('net7')) Or $(TargetFramework.StartsWith('net8')) Or $(TargetFramework.StartsWith('net9')) Or $(TargetFramework.StartsWith('net10')) ">true</Net5OrAbove>
4751
</PropertyGroup>
4852

4953
<!-- Explicit target settings for .NET 5 or above -->

Directory.Packages.props

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,28 @@
1414
<NETSTANDARD2_1>false</NETSTANDARD2_1>
1515
<NETSTANDARD2_1 Condition="'$(TargetFramework)' == 'netstandard2.1'">true</NETSTANDARD2_1>
1616
<ACCESSCTRL_COND>false</ACCESSCTRL_COND>
17-
<ACCESSCTRL_COND Condition="$(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcore')) Or $(TargetFramework.StartsWith('net5'))">true</ACCESSCTRL_COND>
17+
<ACCESSCTRL_COND Condition="$(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcore'))">true</ACCESSCTRL_COND>
1818
<DRAWING_COMMON_COND>false</DRAWING_COMMON_COND>
19-
<DRAWING_COMMON_COND Condition="$(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('net8')) Or $(TargetFramework.StartsWith('net9'))">true</DRAWING_COMMON_COND>
19+
<DRAWING_COMMON_COND Condition="$(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('net8')) Or $(TargetFramework.StartsWith('net9')) Or $(TargetFramework.StartsWith('net10'))">true</DRAWING_COMMON_COND>
2020
<PRENET6>false</PRENET6>
2121
<PRENET6 Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0'">true</PRENET6>
2222
<NET6OR7>false</NET6OR7>
2323
<NET6OR7 Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">true</NET6OR7>
2424
<NET8ORLATER>false</NET8ORLATER>
2525
<NET8ORLATER Condition="!$(PRENET6) And !$(NET6OR7)">true</NET8ORLATER>
26-
27-
<CODEANALYSISVER>4.14.0</CODEANALYSISVER>
26+
<CODEANALYSISVER>5.0.0</CODEANALYSISVER>
2827
<CODEANALYSISTESTVER>1.1.2</CODEANALYSISTESTVER>
29-
<SYSVER>9.0.7</SYSVER>
28+
<SYSVER>10.0.0</SYSVER>
3029
</PropertyGroup>
3130
<ItemGroup>
3231
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="7.1.2" Condition=" '$(TargetFramework)' == 'net5.0' " />
3332
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.0.0" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
3433
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.3.2" Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0' " />
3534
<PackageVersion Include="AutoFixture" Version="4.18.1" />
3635
<PackageVersion Include="dSPACE.Runtime.InteropServices" Version="1.10.0" />
37-
<PackageVersion Include="ICSharpCode.Decompiler" Version="9.0.0.7889" />
36+
<PackageVersion Include="ICSharpCode.Decompiler" Version="9.1.0.7988" />
3837
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(CODEANALYSISVER)" />
39-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(CODEANALYSISVER)" />
38+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
4039
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(CODEANALYSISVER)" />
4140
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(CODEANALYSISVER)" />
4241
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="$(CODEANALYSISTESTVER)" />
@@ -45,11 +44,13 @@
4544
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="$(CODEANALYSISTESTVER)" />
4645
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CODEANALYSISVER)" />
4746
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
48-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
47+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4948
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
49+
<PackageVersion Include="Microsoft.VisualBasic" Version="10.1.0" />
5050
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.14.2120" />
5151
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
52-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
52+
<PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22621.3233" />
53+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
5354
<PackageVersion Include="NUnit" Version="4.4.0" />
5455
<PackageVersion Include="NUnit.DeepObjectCompare" Version="2.0.1" />
5556
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
@@ -67,7 +68,8 @@
6768
<PackageVersion Include="System.Management" Version="6.0.2" Condition=" $(PRENET6) " />
6869
<PackageVersion Include="System.Management" Version="8.0.0" Condition=" $(NET6OR7) " />
6970
<PackageVersion Include="System.Management" Version="$(SYSVER)" Condition=" $(NET8ORLATER) " />
70-
<PackageVersion Include="System.Memory" Version="4.5.5" />
71+
<PackageVersion Include="System.Memory" Version="4.6.3" />
72+
<PackageVersion Include="System.Reflection.Metadata" Version="$(SYSVER)" />
7173
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" Condition=" $(NETSTANDARD2_1) " />
7274
<PackageVersion Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
7375
<PackageVersion Include="System.Security.AccessControl" Version="6.0.1" />

0 commit comments

Comments
 (0)