Skip to content

Commit 9183145

Browse files
authored
Fix package layout for ANCM packages (#5119)
1 parent cb5458e commit 9183145

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

build/repo.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
<NpmProjectDirectory Include="$(RepositoryRoot)src\Middleware\CORS\test\FunctionalTests\" />
7373

74-
<ProjectToBuild Condition=" '$(OS)' == 'Windows_NT' " Include="$(RepositoryRoot)src\Servers\**\*.vcxproj">
74+
<ProjectToBuild Condition=" '$(OS)' == 'Windows_NT' AND '$(MSBuildRuntimeType)' != 'Core' " Include="$(RepositoryRoot)src\Servers\**\*.vcxproj">
7575
<!-- Required to prevent triggering double-builds. See src\Servers\IIS\ResolveIisReferences.targets for details. -->
7676
<AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x64'">Platform=x64</AdditionalProperties>
7777
<AdditionalProperties Condition="'$(SharedFxRid)' == 'win-x86'">Platform=x86</AdditionalProperties>

eng/targets/Cpp.Common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
6+
<IsPackable>false</IsPackable>
67
</PropertyGroup>
78

89
<Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />

src/Servers/IIS/ResolveIisReferences.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ with the right MSBuild incantations to get output copied to the right place.
7979
<!-- Prepend LinkBase to output path. -->
8080
<NativeContent>
8181
<Link>%(LinkBase)%(FileName)%(Extension)</Link>
82+
<!-- Don't put this content in a nuget package. -->
83+
<Pack>false</Pack>
8284
</NativeContent>
8385
</ItemGroup>
8486

src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<PackageTags>aspnetcore</PackageTags>
99
<PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
1010
<Pack>true</Pack>
11-
<ContentTargetFolders>content</ContentTargetFolders>
1211
<NoPackageAnalysis>true</NoPackageAnalysis>
1312
<PackageDescription>ASP.NET Core Module</PackageDescription>
1413
<IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
@@ -19,7 +18,7 @@
1918
<Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.pdb" PackagePath="contentFiles/any/any/x86" />
2019
<Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" PackagePath="contentFiles/any/any/x64" />
2120
<Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.pdb" PackagePath="contentFiles/any/any/x64" />
22-
<Content Include="..\AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\*.xml" PackagePath="" />
21+
<Content Include="..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/aspnetcore_schema.xml" />
2322
<Content Include="Microsoft.AspNetCore.AspNetCoreModule.props" PackagePath="build\" />
2423
<Reference Include="AspNetCoreModule" />
2524
</ItemGroup>

src/Servers/IIS/src/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<PackageTags>aspnetcore</PackageTags>
99
<PackageTitle>Microsoft ASP.NET Core Module</PackageTitle>
1010
<Pack>true</Pack>
11-
<ContentTargetFolders>content</ContentTargetFolders>
1211
<NoPackageAnalysis>true</NoPackageAnalysis>
1312
<PackageDescription>ASP.NET Core Module</PackageDescription>
1413
<IsPackable Condition="'$(OS)' != 'Windows_NT'">false</IsPackable>
@@ -25,8 +24,8 @@
2524
<Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll" PackagePath="contentFiles/any/any/x64/2.0.0" />
2625
<Content Include="..\AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.pdb" PackagePath="contentFiles/any/any/x64/2.0.0" />
2726

28-
<Content Include="..\AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\*.xml" PackagePath="" />
29-
<Content Include="..\AspNetCoreModuleV2\AspNetCore\ancm.mof" />
27+
<Content Include="..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" PackagePath="/" />
28+
<Content Include="..\AspNetCoreModuleV2\AspNetCore\ancm.mof" PackagePath="/" />
3029
<Content Include="Microsoft.AspNetCore.AspNetCoreModule.props.in" PackagePath="build\" />
3130
<Reference Include="AspNetCoreModuleV2" />
3231
</ItemGroup>

0 commit comments

Comments
 (0)