Skip to content

Commit

Permalink
Update dependencies; native net8.0 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
tom-englert committed Dec 22, 2023
1 parent 5ca3520 commit e07fc7b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/BasicSample/BasicSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
</ItemGroup>

Expand Down
14 changes: 7 additions & 7 deletions src/DataGridExtensions/DataGridExtensions.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>net452;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net6.0-windows7.0;net8.0-windows7.0</TargetFrameworks>
<UseWPF>true</UseWPF>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -27,20 +27,20 @@ The current version supports the following features:
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ILMerge.Fody" Version="1.22.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
<PackageReference Include="Fody" Version="6.6.0" PrivateAssets="all">
<PackageReference Include="ILMerge.Fody" Version="1.24.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Nullable.Extended.Analyzer" Version="1.10.4539">
<PackageReference Include="Nullable.Extended.Analyzer" Version="1.14.6129">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Throttle.Fody" Version="1.7.0" PrivateAssets="All" />
<PackageReference Include="TomsToolbox.Wpf" Version="2.7.4" PrivateAssets="All" />
<PackageReference Include="TomsToolbox.Wpf" Version="2.11.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\Icon.png" Link="Icon.png" Pack="true" PackagePath="\" />
Expand Down
4 changes: 2 additions & 2 deletions src/DataGridExtensions/FodyWeavers.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</xs:element>
<xs:element name="CompactMode" type="xs:boolean" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>A switch to control whether to compact the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
<xs:documentation>A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all>
Expand Down Expand Up @@ -86,7 +86,7 @@
</xs:attribute>
<xs:attribute name="CompactMode" type="xs:boolean">
<xs:annotation>
<xs:documentation>A switch to control whether to compact the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
<xs:documentation>A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
Expand Down
12 changes: 6 additions & 6 deletions src/DataGridExtensionsSample/DataGridExtensionsSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
<ProjectReference Include="..\DataGridExtensions\DataGridExtensions.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fody" Version="6.6.0">
<PackageReference Include="Fody" Version="6.8.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" PrivateAssets="All" />
<PackageReference Include="TomsToolbox.Composition.Ninject" Version="2.7.4" />
<PackageReference Include="TomsToolbox.Wpf.Composition" Version="2.7.4" />
<PackageReference Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.7.4" />
<PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.7.4" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
<PackageReference Include="TomsToolbox.Composition.Ninject" Version="2.11.0" />
<PackageReference Include="TomsToolbox.Wpf.Composition" Version="2.11.0" />
<PackageReference Include="TomsToolbox.Wpf.Composition.AttributedModel" Version="2.11.0" />
<PackageReference Include="TomsToolbox.Wpf.Styles" Version="2.10.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
Expand Down
4 changes: 2 additions & 2 deletions src/Documentation/Documentation.shfbproj
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="EWSoftware.SHFB" Version="2019.9.15" />
<PackageReference Include="EWSoftware.SHFB.NETFramework" Version="4.8.0" />
<PackageReference Include="EWSoftware.SHFB" Version="2023.7.8" />
<PackageReference Include="EWSoftware.SHFB.NETFramework" Version="4.8.0.2" />
</ItemGroup>
<!-- Import the SHFB build targets -->
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="'$(MSBuildRestoreSessionId)' != ''" />
Expand Down

0 comments on commit e07fc7b

Please sign in to comment.