Package Updates and Fix for Source Generator Duplication

See dotnet/wpf#6792 and dotnet/wpf#6680
cmiles · Aug 24, 2022 · 417515d · 417515d
1 parent e53737e
commit 417515d
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 13 deletions.
diff --git a/PointlessWaymarks.CmsContentEditor/PointlessWaymarks.CmsContentEditor.csproj b/PointlessWaymarks.CmsContentEditor/PointlessWaymarks.CmsContentEditor.csproj
@@ -7,6 +7,20 @@
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+
+    <RemoveDuplicates Inputs="@(Analyzer)">
+      <Output
+        TaskParameter="Filtered"
+        ItemName="FilteredAnalyzer"/>
+    </RemoveDuplicates>
+
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
     <PackageReference Include="GitInfo" Version="2.2.0">

diff --git a/PointlessWaymarks.CmsData/PointlessWaymarks.CmsData.csproj b/PointlessWaymarks.CmsData/PointlessWaymarks.CmsData.csproj
@@ -42,7 +42,7 @@
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="1.0.0-alpha-844" />
     <PackageReference Include="AngleSharp.Js" Version="0.15.0" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.9.36" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.9.42" />
     <PackageReference Include="ClosedXML" Version="0.96.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
     <PackageReference Include="CompareNETObjects" Version="4.77.0" />
@@ -58,23 +58,23 @@
     <PackageReference Include="HtmlTags" Version="8.1.1" />
     <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
     <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
-    <PackageReference Include="Markdig" Version="0.30.2" />
+    <PackageReference Include="Markdig" Version="0.30.3" />
     <PackageReference Include="MetadataExtractor" Version="2.7.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.8" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="NetTopologySuite" Version="2.5.0" />
     <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="2.0.4" />
     <PackageReference Include="NetTopologySuite.IO.GPX" Version="1.1.1" />
     <PackageReference Include="ObjectDumper.NET" Version="3.4.6" />
-    <PackageReference Include="PhotoSauce.MagicScaler" Version="0.13.0" />
+    <PackageReference Include="PhotoSauce.MagicScaler" Version="0.13.1" />
     <PackageReference Include="pinboard.net" Version="1.0.0" />
     <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="Serilog" Version="2.11.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
     <PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Exceptions" Version="8.3.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />

diff --git a/PointlessWaymarks.CmsTests/PointlessWaymarks.CmsTests.csproj b/PointlessWaymarks.CmsTests/PointlessWaymarks.CmsTests.csproj
@@ -14,7 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PointlessWaymarks.CmsWpfControls/PointlessWaymarks.CmsWpfControls.csproj b/PointlessWaymarks.CmsWpfControls/PointlessWaymarks.CmsWpfControls.csproj
@@ -4,11 +4,25 @@
     <UseWPF>true</UseWPF>
     <ApplicationIcon>PointlessWaymarksCmsIcons\favicon.ico</ApplicationIcon>
   </PropertyGroup>
-
 
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+
+    <RemoveDuplicates Inputs="@(Analyzer)">
+      <Output
+        TaskParameter="Filtered"
+        ItemName="FilteredAnalyzer"/>
+    </RemoveDuplicates>
+
     <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
     </ItemGroup>
+  </Target>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="leaflet-bing-layer.js" />
     <None Remove="pure-min.css" />
@@ -24,7 +38,7 @@
     <PackageReference Include="gong-wpf-dragdrop" Version="3.1.1" />
     <PackageReference Include="Markdig.Wpf" Version="0.5.0.1" />
     <PackageReference Include="Microsoft.Recognizers.Text.DateTime" Version="1.8.5" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1293.44" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
     <PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
     <PackageReference Include="TypeSupport" Version="1.1.12" />

diff --git a/PointlessWaymarks.LocalViewer/PointlessWaymarks.LocalViewer.csproj b/PointlessWaymarks.LocalViewer/PointlessWaymarks.LocalViewer.csproj
@@ -7,6 +7,20 @@
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+
+    <RemoveDuplicates Inputs="@(Analyzer)">
+      <Output
+        TaskParameter="Filtered"
+        ItemName="FilteredAnalyzer"/>
+    </RemoveDuplicates>
+
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />

diff --git a/PointlessWaymarks.PressSharper.UnitTests/PointlessWaymarks.PressSharper.UnitTests.csproj b/PointlessWaymarks.PressSharper.UnitTests/PointlessWaymarks.PressSharper.UnitTests.csproj
@@ -8,7 +8,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>

diff --git a/PointlessWaymarks.WpfCommon/PointlessWaymarks.WpfCommon.csproj b/PointlessWaymarks.WpfCommon/PointlessWaymarks.WpfCommon.csproj
@@ -4,6 +4,20 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
+
+    <RemoveDuplicates Inputs="@(Analyzer)">
+      <Output
+        TaskParameter="Filtered"
+        ItemName="FilteredAnalyzer"/>
+    </RemoveDuplicates>
+
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" />
+      <Analyzer Include="@(FilteredAnalyzer)" />
+    </ItemGroup>
+  </Target>
+
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
     <PackageReference Include="GitInfo" Version="2.2.0">
@@ -12,12 +26,12 @@
     </PackageReference>
     <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    <PackageReference Include="PhotoSauce.MagicScaler" Version="0.13.0" />
+    <PackageReference Include="PhotoSauce.MagicScaler" Version="0.13.1" />
     <PackageReference Include="Serilog" Version="2.11.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
     <PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="Serilog.Exceptions" Version="8.3.0" />
+    <PackageReference Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />