Skip to content

Commit b56de6b

Browse files
wtgodbewtgodbe
committed
Merge remote-tracking branch 'origin/release/3.0' into DisableRefPackBuild
2 parents 42e0b28 + 354d859 commit b56de6b

File tree

51 files changed

+228
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+228
-26
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ stages:
535535
# For the purpose of building Linux distros, we can't depend on features of the SDK
536536
# which may not exist in pre-built versions of the SDK
537537
# Pinning to preview 8 since preview 9 has breaking changes
538-
version: 3.0.100-preview8-013656
538+
version: 3.0.100
539539
installationPath: $(DotNetCoreSdkDir)
540540
includePreviewVersions: true
541541
- script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false

‎Directory.Build.props

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
<!-- Contact email address for NuGet packages and Linux installers. -->
4747
<MaintainerEmail>[email protected]</MaintainerEmail>
4848

49-
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
49+
<PackageIcon>packageIcon.png</PackageIcon>
50+
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
5051
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
5152
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
5253

@@ -55,6 +56,10 @@
5556
<DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
5657
</PropertyGroup>
5758

59+
<ItemGroup>
60+
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
61+
</ItemGroup>
62+
5863
<!-- Warnings and errors -->
5964
<PropertyGroup>
6065
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎Directory.Build.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@
105105
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
106106
</ItemGroup>
107107

108+
<PropertyGroup Condition="'$(Language)' == 'C#'">
109+
<!-- Reference assemblies should always use Major.Minor.0.0 for assembly versions even during servicing. Only the package version should be updated. -->
110+
<!-- Pinning the implementation assemblies at Major.Minor.0.0 as we figure out compiling against ref assemblies. -->
111+
<AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
112+
</PropertyGroup>
113+
108114
<ItemGroup>
109115
<KnownFrameworkReference Update="Microsoft.NETCore.App">
110116
<!-- Always update the 'latest version', whether the repo is servicing or not. -->

‎eng/targets/ReferenceAssembly.targets

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<PropertyGroup>
4848
<_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/</_RefSourceOutputPath>
4949
<_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs</_RefSourceFileName>
50+
<_ManualRefSourceFileName>$(AssemblyName).Manual.cs</_ManualRefSourceFileName>
5051
<_RefSourceFileOutputPath>$(_RefSourceOutputPath)$(_RefSourceFileName)</_RefSourceFileOutputPath>
5152
</PropertyGroup>
5253

@@ -76,10 +77,16 @@
7677
</ItemGroup>
7778

7879
<PropertyGroup>
80+
<_ManualReferenceAssemblyContent />
81+
<_ManualReferenceAssemblyContent Condition="Exists('$(_RefSourceOutputPath)$(_ManualRefSourceFileName)')">
82+
<![CDATA[
83+
<Compile Include="$(_ManualRefSourceFileName)" />]]>
84+
</_ManualReferenceAssemblyContent>
85+
7986
<ReferencesContent>
8087
<![CDATA[
8188
<ItemGroup Condition="'%24(TargetFramework)' == '$(TargetFramework)'">
82-
<Compile Include="$(_RefSourceFileName)" />
89+
<Compile Include="$(_RefSourceFileName)" />]]>$(_ManualReferenceAssemblyContent)<![CDATA[
8390
@(FilteredOriginalReferences->'<Reference Include="%(Identity)" />', '%0A ')
8491
</ItemGroup>
8592
]]>

‎eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="NuGet.Build.Tasks" Version="5.1.0-rtm.5921" />
15+
<PackageReference Include="NuGet.Build.Tasks" Version="5.3.0" />
1616
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
20-
<PackageReference Include="Microsoft.Build.Framework" Version="15.8.166" />
21-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.8.166" />
22-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" />
20+
<PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" />
21+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
22+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview8-013656"
3+
"version": "3.0.100"
44
},
55
"tools": {
6-
"dotnet": "3.0.100-preview8-013656",
6+
"dotnet": "3.0.100",
77
"runtimes": {
88
"dotnet/x64": [
99
"$(MicrosoftNETCoreAppRuntimeVersion)"

‎packageIcon.png

6.84 KB
Loading

‎src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<ItemGroup>
2626
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
2727
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
28+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2829
</ItemGroup>
2930

3031
</Project>

‎src/Analyzers/Analyzers/src/Microsoft.AspNetCore.Analyzers.nuspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67

78
<files>
89
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
910
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
11+
<file src="$PackageIcon$" target="" />
1012
</files>
1113
</package>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<NuspecProperty Include="componentsversion=$(ComponentsPackageVersion)" />
2424
<NuspecProperty Include="razorversion=$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
2525
<NuspecProperty Include="blazormonoversion=$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
26+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
2627
</ItemGroup>
2728

2829
<ItemGroup>

‎src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
<dependencies>
66
<dependency id="Microsoft.AspNetCore.Blazor.Mono" version="$blazormonoversion$" include="all" />
77
</dependencies>
8+
<icon>packageIcon.png</icon>
89
</metadata>
910
<files>
1011
<file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
1112
<file src="build\**" target="build" />
1213
<file src="targets\**" target="targets" />
1314
<file src="$publishdir$**\*" target="tools/" />
1415
<file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
16+
<file src="$PackageIcon$" target="" />
1517
</files>
1618
</package>

‎src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<NuspecProperty Include="publishDir=$(PublishDir)" />
3434
<NuspecProperty Include="componentsrootdir=..\..\..\" />
3535
<NuspecProperty Include="blazorversion=$(PackageVersion)" />
36+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
3637
</ItemGroup>
3738

3839
</Project>

‎src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.nuspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
44
$CommonMetadataElements$
5+
<icon>packageIcon.png</icon>
56
</metadata>
67
<files>
78
<file src="build\**" target="build" />
89
<file src="$publishDir$**\*" target="tools" />
910
<file src="$componentsrootdir$THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
11+
<file src="$PackageIcon$" target="" />
1012
</files>
1113
</package>

‎src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<IsProjectReferenceProvider>false</IsProjectReferenceProvider>
1616
</PropertyGroup>
1717

18+
<ItemGroup>
19+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
20+
</ItemGroup>
21+
1822
<ItemGroup>
1923
<UpToDateCheckInput Include="content\**\.template.config.src\**\*.*" />
2024
</ItemGroup>

‎src/Components/Blazor/Templates/src/Microsoft.AspNetCore.Blazor.Templates.nuspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
<packageTypes>
66
<packageType name="Template" />
77
</packageTypes>
8+
<icon>packageIcon.png</icon>
89
</metadata>
910
<files>
1011
<file
1112
src="content/**"
1213
exclude="**/bin/**;**/obj/**;**/.template.config.src/**;content/Directory.Build.props;content/Directory.Build.targets;"
1314
target="Content" />
15+
<file src="$PackageIcon$" target="" />
1416
</files>
1517
</package>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
<ItemGroup>
5454
<NuspecProperty Include="jsInteropPackageVersion=$(MicrosoftJSInteropPackageVersion)" />
5555
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
56-
<NuspecProperty Include="OutputBinary=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).dll" />
57-
<NuspecProperty Include="OutputSymbol=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).pdb" />
58-
<NuspecProperty Include="OutputDocumentation=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).xml" />
56+
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
57+
<NuspecProperty Include="OutputPath=$(OutputPath)" />
58+
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
5959
</ItemGroup>
6060

6161
</Project>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.multitarget.nuspec

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1616
</group>
1717
</dependencies>
18+
<icon>packageIcon.png</icon>
1819
</metadata>
1920
<files>
20-
<file src="$OutputBinary$" target="lib\" />
21-
<file src="$OutputDocumentation$" target="lib\" />
22-
<file src="$OutputSymbol$" target="lib\" />
21+
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
22+
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
23+
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
24+
<file src="$PackageIcon$" target="" />
2325
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
2426
</files>
2527
</package>

‎src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp3.0.nuspec

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
<dependency id="Microsoft.JSInterop" version="$jsInteropPackageVersion$" exclude="Build,Analyzers" />
1010
</group>
1111
</dependencies>
12+
<icon>packageIcon.png</icon>
1213
</metadata>
1314
<files>
14-
<file src="$OutputBinary$" target="lib\" />
15-
<file src="$OutputDocumentation$" target="lib\" />
16-
<file src="$OutputSymbol$" target="lib\" />
15+
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
16+
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
17+
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
18+
<file src="$PackageIcon$" target="" />
1719
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
1820
</files>
1921
</package>

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

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,17 @@ 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+
<!-- 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 >
3941

4042
<!-- Platform manifest data -->
4143
<FrameworkListFileName>FrameworkList.xml</FrameworkListFileName>
4244
<FrameworkListOutputPath>$(ArtifactsObjDir)$(FrameworkListFileName)</FrameworkListOutputPath>
45+
46+
<!-- Platform manifest and package override metatdata -->
47+
<ReferencePackSharedFxVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0</ReferencePackSharedFxVersion>
48+
<ReferencePackSharedFxVersion Condition="'$(VersionSuffix)' != ''">$(ReferencePackSharedFxVersion)-$(VersionSuffix)</ReferencePackSharedFxVersion>
49+
<ReferencePlatformManifestOutputPath>$(ArtifactsObjDir)ref\PlatformManifest.txt</ReferencePlatformManifestOutputPath>
4350
</PropertyGroup>
4451

4552
<ItemGroup>
@@ -93,6 +100,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
93100

94101
<!-- This target finds the reference assemblies. -->
95102
<Target Name="_ResolveTargetingPackContent"
103+
Returns="@(AspNetCoreReferenceAssemblyPath)"
96104
BeforeTargets="_GetPackageFiles"
97105
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
98106
<ItemGroup>
@@ -109,28 +117,42 @@ This package is an internal implementation of the .NET Core SDK and is not meant
109117
Exclude="
110118
@(_SelectedExtensionsRefAssemblies);
111119
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
120+
@(ReferencePathWithRefAssemblies->WithMetadataValue('IsReferenceAssembly', 'false'));
112121
@(ReferencePathWithRefAssemblies->WithMetadataValue('ReferenceGrouping', 'Microsoft.NETCore.App'));" />
113122

114123
<AspNetCoreReferenceAssemblyPath
115124
Include="@(_SelectedExtensionsRefAssemblies->'$(MicrosoftInternalExtensionsRefsPath)%(FileName)%(Extension)')" />
116125

117126
<AspNetCoreReferenceDocXml Include="@(_ResolvedProjectReferencePaths->WithMetadataValue('IsReferenceAssembly', 'false')->'%(RootDir)%(Directory)%(FileName).xml')" />
118127
<AspNetCoreReferenceDocXml Include="@(_SelectedExtensionsRefAssemblies->'$(MicrosoftInternalExtensionsRefsPath)%(FileName).xml')" />
128+
</ItemGroup>
129+
130+
<RepoTasks.GenerateSharedFrameworkDepsFile
131+
DepsFilePath="$(ProjectDepsFilePath)"
132+
TargetFramework="$(TargetFramework)"
133+
FrameworkName="$(TargetingPackName)"
134+
FrameworkVersion="$(ReferencePackSharedFxVersion)"
135+
References="@(AspNetCoreReferenceAssemblyPath)"
136+
RuntimeIdentifier="$(TargetRuntimeIdentifier)"
137+
RuntimePackageName="$(PackageId)"
138+
PlatformManifestOutputPath="$(ReferencePlatformManifestOutputPath)" />
119139

140+
<ItemGroup>
120141
<RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
121142
<RefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
122143
<RefPackContent Include="$(TargetDir)$(PackageConflictManifestFileName)" PackagePath="$(ManifestsPackagePath)" />
123-
<RefPackContent Include="$(PlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
144+
<RefPackContent Include="$(ReferencePlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
124145
</ItemGroup>
125146
</Target>
126147

127148
<Target Name="GeneratePackageConflictManifest"
128149
DependsOnTargets="ResolveReferences"
129150
Inputs="$(MSBuildAllProjects)"
130151
Outputs="$(TargetDir)$(PackageConflictManifestFileName)">
152+
131153
<ItemGroup>
132154
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition=" '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " />
133-
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(SharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' " />
155+
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " />
134156
</ItemGroup>
135157

136158
<WriteLinesToFile

‎src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@
5353
</ItemGroup>
5454

5555
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
56+
<!-- Use the ref pack logic to compute the list of expected targeting pack content -->
57+
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
58+
Targets="_ResolveTargetingPackContent"
59+
SkipNonexistentProjects="false">
60+
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
61+
</MSBuild>
62+
5663
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
5764
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
5865
Targets="_GetPackageVersionInfo"
@@ -68,6 +75,11 @@
6875
</MSBuild>
6976

7077
<ItemGroup>
78+
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
79+
<_Parameter1>TargetingPackDependencies</_Parameter1>
80+
<_Parameter2>@(_TargetingPackDependencies)</_Parameter2>
81+
</AssemblyAttribute>
82+
7183
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
7284
<_Parameter1>RepositoryCommit</_Parameter1>
7385
<_Parameter2>$(SourceRevisionId)</_Parameter2>

‎src/Framework/test/TargetingPackTests.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,15 @@ public void AssembliesAreReferenceAssemblies()
6060
public void PlatformManifestListsAllFiles()
6161
{
6262
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
63-
var expectedAssemblies = TestData.GetSharedFxDependencies()
63+
var expectedAssemblies = TestData.GetTargetingPackDependencies()
6464
.Split(';', StringSplitOptions.RemoveEmptyEntries)
65+
.Select(i =>
66+
{
67+
var fileName = Path.GetFileName(i);
68+
return fileName.EndsWith(".dll", StringComparison.Ordinal)
69+
? fileName.Substring(0, fileName.Length - 4)
70+
: fileName;
71+
})
6572
.ToHashSet();
6673

6774
_output.WriteLine("==== file contents ====");

‎src/Framework/test/TestData.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class TestData
1818

1919
public static string GetSharedFxDependencies() => GetTestDataValue("SharedFxDependencies");
2020

21+
public static string GetTargetingPackDependencies() => GetTestDataValue("TargetingPackDependencies");
22+
2123
public static string GetTestDataValue(string key)
2224
=> typeof(TestData).Assembly.GetCustomAttributes<TestDataAttribute>().Single(d => d.Key == key).Value;
2325
}

‎src/Http/Routing.Abstractions/ref/Microsoft.AspNetCore.Routing.Abstractions.Manual.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using System.Runtime.CompilerServices;
5+
using Microsoft.AspNetCore.Routing;
6+
using Microsoft.AspNetCore.Http;
7+
using Microsoft.AspNetCore.Http.Features;
8+
9+
[assembly: TypeForwardedTo(typeof(IEndpointFeature))]
10+
[assembly: TypeForwardedTo(typeof(IRouteValuesFeature))]
11+
[assembly: TypeForwardedTo(typeof(Endpoint))]
12+
[assembly: TypeForwardedTo(typeof(EndpointMetadataCollection))]
13+
[assembly: TypeForwardedTo(typeof(RouteValueDictionary))]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +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" />
89
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
910
</ItemGroup>
1011
</Project>

0 commit comments

Comments
 (0)