Manually add TypeForwardedTo in ref assemblies (#14538)
* Manually add TypeForwardedTo in ref assemblies * Pin ref assembly version to Major.Minor.0.0 * Disable MSB3243 warning * Pin pinning implementation assembly version * Use nuget.exe v5.3.0 which support icon metadata * Fixup nuspec packing
This commit is contained in:
parent
f05087be68
commit
354d859d50
|
|
@ -105,6 +105,12 @@
|
||||||
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
|
<Compile Include="$(SharedSourceRoot)ReferenceAssemblyInfo.cs" LinkBase="Properties" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(Language)' == 'C#'">
|
||||||
|
<!-- Reference assemblies should always use Major.Minor.0.0 for assembly versions even during servicing. Only the package version should be updated. -->
|
||||||
|
<!-- Pinning the implementation assemblies at Major.Minor.0.0 as we figure out compiling against ref assemblies. -->
|
||||||
|
<AssemblyVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0.0</AssemblyVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<KnownFrameworkReference Update="Microsoft.NETCore.App">
|
<KnownFrameworkReference Update="Microsoft.NETCore.App">
|
||||||
<!-- Always update the 'latest version', whether the repo is servicing or not. -->
|
<!-- Always update the 'latest version', whether the repo is servicing or not. -->
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/</_RefSourceOutputPath>
|
<_RefSourceOutputPath>$([System.IO.Directory]::GetParent('$(MSBuildProjectDirectory)'))/ref/</_RefSourceOutputPath>
|
||||||
<_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs</_RefSourceFileName>
|
<_RefSourceFileName>$(AssemblyName).$(TargetFramework).cs</_RefSourceFileName>
|
||||||
|
<_ManualRefSourceFileName>$(AssemblyName).Manual.cs</_ManualRefSourceFileName>
|
||||||
<_RefSourceFileOutputPath>$(_RefSourceOutputPath)$(_RefSourceFileName)</_RefSourceFileOutputPath>
|
<_RefSourceFileOutputPath>$(_RefSourceOutputPath)$(_RefSourceFileName)</_RefSourceFileOutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
@ -76,10 +77,16 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
<_ManualReferenceAssemblyContent />
|
||||||
|
<_ManualReferenceAssemblyContent Condition="Exists('$(_RefSourceOutputPath)$(_ManualRefSourceFileName)')">
|
||||||
|
<![CDATA[
|
||||||
|
<Compile Include="$(_ManualRefSourceFileName)" />]]>
|
||||||
|
</_ManualReferenceAssemblyContent>
|
||||||
|
|
||||||
<ReferencesContent>
|
<ReferencesContent>
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
<ItemGroup Condition="'%24(TargetFramework)' == '$(TargetFramework)'">
|
<ItemGroup Condition="'%24(TargetFramework)' == '$(TargetFramework)'">
|
||||||
<Compile Include="$(_RefSourceFileName)" />
|
<Compile Include="$(_RefSourceFileName)" />]]>$(_ManualReferenceAssemblyContent)<![CDATA[
|
||||||
@(FilteredOriginalReferences->'<Reference Include="%(Identity)" />', '%0A ')
|
@(FilteredOriginalReferences->'<Reference Include="%(Identity)" />', '%0A ')
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
]]>
|
]]>
|
||||||
|
|
|
||||||
|
|
@ -53,9 +53,8 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<NuspecProperty Include="jsInteropPackageVersion=$(MicrosoftJSInteropPackageVersion)" />
|
<NuspecProperty Include="jsInteropPackageVersion=$(MicrosoftJSInteropPackageVersion)" />
|
||||||
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
|
<NuspecProperty Condition="'$(DotNetBuildFromSource)' != 'true'" Include="systemComponentModelAnnotationsPackageVersion=$(SystemComponentModelAnnotationsPackageVersion)" />
|
||||||
<NuspecProperty Include="OutputBinary=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).dll" />
|
<NuspecProperty Include="AssemblyName=$(AssemblyName)" />
|
||||||
<NuspecProperty Include="OutputSymbol=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).pdb" />
|
<NuspecProperty Include="OutputPath=$(OutputPath)" />
|
||||||
<NuspecProperty Include="OutputDocumentation=$(MSBuildProjectDirectory)\$(OutputPath)**\$(AssemblyName).xml" />
|
|
||||||
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
|
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,9 @@
|
||||||
<icon>packageIcon.png</icon>
|
<icon>packageIcon.png</icon>
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
<file src="$OutputBinary$" target="lib\" />
|
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
|
||||||
<file src="$OutputDocumentation$" target="lib\" />
|
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
|
||||||
<file src="$OutputSymbol$" target="lib\" />
|
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
|
||||||
<file src="$PackageIcon$" target="" />
|
<file src="$PackageIcon$" target="" />
|
||||||
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
|
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
|
||||||
</files>
|
</files>
|
||||||
|
|
|
||||||
|
|
@ -12,9 +12,9 @@
|
||||||
<icon>packageIcon.png</icon>
|
<icon>packageIcon.png</icon>
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
<file src="$OutputBinary$" target="lib\" />
|
<file src="$OutputPath$**\$AssemblyName$.dll" target="lib\" />
|
||||||
<file src="$OutputDocumentation$" target="lib\" />
|
<file src="$OutputPath$**\$AssemblyName$.pdb" target="lib\" />
|
||||||
<file src="$OutputSymbol$" target="lib\" />
|
<file src="$OutputPath$**\$AssemblyName$.xml" target="lib\" />
|
||||||
<file src="$PackageIcon$" target="" />
|
<file src="$PackageIcon$" target="" />
|
||||||
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
|
<file src="..\..\THIRD-PARTY-NOTICES.txt" target=".\THIRD-PARTY-NOTICES.txt" />
|
||||||
</files>
|
</files>
|
||||||
|
|
|
||||||
|
|
@ -36,10 +36,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
|
|
||||||
<!-- Reference implementation assemblies in addition to ref assemblies to get xml docs -->
|
<!-- Reference implementation assemblies in addition to ref assemblies to get xml docs -->
|
||||||
<ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>
|
<ReferenceImplementationAssemblies>true</ReferenceImplementationAssemblies>
|
||||||
|
<!-- 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. -->
|
||||||
|
<MSBuildWarningsAsMessages>MSB3243</MSBuildWarningsAsMessages >
|
||||||
|
|
||||||
<!-- Platform manifest data -->
|
<!-- Platform manifest data -->
|
||||||
<FrameworkListFileName>FrameworkList.xml</FrameworkListFileName>
|
<FrameworkListFileName>FrameworkList.xml</FrameworkListFileName>
|
||||||
<FrameworkListOutputPath>$(ArtifactsObjDir)$(FrameworkListFileName)</FrameworkListOutputPath>
|
<FrameworkListOutputPath>$(ArtifactsObjDir)$(FrameworkListFileName)</FrameworkListOutputPath>
|
||||||
|
|
||||||
|
<!-- Platform manifest and package override metatdata -->
|
||||||
|
<ReferencePackSharedFxVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0</ReferencePackSharedFxVersion>
|
||||||
|
<ReferencePackSharedFxVersion Condition="'$(VersionSuffix)' != ''">$(ReferencePackSharedFxVersion)-$(VersionSuffix)</ReferencePackSharedFxVersion>
|
||||||
|
<ReferencePlatformManifestOutputPath>$(ArtifactsObjDir)ref\PlatformManifest.txt</ReferencePlatformManifestOutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -93,6 +100,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
|
|
||||||
<!-- This target finds the reference assemblies. -->
|
<!-- This target finds the reference assemblies. -->
|
||||||
<Target Name="_ResolveTargetingPackContent"
|
<Target Name="_ResolveTargetingPackContent"
|
||||||
|
Returns="@(AspNetCoreReferenceAssemblyPath)"
|
||||||
BeforeTargets="_GetPackageFiles"
|
BeforeTargets="_GetPackageFiles"
|
||||||
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
|
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -109,6 +117,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
Exclude="
|
Exclude="
|
||||||
@(_SelectedExtensionsRefAssemblies);
|
@(_SelectedExtensionsRefAssemblies);
|
||||||
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
|
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
|
||||||
|
@(ReferencePathWithRefAssemblies->WithMetadataValue('IsReferenceAssembly', 'false'));
|
||||||
@(ReferencePathWithRefAssemblies->WithMetadataValue('ReferenceGrouping', 'Microsoft.NETCore.App'));" />
|
@(ReferencePathWithRefAssemblies->WithMetadataValue('ReferenceGrouping', 'Microsoft.NETCore.App'));" />
|
||||||
|
|
||||||
<AspNetCoreReferenceAssemblyPath
|
<AspNetCoreReferenceAssemblyPath
|
||||||
|
|
@ -116,11 +125,23 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
|
|
||||||
<AspNetCoreReferenceDocXml Include="@(_ResolvedProjectReferencePaths->WithMetadataValue('IsReferenceAssembly', 'false')->'%(RootDir)%(Directory)%(FileName).xml')" />
|
<AspNetCoreReferenceDocXml Include="@(_ResolvedProjectReferencePaths->WithMetadataValue('IsReferenceAssembly', 'false')->'%(RootDir)%(Directory)%(FileName).xml')" />
|
||||||
<AspNetCoreReferenceDocXml Include="@(_SelectedExtensionsRefAssemblies->'$(MicrosoftInternalExtensionsRefsPath)%(FileName).xml')" />
|
<AspNetCoreReferenceDocXml Include="@(_SelectedExtensionsRefAssemblies->'$(MicrosoftInternalExtensionsRefsPath)%(FileName).xml')" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<RepoTasks.GenerateSharedFrameworkDepsFile
|
||||||
|
DepsFilePath="$(ProjectDepsFilePath)"
|
||||||
|
TargetFramework="$(TargetFramework)"
|
||||||
|
FrameworkName="$(TargetingPackName)"
|
||||||
|
FrameworkVersion="$(ReferencePackSharedFxVersion)"
|
||||||
|
References="@(AspNetCoreReferenceAssemblyPath)"
|
||||||
|
RuntimeIdentifier="$(TargetRuntimeIdentifier)"
|
||||||
|
RuntimePackageName="$(PackageId)"
|
||||||
|
PlatformManifestOutputPath="$(ReferencePlatformManifestOutputPath)" />
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
<RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
|
<RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
|
||||||
<RefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
|
<RefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
|
||||||
<RefPackContent Include="$(TargetDir)$(PackageConflictManifestFileName)" PackagePath="$(ManifestsPackagePath)" />
|
<RefPackContent Include="$(TargetDir)$(PackageConflictManifestFileName)" PackagePath="$(ManifestsPackagePath)" />
|
||||||
<RefPackContent Include="$(PlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
|
<RefPackContent Include="$(ReferencePlatformManifestOutputPath)" PackagePath="$(ManifestsPackagePath)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
|
@ -128,9 +149,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
DependsOnTargets="ResolveReferences"
|
DependsOnTargets="ResolveReferences"
|
||||||
Inputs="$(MSBuildAllProjects)"
|
Inputs="$(MSBuildAllProjects)"
|
||||||
Outputs="$(TargetDir)$(PackageConflictManifestFileName)">
|
Outputs="$(TargetDir)$(PackageConflictManifestFileName)">
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition=" '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " />
|
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition=" '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " />
|
||||||
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(SharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' " />
|
<_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<WriteLinesToFile
|
<WriteLinesToFile
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,13 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
|
<Target Name="GenerateTestData" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="InitializeSourceControlInformation">
|
||||||
|
<!-- Use the ref pack logic to compute the list of expected targeting pack content -->
|
||||||
|
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
|
||||||
|
Targets="_ResolveTargetingPackContent"
|
||||||
|
SkipNonexistentProjects="false">
|
||||||
|
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackDependencies" />
|
||||||
|
</MSBuild>
|
||||||
|
|
||||||
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
|
<!-- This target is defined in eng/targets/Packaging.targets and included in every C# and F# project. -->
|
||||||
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
|
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
|
||||||
Targets="_GetPackageVersionInfo"
|
Targets="_GetPackageVersionInfo"
|
||||||
|
|
@ -68,6 +75,11 @@
|
||||||
</MSBuild>
|
</MSBuild>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
|
||||||
|
<_Parameter1>TargetingPackDependencies</_Parameter1>
|
||||||
|
<_Parameter2>@(_TargetingPackDependencies)</_Parameter2>
|
||||||
|
</AssemblyAttribute>
|
||||||
|
|
||||||
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
|
<AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
|
||||||
<_Parameter1>RepositoryCommit</_Parameter1>
|
<_Parameter1>RepositoryCommit</_Parameter1>
|
||||||
<_Parameter2>$(SourceRevisionId)</_Parameter2>
|
<_Parameter2>$(SourceRevisionId)</_Parameter2>
|
||||||
|
|
|
||||||
|
|
@ -59,8 +59,15 @@ namespace Microsoft.AspNetCore
|
||||||
public void PlatformManifestListsAllFiles()
|
public void PlatformManifestListsAllFiles()
|
||||||
{
|
{
|
||||||
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
|
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
|
||||||
var expectedAssemblies = TestData.GetSharedFxDependencies()
|
var expectedAssemblies = TestData.GetTargetingPackDependencies()
|
||||||
.Split(';', StringSplitOptions.RemoveEmptyEntries)
|
.Split(';', StringSplitOptions.RemoveEmptyEntries)
|
||||||
|
.Select(i =>
|
||||||
|
{
|
||||||
|
var fileName = Path.GetFileName(i);
|
||||||
|
return fileName.EndsWith(".dll", StringComparison.Ordinal)
|
||||||
|
? fileName.Substring(0, fileName.Length - 4)
|
||||||
|
: fileName;
|
||||||
|
})
|
||||||
.ToHashSet();
|
.ToHashSet();
|
||||||
|
|
||||||
_output.WriteLine("==== file contents ====");
|
_output.WriteLine("==== file contents ====");
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,8 @@ namespace Microsoft.AspNetCore
|
||||||
|
|
||||||
public static string GetSharedFxDependencies() => GetTestDataValue("SharedFxDependencies");
|
public static string GetSharedFxDependencies() => GetTestDataValue("SharedFxDependencies");
|
||||||
|
|
||||||
|
public static string GetTargetingPackDependencies() => GetTestDataValue("TargetingPackDependencies");
|
||||||
|
|
||||||
public static string GetTestDataValue(string key)
|
public static string GetTestDataValue(string key)
|
||||||
=> typeof(TestData).Assembly.GetCustomAttributes<TestDataAttribute>().Single(d => d.Key == key).Value;
|
=> typeof(TestData).Assembly.GetCustomAttributes<TestDataAttribute>().Single(d => d.Key == key).Value;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Microsoft.AspNetCore.Routing;
|
||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
|
using Microsoft.AspNetCore.Http.Features;
|
||||||
|
|
||||||
|
[assembly: TypeForwardedTo(typeof(IEndpointFeature))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(IRouteValuesFeature))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Endpoint))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(EndpointMetadataCollection))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(RouteValueDictionary))]
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Routing.Abstractions.netcoreapp3.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Routing.Abstractions.netcoreapp3.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Routing.Abstractions.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
|
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,8 @@ param(
|
||||||
[Parameter(Mandatory=$true)][string]$PackageVersion,
|
[Parameter(Mandatory=$true)][string]$PackageVersion,
|
||||||
[Parameter(Mandatory=$true)][string]$RepoRoot,
|
[Parameter(Mandatory=$true)][string]$RepoRoot,
|
||||||
[Parameter(Mandatory=$true)][string]$MajorVersion,
|
[Parameter(Mandatory=$true)][string]$MajorVersion,
|
||||||
[Parameter(Mandatory=$true)][string]$MinorVersion
|
[Parameter(Mandatory=$true)][string]$MinorVersion,
|
||||||
|
[Parameter(Mandatory=$true)][string]$PackageIconPath
|
||||||
)
|
)
|
||||||
|
|
||||||
$NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget\$Name\$Architecture"
|
$NuGetDir = Join-Path $RepoRoot "artifacts\Tools\nuget\$Name\$Architecture"
|
||||||
|
|
@ -24,8 +25,8 @@ if (-not (Test-Path $NuGetDir)) {
|
||||||
if (-not (Test-Path $NuGetExe)) {
|
if (-not (Test-Path $NuGetExe)) {
|
||||||
# Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016
|
# Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016
|
||||||
Write-Output "Downloading nuget.exe to $NuGetExe"
|
Write-Output "Downloading nuget.exe to $NuGetExe"
|
||||||
wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile $NuGetExe
|
wget https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe -OutFile $NuGetExe
|
||||||
}
|
}
|
||||||
|
|
||||||
& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;
|
& $NuGetExe pack $NuspecFile -Version $PackageVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties ASPNETCORE_RUNTIME_MSI=$MsiPath`;ASPNETCORE_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR=$MajorVersion`;MINOR=$MinorVersion`;PACKAGE_ICON_PATH=$PackageIconPath`;
|
||||||
Exit $LastExitCode
|
Exit $LastExitCode
|
||||||
|
|
@ -106,6 +106,7 @@
|
||||||
'$(_GeneratedPackageVersion)' ^
|
'$(_GeneratedPackageVersion)' ^
|
||||||
'$(RepoRoot)' ^
|
'$(RepoRoot)' ^
|
||||||
'$(AspNetCoreMajorVersion)' ^
|
'$(AspNetCoreMajorVersion)' ^
|
||||||
'$(AspNetCoreMinorVersion)'" />
|
'$(AspNetCoreMinorVersion)' ^
|
||||||
|
'$(PackageIconFullPath)'" />
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,6 @@
|
||||||
<files>
|
<files>
|
||||||
<file src="$ASPNETCORE_RUNTIME_MSI$" />
|
<file src="$ASPNETCORE_RUNTIME_MSI$" />
|
||||||
<file src="$ASPNETCORE_CAB_FILE$" />
|
<file src="$ASPNETCORE_CAB_FILE$" />
|
||||||
<file src="$PackageIcon$" target="" />
|
<file src="$PACKAGE_ICON_PATH$" target="" />
|
||||||
</files>
|
</files>
|
||||||
</package>
|
</package>
|
||||||
|
|
|
||||||
|
|
@ -101,6 +101,7 @@
|
||||||
'$(_GeneratedPackageVersion)' ^
|
'$(_GeneratedPackageVersion)' ^
|
||||||
'$(RepoRoot)' ^
|
'$(RepoRoot)' ^
|
||||||
'$(AspNetCoreMajorVersion)' ^
|
'$(AspNetCoreMajorVersion)' ^
|
||||||
'$(AspNetCoreMinorVersion)'" />
|
'$(AspNetCoreMinorVersion)' ^
|
||||||
|
'$(PackageIconFullPath)'" />
|
||||||
</Target>
|
</Target>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,6 @@
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
<file src="$ASPNETCORE_RUNTIME_MSI$" />
|
<file src="$ASPNETCORE_RUNTIME_MSI$" />
|
||||||
<file src="$PackageIcon$" target="" />
|
<file src="$PACKAGE_ICON_PATH$" target="" />
|
||||||
</files>
|
</files>
|
||||||
</package>
|
</package>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiRequestFormat))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseType))]
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Mvc.ApiExplorer.netcoreapp3.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Mvc.ApiExplorer.netcoreapp3.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Mvc.ApiExplorer.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
|
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Microsoft.AspNetCore.Mvc.Formatters;
|
||||||
|
|
||||||
|
[assembly: TypeForwardedTo(typeof(InputFormatterException))]
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Mvc.Core.netcoreapp3.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Mvc.Core.netcoreapp3.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Mvc.Core.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Mvc.Abstractions" />
|
<Reference Include="Microsoft.AspNetCore.Mvc.Abstractions" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Authentication.Core" />
|
<Reference Include="Microsoft.AspNetCore.Authentication.Core" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Authorization.Policy" />
|
<Reference Include="Microsoft.AspNetCore.Authorization.Policy" />
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
[assembly: TypeForwardedTo(typeof(JsonResult))]
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Mvc.Formatters.Json.netcoreapp3.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Mvc.Formatters.Json.netcoreapp3.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Mvc.Formatters.Json.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
|
<Reference Include="Microsoft.AspNetCore.Mvc.Core" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Microsoft.AspNetCore.Razor.TagHelpers;
|
||||||
|
|
||||||
|
[assembly: TypeForwardedTo(typeof(DefaultTagHelperContent))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(HtmlAttributeNameAttribute))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(HtmlAttributeNotBoundAttribute))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(HtmlTargetElementAttribute))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(ITagHelper))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(ITagHelperComponent))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(NullHtmlEncoder))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(OutputElementHintAttribute))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(ReadOnlyTagHelperAttributeList))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(RestrictChildrenAttribute))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(TagHelper))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(TagHelperAttribute))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(TagHelperAttributeList))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(TagHelperComponent))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(TagHelperContent))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(TagHelperContext))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(TagHelperOutput))]
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Razor.Runtime.netcoreapp3.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Razor.Runtime.netcoreapp3.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Razor.Runtime.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Razor" />
|
<Reference Include="Microsoft.AspNetCore.Razor" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
|
<Reference Include="Microsoft.AspNetCore.Html.Abstractions" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
|
||||||
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
|
||||||
|
// Microsoft.AspNetCore.Metadata
|
||||||
|
[assembly: TypeForwardedTo(typeof(IAuthorizeData))]
|
||||||
|
[assembly: TypeForwardedTo(typeof(IAllowAnonymous))]
|
||||||
|
|
@ -5,12 +5,14 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Authorization.netstandard2.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Authorization.netstandard2.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Authorization.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Metadata" />
|
<Reference Include="Microsoft.AspNetCore.Metadata" />
|
||||||
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
|
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
|
||||||
<Reference Include="Microsoft.Extensions.Options" />
|
<Reference Include="Microsoft.Extensions.Options" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Authorization.netcoreapp3.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Authorization.netcoreapp3.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Authorization.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Metadata" />
|
<Reference Include="Microsoft.AspNetCore.Metadata" />
|
||||||
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
|
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
|
||||||
<Reference Include="Microsoft.Extensions.Options" />
|
<Reference Include="Microsoft.Extensions.Options" />
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
// Copyright (c) .NET Foundation. All rights reserved.
|
||||||
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using Microsoft.AspNetCore.Http.Features;
|
||||||
|
|
||||||
|
[assembly: TypeForwardedTo(typeof(IServerVariablesFeature))]
|
||||||
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||||
<Compile Include="Microsoft.AspNetCore.Server.IIS.netcoreapp3.0.cs" />
|
<Compile Include="Microsoft.AspNetCore.Server.IIS.netcoreapp3.0.cs" />
|
||||||
|
<Compile Include="Microsoft.AspNetCore.Server.IIS.Manual.cs" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Authentication.Core" />
|
<Reference Include="Microsoft.AspNetCore.Authentication.Core" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
|
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
|
||||||
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
|
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue