Skip to content

Commit 5926aeb

Browse files
committed
Add aspnetcore ResolvePackageFileConflicts workaround
1 parent 817794e commit 5926aeb

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: MichaelSimons <[email protected]>
3+
Date: Fri, 11 Nov 2022 21:10:54 +0000
4+
Subject: [PATCH] ResolvePackageFileConflicts workaround
5+
6+
Backport: https://github.com/dotnet/aspnetcore/issues/45033
7+
---
8+
.../src/Microsoft.AspNetCore.App.Runtime.csproj | 8 ++++++++
9+
1 file changed, 8 insertions(+)
10+
11+
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
12+
index 3b5d2ae950..191a4c22fe 100644
13+
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
14+
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
15+
@@ -390,6 +390,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant
16+
<RemoveDir Directories="$(CrossgenPlatformAssembliesDir)" />
17+
<Copy SourceFiles="@(ReferenceCopyLocalPaths)" DestinationFolder="$(CrossgenPlatformAssembliesDir)" Condition="'%(ReferenceCopyLocalPaths.ProjectPath)' != ''"/>
18+
19+
+ <!-- TODO: Workaround ResolvePackageFileConflicts picking up the wrong file versions when conflicts exist - https://github.com/dotnet/aspnetcore/issues/45033 -->
20+
+ <ItemGroup>
21+
+ <FilesToDelete Include="$(CrossgenPlatformAssembliesDir)\System.Formats.Asn1.dll"/>
22+
+ <FilesToDelete Include="$(CrossgenPlatformAssembliesDir)\System.Text.Encodings.Web.dll"/>
23+
+ <FilesToDelete Include="$(CrossgenPlatformAssembliesDir)\System.Text.Json.dll"/>
24+
+ </ItemGroup>
25+
+ <Delete Files="@(FilesToDelete)" />
26+
+
27+
<!-- Resolve list of assemblies to crossgen2 -->
28+
<ItemGroup>
29+
<IntermediateCrossgenAssembly Include="@(ReferenceCopyLocalPaths)" Condition=" '%(ReferenceCopyLocalPaths.IsNativeImage)' != 'true' AND '%(ReferenceCopyLocalPaths.Extension)' != '.pdb'" />

0 commit comments

Comments
 (0)