Update dependencies

tom-englert · Oct 15, 2023 · 37afd9d · 37afd9d
1 parent dc9802e
commit 37afd9d
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 41 deletions.
diff --git a/src/SampleApp.Mef1/SampleApp.Mef1.csproj b/src/SampleApp.Mef1/SampleApp.Mef1.csproj
@@ -26,9 +26,9 @@
   -->
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
+    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
     <PackageReference Include="Throttle.Fody" Version="1.7.0" PrivateAssets="all" />
-    <PackageReference Include="PropertyChanged.Fody" Version="4.0.5" PrivateAssets="all" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
   </ItemGroup>
 

diff --git a/src/SampleApp.Ninject/SampleApp.Ninject.csproj b/src/SampleApp.Ninject/SampleApp.Ninject.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <Tags>Sample</Tags>
     <ApplicationIcon>..\SampleApp\16x16.ico</ApplicationIcon>
@@ -19,8 +19,10 @@
 
   <ItemGroup>
     <PackageReference Include="Ninject.Extensions.Conventions" Version="3.3.0" />
-    <PackageReference Include="System.Composition" Version="[1.4.1]" />
+    <PackageReference Include="Ninject.Extensions.Factory" Version="3.3.3" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="System.Composition" Version="[1.4.1]" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SampleApp/SampleApp.csproj b/src/SampleApp/SampleApp.csproj
@@ -19,10 +19,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
+    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="all" />
     <PackageReference Include="System.Composition" Version="[1.4.1]" />
     <PackageReference Include="Throttle.Fody" Version="1.7.0" PrivateAssets="all" />
-    <PackageReference Include="PropertyChanged.Fody" Version="4.0.5" PrivateAssets="all" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>

diff --git a/src/TomsToolbox.Composition.Analyzer.Tests/TomsToolbox.Composition.Analyzer.Tests.csproj b/src/TomsToolbox.Composition.Analyzer.Tests/TomsToolbox.Composition.Analyzer.Tests.csproj
@@ -1,14 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>CA1050;CA2007</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NuGet.Common" Version="6.7.0" />
+    <PackageReference Include="NuGet.Packaging" Version="6.7.0" />
+    <PackageReference Include="NuGet.Protocol" Version="6.7.0" />
+    <PackageReference Include="NuGet.Resolver" Version="6.7.0" />
+    <PackageReference Include="xunit" Version="2.5.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TomsToolbox.Composition.Analyzer\TomsToolbox.Composition.Analyzer.csproj" />

diff --git a/src/TomsToolbox.Composition.Analyzer/TomsToolbox.Composition.Analyzer.csproj b/src/TomsToolbox.Composition.Analyzer/TomsToolbox.Composition.Analyzer.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="[4.2.0]" />
   </ItemGroup>
 
   <Target Name="IncludeAnalyzer">

diff --git a/...oolbox.Composition.MicrosoftExtensions/TomsToolbox.Composition.MicrosoftExtensions.csproj b/...oolbox.Composition.MicrosoftExtensions/TomsToolbox.Composition.MicrosoftExtensions.csproj
@@ -17,8 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/TomsToolbox.Composition.Tests/TomsToolbox.Composition.Tests.csproj b/src/TomsToolbox.Composition.Tests/TomsToolbox.Composition.Tests.csproj
@@ -8,12 +8,12 @@
     <Compile Include="..\Nullable.cs" Link="Nullable.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Verify.Xunit" Version="17.10.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Verify.Xunit" Version="22.1.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SampleApp.Mef2\SampleApp.Mef2.csproj" />

diff --git a/src/TomsToolbox.Desktop.Tests/TomsToolbox.Desktop.Tests.csproj b/src/TomsToolbox.Desktop.Tests/TomsToolbox.Desktop.Tests.csproj
@@ -8,9 +8,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TomsToolbox.Desktop\TomsToolbox.Desktop.csproj">

diff --git a/src/TomsToolbox.Essentials.Tests/TomsToolbox.Essentials.Tests.csproj b/src/TomsToolbox.Essentials.Tests/TomsToolbox.Essentials.Tests.csproj
@@ -8,9 +8,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TomsToolbox.Essentials\TomsToolbox.Essentials.csproj">

diff --git a/src/TomsToolbox.GitHub/FodyWeavers.xsd b/src/TomsToolbox.GitHub/FodyWeavers.xsd
@@ -44,7 +44,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>
@@ -85,7 +85,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>

diff --git a/src/TomsToolbox.GitHub/TomsToolbox.GitHub.csproj b/src/TomsToolbox.GitHub/TomsToolbox.GitHub.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ILMerge.Fody" Version="1.23.0" PrivateAssets="All" />
-    <PackageReference Include="Octokit" Version="2.0.1" />
+    <PackageReference Include="ILMerge.Fody" Version="1.24.0" PrivateAssets="All" />
+    <PackageReference Include="Octokit" Version="8.1.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/TomsToolbox.ObservableCollections.Tests/TomsToolbox.ObservableCollections.Tests.csproj b/src/TomsToolbox.ObservableCollections.Tests/TomsToolbox.ObservableCollections.Tests.csproj
@@ -5,9 +5,9 @@
     <Tags>Test</Tags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TomsToolbox.Essentials\TomsToolbox.Essentials.csproj">

diff --git a/src/TomsToolbox.ObservableCollections/TomsToolbox.ObservableCollections.csproj b/src/TomsToolbox.ObservableCollections/TomsToolbox.ObservableCollections.csproj
@@ -16,9 +16,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="WeakEventHandler.Fody" Version="1.7.0" PrivateAssets="All" />
+    <PackageReference Include="WeakEventHandler.Fody" Version="1.8.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TomsToolbox.Wpf.Compostition.Styles/TomsToolbox.Wpf.Composition.Styles.csproj b/src/TomsToolbox.Wpf.Compostition.Styles/TomsToolbox.Wpf.Composition.Styles.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Throttle.Fody" Version="1.7.0" PrivateAssets="All" />
   </ItemGroup>

diff --git a/src/TomsToolbox.Wpf.Tests/TomsToolbox.Wpf.Tests.csproj b/src/TomsToolbox.Wpf.Tests/TomsToolbox.Wpf.Tests.csproj
@@ -10,9 +10,9 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="xunit" Version="2.5.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TomsToolbox.Wpf\TomsToolbox.Wpf.csproj" />

diff --git a/src/TomsToolbox.Wpf/TomsToolbox.Wpf.csproj b/src/TomsToolbox.Wpf/TomsToolbox.Wpf.csproj
@@ -28,12 +28,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="All" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="All" />
     <PackageReference Include="JetBrainsAnnotations.Fody" Version="2.17.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Throttle.Fody" Version="1.7.0" PrivateAssets="All" />
-    <PackageReference Include="WeakEventHandler.Fody" Version="1.7.0" PrivateAssets="All" />
+    <PackageReference Include="WeakEventHandler.Fody" Version="1.8.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>