Skip to content

Commit ad4edca

Browse files
committed
Revert "Deduplicate setting of metadata to InteractiveResolvedFile."
This reverts commit 1925e91.
1 parent bc3d807 commit ad4edca

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed

src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.ProjectFile.fs

+22-11
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ $(PACKAGEREFERENCES)
104104
<Target Name="ComputePackageRootsForInteractivePackageManagement"
105105
DependsOnTargets="ResolveReferences;ResolveSdkReferences;ResolveTargetingPackAssets;ResolveSDKReferences;GenerateBuildDependencyFile;RetrieveNuspecMetadatas;RetrieveNuspecIdAndVersion">
106106
<ItemGroup>
107+
<__InteractiveReferencedAssemblies Include = "@(ReferencePath)" />
108+
<__InteractiveReferencedAssembliesCopyLocal Include = "@(RuntimeCopyLocalItems)" Condition="'$(TargetFrameworkIdentifier)'!='.NETFramework'" />
109+
<__InteractiveReferencedAssembliesCopyLocal Include = "@(ReferenceCopyLocalPaths)" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" />
107110
<__ConflictsList Include="%(_ConflictPackageFiles.ConflictItemType)=%(_ConflictPackageFiles.Filename)%(_ConflictPackageFiles.Extension)" />
108111
</ItemGroup>
109112
@@ -112,22 +115,30 @@ $(PACKAGEREFERENCES)
112115
</PropertyGroup>
113116
114117
<ItemGroup>
115-
<InteractiveResolvedFile Include="@(ReferencePath)"
116-
Condition="$([System.String]::new($(__Conflicts)).Contains($([System.String]::new('Reference=%(ReferencePath.Filename)%(ReferencePath.Extension);'))))"
117-
KeepDuplicates="false" />
118+
<InteractiveResolvedFile Include="@(__InteractiveReferencedAssemblies)"
119+
Condition="$([System.String]::new($(__Conflicts)).Contains($([System.String]::new('Reference=%(__InteractiveReferencedAssemblies.Filename)%(__InteractiveReferencedAssemblies.Extension);'))))"
120+
KeepDuplicates="false">
121+
<NormalizedIdentity Condition="'%(Identity)'!=''">$([System.String]::Copy('%(Identity)').Replace('\', '/'))</NormalizedIdentity>
122+
<NormalizedPathInPackage Condition="'%(__InteractiveReferencedAssemblies.PathInPackage)'!=''">$([System.String]::Copy('%(__InteractiveReferencedAssemblies.PathInPackage)').Replace('\', '/'))</NormalizedPathInPackage>
123+
<PositionPathInPackage Condition="'%(InteractiveResolvedFile.NormalizedPathInPackage)'!=''">$([System.String]::Copy('%(InteractiveResolvedFile.NormalizedIdentity)').IndexOf('%(InteractiveResolvedFile.NormalizedPathInPackage)'))</PositionPathInPackage>
124+
<PackageRoot Condition="'%(InteractiveResolvedFile.NormalizedPathInPackage)'!='' and '%(InteractiveResolvedFile.PositionPathInPackage)'!='-1'">$([System.String]::Copy('%(InteractiveResolvedFile.NormalizedIdentity)').Substring(0, %(InteractiveResolvedFile.PositionPathInPackage)).Replace('\', '/'))</PackageRoot>
125+
<IsNotImplementationReference>$([System.String]::Copy('%(__InteractiveReferencedAssemblies.PathInPackage)').StartsWith('ref/'))</IsNotImplementationReference>
126+
<NuGetPackageId>%(__InteractiveReferencedAssemblies.NuGetPackageId)</NuGetPackageId>
127+
<NuGetPackageVersion>%(__InteractiveReferencedAssemblies.NuGetPackageVersion)</NuGetPackageVersion>
128+
</InteractiveResolvedFile>
118129
119-
<InteractiveResolvedFile Include = "@(RuntimeCopyLocalItems)" Condition="'$(TargetFrameworkIdentifier)'!='.NETFramework'" KeepDuplicates="false" />
120-
<InteractiveResolvedFile Include = "@(ReferenceCopyLocalPaths)" Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'" KeepDuplicates="false" />
121-
122-
<InteractiveResolvedFile Update="*">
130+
<InteractiveResolvedFile Include="@(__InteractiveReferencedAssembliesCopyLocal)" KeepDuplicates="false">
123131
<NormalizedIdentity Condition="'%(Identity)'!=''">$([System.String]::Copy('%(Identity)').Replace('\', '/'))</NormalizedIdentity>
124-
<NormalizedPathInPackage Condition="'%(InteractiveResolvedFile.PathInPackage)'!=''">$([System.String]::Copy('%(InteractiveResolvedFile.PathInPackage)').Replace('\', '/'))</NormalizedPathInPackage>
132+
<NormalizedPathInPackage Condition="'%(__InteractiveReferencedAssembliesCopyLocal.PathInPackage)'!=''">$([System.String]::Copy('%(__InteractiveReferencedAssembliesCopyLocal.PathInPackage)').Replace('\', '/'))</NormalizedPathInPackage>
125133
<PositionPathInPackage Condition="'%(InteractiveResolvedFile.NormalizedPathInPackage)'!=''">$([System.String]::Copy('%(InteractiveResolvedFile.NormalizedIdentity)').IndexOf('%(InteractiveResolvedFile.NormalizedPathInPackage)'))</PositionPathInPackage>
126134
<PackageRoot Condition="'%(InteractiveResolvedFile.NormalizedPathInPackage)'!='' and '%(InteractiveResolvedFile.PositionPathInPackage)'!='-1'">$([System.String]::Copy('%(InteractiveResolvedFile.NormalizedIdentity)').Substring(0, %(InteractiveResolvedFile.PositionPathInPackage)).Replace('\', '/'))</PackageRoot>
135+
<IsNotImplementationReference>$([System.String]::Copy('%(__InteractiveReferencedAssembliesCopyLocal.PathInPackage)').StartsWith('ref/'))</IsNotImplementationReference>
136+
<NuGetPackageId>%(__InteractiveReferencedAssembliesCopyLocal.NuGetPackageId)</NuGetPackageId>
137+
<NuGetPackageVersion>%(__InteractiveReferencedAssembliesCopyLocal.NuGetPackageVersion)</NuGetPackageVersion>
138+
</InteractiveResolvedFile>
139+
140+
<InteractiveResolvedFile Update="*">
127141
<InitializeSourcePath Condition="Exists('%(InteractiveResolvedFile.PackageRoot)content\%(InteractiveResolvedFile.NugetPackageId)$(SCRIPTEXTENSION)')">%(InteractiveResolvedFile.PackageRoot)content\%(InteractiveResolvedFile.NugetPackageId)$(SCRIPTEXTENSION)</InitializeSourcePath>
128-
<IsNotImplementationReference>$([System.String]::Copy('%(InteractiveResolvedFile.PathInPackage)').StartsWith('ref/'))</IsNotImplementationReference>
129-
<NuGetPackageId>%(InteractiveResolvedFile.NuGetPackageId)</NuGetPackageId>
130-
<NuGetPackageVersion>%(InteractiveResolvedFile.NuGetPackageVersion)</NuGetPackageVersion>
131142
</InteractiveResolvedFile>
132143
133144
<NativeIncludeRoots

0 commit comments

Comments
 (0)