Add AutoGenerateBindingRedirect

FObermaier · FObermaier · commit d69f2e367303 · 2020-03-26T08:49:31.000+01:00
diff --git a/Examples/WinFormSamples/WinFormSamples.csproj b/Examples/WinFormSamples/WinFormSamples.csproj
@@ -14,6 +14,7 @@
         <OutputType>WinExe</OutputType>
         <StartupObject>WinFormSamples.Program</StartupObject>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/SharpMap.UI/SharpMap.UI.csproj b/SharpMap.UI/SharpMap.UI.csproj
@@ -11,6 +11,7 @@
         <PackageTags>sharpmap winforms</PackageTags>
         <Description>This package contains UI Compontents for System.Windows.Forms.</Description>
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/SharpMap/SharpMap.csproj b/SharpMap/SharpMap.csproj
@@ -8,6 +8,7 @@
         <Copyright>Copyright 2006 Morten Nielsen, Copyright 2008-$([System.DateTime]::UtcNow.Year) SharpMap - Team</Copyright>
         <PackageTags>SharpMap GIS Map GeoSpatial</PackageTags>
         <Description>This package contains the core components of SharpMap.</Description>
+        <!--<EnableApiCompat>true</EnableApiCompat>-->
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,9 +18,6 @@
     <ItemGroup>
         <EmbeddedResource Include="Styles\DefaultSymbol.png" />
     </ItemGroup>
-    <ItemGroup>
-        <ResolvedMatchingContract Include=".\LastMajorVersionBinary\$(AssemblyName).dll" />
-    </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Common.Logging" Version="3.4.1" />
@@ -29,13 +27,16 @@
         <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
         <PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
         <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
-        <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19557.20" PrivateAssets="All" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="LastMajorVersionBinary\" />
+    <ItemGroup Condition=" '$(EnableApiCompat)' == 'true' ">
+        <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20162.3" PrivateAssets="All" />
+        <PackageDownload Include="SharpMap" Version="[1.1.0]" PrivateAssets="All" />
+
+        <ResolvedMatchingContract Include="$(NugetPackageRoot)sharpmap\1.1.0\lib\net40-client\SharpMap.dll" />
     </ItemGroup>
 
+
     <PropertyGroup>
         <DriveSeperator>$(SolutionDir.SubString(1,1))</DriveSeperator>
     </PropertyGroup>
