Merge pull request #14746 from aspnet/DisableRefPackBuild
Disable ref pack build in 3.0
This commit is contained in:
commit
649ee1fb8c
|
|
@ -91,7 +91,7 @@
|
||||||
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
|
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
|
||||||
|
|
||||||
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
|
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
|
||||||
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' == '0' AND '$(DotNetBuildFromSource)' != 'true'">false</IsTargetingPackBuilding>
|
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' != '0' OR '$(DotNetBuildFromSource)' == 'true'">false</IsTargetingPackBuilding>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Archives and installers using this prefix are intended for internal-use only.
|
Archives and installers using this prefix are intended for internal-use only.
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
|
||||||
</BuildDependsOn>
|
</BuildDependsOn>
|
||||||
|
|
||||||
<!-- No-op when in source build -->
|
<!-- No-op when in source build -->
|
||||||
<BuildDependsOn Condition="'$(IsTargetingPackBuilding)' != 'false' and '$(DotNetBuildFromSource)' == 'true'"/>
|
<BuildDependsOn Condition="'$(IsTargetingPackBuilding)' == 'false'"/>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
|
<!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore
|
||||||
_targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
|
_targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
|
||||||
public void AssembliesAreReferenceAssemblies()
|
public void AssembliesAreReferenceAssemblies()
|
||||||
{
|
{
|
||||||
IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
|
IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
|
||||||
|
|
@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
|
||||||
public void PlatformManifestListsAllFiles()
|
public void PlatformManifestListsAllFiles()
|
||||||
{
|
{
|
||||||
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
|
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<Target Name="Build" DependsOnTargets="DebBuild" />
|
<Target Name="Build" DependsOnTargets="DebBuild" />
|
||||||
<Target Name="Pack" />
|
<Target Name="Pack" />
|
||||||
|
|
||||||
<Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)">
|
<Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)" Condition="'$(IsTargetingPackBuilding)' != 'false'">
|
||||||
<!-- Generate debian_config.json. We can't simply use WriteLinesToFile because of https://github.com/Microsoft/msbuild/issues/1622. Use our custom GenerateFileFromTemplate task instead -->
|
<!-- Generate debian_config.json. We can't simply use WriteLinesToFile because of https://github.com/Microsoft/msbuild/issues/1622. Use our custom GenerateFileFromTemplate task instead -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<DebianConfigProperties>
|
<DebianConfigProperties>
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@
|
||||||
<Target Name="Build" DependsOnTargets="RpmBuild" />
|
<Target Name="Build" DependsOnTargets="RpmBuild" />
|
||||||
<Target Name="Pack" />
|
<Target Name="Pack" />
|
||||||
|
|
||||||
<Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)">
|
<Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)" Condition="'$(IsTargetingPackBuilding)' != 'false'">
|
||||||
<!-- Create layout: Create changelog -->
|
<!-- Create layout: Create changelog -->
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps>
|
<ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps>
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
<OutputName>$(Name)-$(Platform)</OutputName>
|
<OutputName>$(Name)-$(Platform)</OutputName>
|
||||||
<OutputType>Package</OutputType>
|
<OutputType>Package</OutputType>
|
||||||
<IsShipping>true</IsShipping>
|
<IsShipping>true</IsShipping>
|
||||||
|
<SkipCopyToArtifactsDirectory Condition="'$(IsTargetingPackBuilding)' == 'false'">true</SkipCopyToArtifactsDirectory>
|
||||||
<ProjectGuid>0AC34F1B-8056-4FFB-A398-E6BB7D67B48D</ProjectGuid>
|
<ProjectGuid>0AC34F1B-8056-4FFB-A398-E6BB7D67B48D</ProjectGuid>
|
||||||
<HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids>
|
<HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids>
|
||||||
<HarvestDirectorySuppressSpecificWarnings>5150;5151</HarvestDirectorySuppressSpecificWarnings>
|
<HarvestDirectorySuppressSpecificWarnings>5150;5151</HarvestDirectorySuppressSpecificWarnings>
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Target Name="CopyToArtifactsDirectory"
|
<Target Name="CopyToArtifactsDirectory"
|
||||||
Condition=" '$(IsShipping)' == 'true' "
|
Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' "
|
||||||
AfterTargets="Build">
|
AfterTargets="Build">
|
||||||
<Copy SourceFiles="$(TargetPath)" DestinationFiles="$(InstallersOutputPath)$(PackageFileName)" />
|
<Copy SourceFiles="$(TargetPath)" DestinationFiles="$(InstallersOutputPath)$(PackageFileName)" />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,20 @@
|
||||||
DependsOnTargets="PrepareForTest"
|
DependsOnTargets="PrepareForTest"
|
||||||
Condition="$(DesignTimeBuild) != true">
|
Condition="$(DesignTimeBuild) != true">
|
||||||
<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
|
<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
|
||||||
|
<!-- If we aren' building the targeting pack, use the baseline version -->
|
||||||
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
|
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
|
||||||
Targets="_GetPackageVersionInfo"
|
Targets="_GetPackageVersionInfo"
|
||||||
SkipNonexistentProjects="false">
|
SkipNonexistentProjects="false"
|
||||||
|
Condition="'$(IsTargetingPackBuilding)' != 'false'">
|
||||||
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackVersionInfo" />
|
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackVersionInfo" />
|
||||||
</MSBuild>
|
</MSBuild>
|
||||||
|
|
||||||
|
<!-- Targeting pack version should be the one we just built, if we're building it. Otherwise we use the baseline version -->
|
||||||
|
<PropertyGroup>
|
||||||
|
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' != 'false'">@(TargetingPackVersionInfo.PackageVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||||
|
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' == 'false'">$(AspNetCoreBaselineVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<!-- Runtime and Ref packs may have separate versions. -->
|
<!-- Runtime and Ref packs may have separate versions. -->
|
||||||
<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"
|
||||||
|
|
@ -25,7 +33,7 @@
|
||||||
MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);
|
MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);
|
||||||
MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion);
|
MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion);
|
||||||
MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion);
|
MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion);
|
||||||
MicrosoftAspNetCoreAppRefPackageVersion=@(_TargetingPackVersionInfo->'%(PackageVersion)');
|
MicrosoftAspNetCoreAppRefPackageVersion=$(MicrosoftAspNetCoreAppRefPackageVersion);
|
||||||
MicrosoftAspNetCoreAppRuntimePackageVersion=@(_RuntimePackageVersionInfo->'%(PackageVersion)');
|
MicrosoftAspNetCoreAppRuntimePackageVersion=@(_RuntimePackageVersionInfo->'%(PackageVersion)');
|
||||||
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers);
|
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers);
|
||||||
</PropsProperties>
|
</PropsProperties>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue