diff options
| -rw-r--r-- | docs/technical/mod-package.md | 1 | ||||
| -rw-r--r-- | src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/technical/mod-package.md b/docs/technical/mod-package.md index 4c31f69b..b29f3f72 100644 --- a/docs/technical/mod-package.md +++ b/docs/technical/mod-package.md @@ -414,6 +414,7 @@ when you compile it. ## Release notes ## Upcoming release * Added detection for Xbox app game folders. +* Fixed "_conflicts between different versions of Microsoft.Win32.Registry_" warnings in recent SMAPI versions. * Internal refactoring. ## 4.0.0 diff --git a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj index 82eac7f6..09792d3c 100644 --- a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj +++ b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj @@ -25,6 +25,12 @@ <ItemGroup> <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> + + <!-- + This is imported through Microsoft.Build.Utilities.Core. When installed by a mod, NuGet + otherwise imports version 4.3.0 instead of 5.0.0, which conflicts with SMAPI's version. + --> + <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> </ItemGroup> <ItemGroup> |