Skip to content

Commit 2a3f2cc

Browse files
author
John Luo
committed
Feedback
1 parent 507404f commit 2a3f2cc

16 files changed

+16
-20
lines changed

‎eng/targets/ReferenceAssembly.targets

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,16 @@
7777
</ItemGroup>
7878

7979
<PropertyGroup>
80-
<ManualReferenceAssemblyContent Condition="'$(ContainsManualReferenceAssemblyContent)' == 'true'">
80+
<_ManualReferenceAssemblyContent />
81+
<_ManualReferenceAssemblyContent Condition="Exists('$(_RefSourceOutputPath)$(_ManualRefSourceFileName)')">
8182
<![CDATA[
82-
<Compile Include="$(_ManualRefSourceFileName)" Condition="Exists('$(_ManualRefSourceFileName)')" />]]>
83-
</ManualReferenceAssemblyContent>
83+
<Compile Include="$(_ManualRefSourceFileName)" />]]>
84+
</_ManualReferenceAssemblyContent>
8485

8586
<ReferencesContent>
8687
<![CDATA[
8788
<ItemGroup Condition="'%24(TargetFramework)' == '$(TargetFramework)'">
88-
<Compile Include="$(_RefSourceFileName)" />]]>$(ManualReferenceAssemblyContent)<![CDATA[
89+
<Compile Include="$(_RefSourceFileName)" />]]>$(_ManualReferenceAssemblyContent)<![CDATA[
8990
@(FilteredOriginalReferences->'<Reference Include="%(Identity)" />', '%0A ')
9091
</ItemGroup>
9192
]]>

‎src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,16 @@ This package is an internal implementation of the .NET Core SDK and is not meant
3636

3737
<!-- Reference implementation assemblies in addition to ref assemblies to get xml docs -->
3838
<ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>
39-
<ResolveAssemblyReferencesSilent>true</ResolveAssemblyReferencesSilent>
39+
<!-- We are ignoring MSB3243 warnings since implemenation and reference assemblies are versioned differently. We need both to compose the targeting pack with reference assemblies and xml docs. -->
40+
<MSBuildWarningsAsMessages>MSB3243</MSBuildWarningsAsMessages >
4041

4142
<!-- Platform manifest data -->
4243
<FrameworkListFileName>FrameworkList.xml</FrameworkListFileName>
4344
<FrameworkListOutputPath>$(ArtifactsObjDir)$(FrameworkListFileName)</FrameworkListOutputPath>
4445

4546
<!-- Platform manifest and package override metatdata -->
4647
<ReferencePackSharedFxVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0</ReferencePackSharedFxVersion>
48+
<ReferencePackSharedFxVersion Condition="'$(VersionSuffix)' != ''">$(ReferencePackSharedFxVersion)-$(VersionSuffix)</ReferencePackSharedFxVersion>
4749
<ReferencePlatformManifestOutputPath>$(ArtifactsObjDir)ref\PlatformManifest.txt</ReferencePlatformManifestOutputPath>
4850
</PropertyGroup>
4951

‎src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
77
<Compile Include="Microsoft.AspNetCore.Routing.Abstractions.netcoreapp3.0.cs" />
8-
<Compile Include="Microsoft.AspNetCore.Routing.Abstractions.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Routing.Abstractions.Manual.cs')" />
8+
<Compile Include="Microsoft.AspNetCore.Routing.Abstractions.Manual.cs" />
99
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
1010
</ItemGroup>
1111
</Project>

‎src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Microsoft.AspNetCore.Routing.RouteData</Description>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<PackageTags>aspnetcore;routing</PackageTags>
1313
<IsShippingPackage>false</IsShippingPackage>
14-
<ContainsManualReferenceAssemblyContent>true</ContainsManualReferenceAssemblyContent>
1514
</PropertyGroup>
1615

1716
<ItemGroup>

‎src/Mvc/Mvc.ApiExplorer/ref/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
77
<Compile Include="Microsoft.AspNetCore.Mvc.ApiExplorer.netcoreapp3.0.cs" />
8-
<Compile Include="Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs')" />
8+
<Compile Include="Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs" />
99
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
1010
</ItemGroup>
1111
</Project>

‎src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
99
<IsShippingPackage>false</IsShippingPackage>
10-
<ContainsManualReferenceAssemblyContent>true</ContainsManualReferenceAssemblyContent>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/Mvc/Mvc.Core/ref/Microsoft.AspNetCore.Mvc.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
77
<Compile Include="Microsoft.AspNetCore.Mvc.Core.netcoreapp3.0.cs" />
8-
<Compile Include="Microsoft.AspNetCore.Mvc.Core.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Mvc.Core.Manual.cs')" />
8+
<Compile Include="Microsoft.AspNetCore.Mvc.Core.Manual.cs" />
99
<Reference Include="Microsoft.AspNetCore.Mvc.Abstractions" />
1010
<Reference Include="Microsoft.AspNetCore.Authentication.Core" />
1111
<Reference Include="Microsoft.AspNetCore.Authorization.Policy" />

‎src/Mvc/Mvc.Core/src/Microsoft.AspNetCore.Mvc.Core.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
1616
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1717
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
1818
<IsShippingPackage>false</IsShippingPackage>
19-
<ContainsManualReferenceAssemblyContent>true</ContainsManualReferenceAssemblyContent>
2019
</PropertyGroup>
2120

2221
<ItemGroup>

‎src/Mvc/Mvc.Formatters.Json/ref/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
77
<Compile Include="Microsoft.AspNetCore.Mvc.Formatters.Json.netcoreapp3.0.cs" />
8-
<Compile Include="Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs')" />
8+
<Compile Include="Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs" />
99
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
1010
</ItemGroup>
1111
</Project>

‎src/Mvc/Mvc.Formatters.Json/src/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>aspnetcore;aspnetcoremvc;json</PackageTags>
99
<IsShippingPackage>false</IsShippingPackage>
10-
<ContainsManualReferenceAssemblyContent>true</ContainsManualReferenceAssemblyContent>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/Razor/Razor.Runtime/ref/Microsoft.AspNetCore.Razor.Runtime.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
77
<Compile Include="Microsoft.AspNetCore.Razor.Runtime.netcoreapp3.0.cs" />
8-
<Compile Include="Microsoft.AspNetCore.Razor.Runtime.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Razor.Runtime.Manual.cs')" />
8+
<Compile Include="Microsoft.AspNetCore.Razor.Runtime.Manual.cs" />
99
<Reference Include="Microsoft.AspNetCore.Razor" />
1010
<Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
1111
</ItemGroup>

‎src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>$(PackageTags);taghelper;taghelpers</PackageTags>
99
<IsShippingPackage>false</IsShippingPackage>
10-
<ContainsManualReferenceAssemblyContent>true</ContainsManualReferenceAssemblyContent>
1110
</PropertyGroup>
1211

1312
<ItemGroup>

‎src/Security/Authorization/Core/ref/Microsoft.AspNetCore.Authorization.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
77
<Compile Include="Microsoft.AspNetCore.Authorization.netstandard2.0.cs" />
8-
<Compile Include="Microsoft.AspNetCore.Authorization.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Authorization.Manual.cs')" />
8+
<Compile Include="Microsoft.AspNetCore.Authorization.Manual.cs" />
99
<Reference Include="Microsoft.AspNetCore.Metadata" />
1010
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
1111
<Reference Include="Microsoft.Extensions.Options" />
1212
</ItemGroup>
1313
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
1414
<Compile Include="Microsoft.AspNetCore.Authorization.netcoreapp3.0.cs" />
15-
<Compile Include="Microsoft.AspNetCore.Authorization.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Authorization.Manual.cs')" />
15+
<Compile Include="Microsoft.AspNetCore.Authorization.Manual.cs" />
1616
<Reference Include="Microsoft.AspNetCore.Metadata" />
1717
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
1818
<Reference Include="Microsoft.Extensions.Options" />

‎src/Security/Authorization/Core/src/Microsoft.AspNetCore.Authorization.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
1212
<NoWarn>$(NoWarn);CS1591</NoWarn>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1414
<PackageTags>aspnetcore;authorization</PackageTags>
15-
<ContainsManualReferenceAssemblyContent>true</ContainsManualReferenceAssemblyContent>
1615
</PropertyGroup>
1716

1817
<ItemGroup>

‎src/Servers/IIS/IIS/ref/Microsoft.AspNetCore.Server.IIS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
77
<Compile Include="Microsoft.AspNetCore.Server.IIS.netcoreapp3.0.cs" />
8-
<Compile Include="Microsoft.AspNetCore.Server.IIS.Manual.cs" Condition="Exists('Microsoft.AspNetCore.Server.IIS.Manual.cs')" />
8+
<Compile Include="Microsoft.AspNetCore.Server.IIS.Manual.cs" />
99
<Reference Include="Microsoft.AspNetCore.Authentication.Core" />
1010
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
1111
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1212
<NativeAssetsTargetFramework>netcoreapp3.0</NativeAssetsTargetFramework>
1313
<IsShippingPackage>false</IsShippingPackage>
14-
<ContainsManualReferenceAssemblyContent>true</ContainsManualReferenceAssemblyContent>
1514
</PropertyGroup>
1615

1716
<ItemGroup>

0 commit comments

Comments
 (0)