diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-16 11:25:36 +0300 |
|---|---|---|
| committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2019-01-16 11:25:36 +0300 |
| commit | c743a1f336103eeadf4ed183df531aecc6c4c223 (patch) | |
| tree | 22700647d1c37d7ce3a8ea9055a342f17aa0dcf5 /main/msbuild | |
| parent | 394c1b8e189cad30800cfe2517fdbd493c6e02d1 (diff) | |
Remove appconfig based unification
It didn't work. MSBuild prefers "primary" references (e.g.
then entire graph transitively pulled in from NuGet
PackageReference) over "secondary" references (e.g.
framework assemblies referenced by a referenced project)
EVEN IF the secondary ref is
* newer
* part of the framework
* specified in a binding redirect
We'll need some other hack to work around the
bad 4.84.4 SharpZipLib in the GAC. Ideally we
could just disable GAC reference resolving, but
that's currently the only way we can resolved
GTK# and friends.
Diffstat (limited to 'main/msbuild')
| -rw-r--r-- | main/msbuild/MonoDevelop.BeforeCommon.targets | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/main/msbuild/MonoDevelop.BeforeCommon.targets b/main/msbuild/MonoDevelop.BeforeCommon.targets index b389e8ec45..7bcb851328 100644 --- a/main/msbuild/MonoDevelop.BeforeCommon.targets +++ b/main/msbuild/MonoDevelop.BeforeCommon.targets @@ -83,38 +83,4 @@ --> <PackageReference Include="RoslynCodeTaskFactory" Version="2.0.7" /> </ItemGroup> - - <!-- - HACK: For libraries, disable AutoUnifyAssemblyReferences, and instead use - the ResolveAssemblyReference.AppConfigFile for conflict resolution. - - This works around the issue where the bad SharpZipLib 4.x.x.x in Mono's GAC - wins out over actual newer versions from NuGet. - - As a bonus, this also means we get warnings from extensions when they - require binding redirects in the main app.config. - --> - <Target Name="_InjectAppConfigForResolveReferences" - BeforeTargets="ResolveAssemblyReferences" - Condition="'$(GenerateBindingRedirectsOutputType)' != 'true' And '@(AppConfigWithTargetPath)'==''"> - <PropertyGroup> - <_InjectedAppConfigForResolveReferences>true</_InjectedAppConfigForResolveReferences> - <AutoUnifyAssemblyReferences>false</AutoUnifyAssemblyReferences> - <IgnoreVersionForFrameworkReferences>true</IgnoreVersionForFrameworkReferences> - </PropertyGroup> - <ItemGroup> - <AppConfigWithTargetPath Include="$(MSBuildThisFileDirectory)..\src\core\MonoDevelop.Startup\app.config" /> - </ItemGroup> - </Target> - - <!-- - if we injected the app.config for conflict resolution, remove it so it doesn't get local copied - --> - <Target Name="_RemoveInjectedAppConfig" - AfterTargets="ResolveAssemblyReferences" - Condition="'$(_InjectedAppConfigForResolveReferences)'=='true'"> - <ItemGroup> - <AppConfigWithTargetPath Remove="@(AppConfigWithTargetPath)" /> - </ItemGroup> - </Target> </Project> |