Skip to content

Commit b6bdffe

Browse files
authored
Remove copy targets from ResolveIISReferences (#6539)
1 parent 422b322 commit b6bdffe

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

eng/targets/ResolveIisReferences.targets

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ with the right MSBuild incantations to get output copied to the right place.
1919
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
2020
<!-- NativeContent is a custom type of item group which is assigned a target path after project references are resolved. -->
2121
<OutputItemType>NativeContent</OutputItemType>
22-
<!-- Set the copy policy. -->
23-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2422
<!-- This instructs the ProjectRef protocol to collect symbols as well as built output -->
2523
<Targets>Build;BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup</Targets>
2624
<!-- Optimization. Native projects don't have a .NET TargetFramework -->
@@ -43,22 +41,4 @@ with the right MSBuild incantations to get output copied to the right place.
4341
<Warning Text="This project has native dependencies which were not built. Without this, tests may not function correctly. Run `build.cmd -native` to build native projects. Run `build.cmd -managed -native` to build both C# and C++." />
4442
</Target>
4543

46-
<Target Name="_GetNativeContentCopyToOutputDirectoryItems"
47-
BeforeTargets="GetCopyToOutputDirectoryItems"
48-
DependsOnTargets="ResolveProjectReferences">
49-
50-
<ItemGroup>
51-
<!-- Prepend LinkBase to output path. -->
52-
<NativeContent>
53-
<Link>%(LinkBase)%(FileName)%(Extension)</Link>
54-
<!-- Don't put this content in a nuget package. -->
55-
<Pack>false</Pack>
56-
</NativeContent>
57-
</ItemGroup>
58-
59-
<!-- Add the item to the ContentWithTargetPath group, which is then used by GetCopyToOutputDirectoryItems to copy to the correct output location. -->
60-
<AssignTargetPath Files="@(NativeContent)" RootFolder="$(MSBuildProjectDirectory)">
61-
<Output TaskParameter="AssignedFiles" ItemName="ContentWithTargetPath" />
62-
</AssignTargetPath>
63-
</Target>
6444
</Project>

src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
<ItemGroup Condition="'$(OS)' == 'Windows_NT' AND '$(VCTargetsPath)' != ''">
3131
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64"/>
3232
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x64"/>
33-
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="x64" />
33+
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="x64" />
3434

3535
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="Win32" />
3636
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="Win32" />
37-
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="Win32" />
37+
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="Win32" />
3838
</ItemGroup>
3939

4040
<Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="'$(OS)' == 'Windows_NT'">

0 commit comments

Comments
 (0)