Skip to content

Commit 649ee1f

Browse files
authored
Merge pull request #14746 from aspnet/DisableRefPackBuild
Disable ref pack build in 3.0
2 parents 4d30fac + 62a62fa commit 649ee1f

File tree

8 files changed

+18
-9
lines changed

8 files changed

+18
-9
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>
9292

9393
<!-- Used to only produce targeting pack installers/packages once per major.minor. -->
94-
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' == '0' AND '$(DotNetBuildFromSource)' != 'true'">false</IsTargetingPackBuilding>
94+
<IsTargetingPackBuilding Condition="'$(AspNetCorePatchVersion)' != '0' OR '$(DotNetBuildFromSource)' == 'true'">false</IsTargetingPackBuilding>
9595

9696
<!--
9797
Archives and installers using this prefix are intended for internal-use only.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
8585
</BuildDependsOn>
8686

8787
<!-- No-op when in source build -->
88-
<BuildDependsOn Condition="'$(IsTargetingPackBuilding)' != 'false' and '$(DotNetBuildFromSource)' == 'true'"/>
88+
<BuildDependsOn Condition="'$(IsTargetingPackBuilding)' == 'false'"/>
8989
</PropertyGroup>
9090

9191
<!-- Override the default MSBuild targets so that nothing is returned from the project since it represents a collection of assemblies. -->

src/Framework/test/TargetingPackTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public TargetingPackTests(ITestOutputHelper output)
2828
_targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion"));
2929
}
3030

31-
[Fact]
31+
[Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
3232
public void AssembliesAreReferenceAssemblies()
3333
{
3434
IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
@@ -55,7 +55,7 @@ public void AssembliesAreReferenceAssemblies()
5555
});
5656
}
5757

58-
[Fact]
58+
[Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")]
5959
public void PlatformManifestListsAllFiles()
6060
{
6161
var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt");

src/Installers/Debian/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Target Name="Build" DependsOnTargets="DebBuild" />
2424
<Target Name="Pack" />
2525

26-
<Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)">
26+
<Target Name="DebBuild" DependsOnTargets="$(DebBuildDependsOn)" Condition="'$(IsTargetingPackBuilding)' != 'false'">
2727
<!-- 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 -->
2828
<PropertyGroup>
2929
<DebianConfigProperties>

src/Installers/Rpm/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<Target Name="Build" DependsOnTargets="RpmBuild" />
3333
<Target Name="Pack" />
3434

35-
<Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)">
35+
<Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)" Condition="'$(IsTargetingPackBuilding)' != 'false'">
3636
<!-- Create layout: Create changelog -->
3737
<PropertyGroup>
3838
<ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps>

src/Installers/Windows/TargetingPack/TargetingPack.wixproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<OutputName>$(Name)-$(Platform)</OutputName>
1010
<OutputType>Package</OutputType>
1111
<IsShipping>true</IsShipping>
12+
<SkipCopyToArtifactsDirectory Condition="'$(IsTargetingPackBuilding)' == 'false'">true</SkipCopyToArtifactsDirectory>
1213
<ProjectGuid>0AC34F1B-8056-4FFB-A398-E6BB7D67B48D</ProjectGuid>
1314
<HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids>
1415
<HarvestDirectorySuppressSpecificWarnings>5150;5151</HarvestDirectorySuppressSpecificWarnings>

src/Installers/Windows/Wix.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</Target>
6464

6565
<Target Name="CopyToArtifactsDirectory"
66-
Condition=" '$(IsShipping)' == 'true' "
66+
Condition=" '$(IsShipping)' == 'true' AND '$(SkipCopyToArtifactsDirectory)' != 'true' "
6767
AfterTargets="Build">
6868
<Copy SourceFiles="$(TargetPath)" DestinationFiles="$(InstallersOutputPath)$(PackageFileName)" />
6969
<ItemGroup>

src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,20 @@
44
DependsOnTargets="PrepareForTest"
55
Condition="$(DesignTimeBuild) != true">
66
<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
7+
<!-- If we aren' building the targeting pack, use the baseline version -->
78
<MSBuild Projects="$(RepoRoot)src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj"
89
Targets="_GetPackageVersionInfo"
9-
SkipNonexistentProjects="false">
10+
SkipNonexistentProjects="false"
11+
Condition="'$(IsTargetingPackBuilding)' != 'false'">
1012
<Output TaskParameter="TargetOutputs" ItemName="_TargetingPackVersionInfo" />
1113
</MSBuild>
1214

15+
<!-- Targeting pack version should be the one we just built, if we're building it. Otherwise we use the baseline version -->
16+
<PropertyGroup>
17+
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' != 'false'">@(TargetingPackVersionInfo.PackageVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
18+
<MicrosoftAspNetCoreAppRefPackageVersion Condition="'$(IsTargetingPackBuilding)' == 'false'">$(AspNetCoreBaselineVersion)</MicrosoftAspNetCoreAppRefPackageVersion>
19+
</PropertyGroup>
20+
1321
<!-- Runtime and Ref packs may have separate versions. -->
1422
<MSBuild Projects="$(RepoRoot)src\Framework\src\Microsoft.AspNetCore.App.Runtime.csproj"
1523
Targets="_GetPackageVersionInfo"
@@ -25,7 +33,7 @@
2533
MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);
2634
MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion);
2735
MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion);
28-
MicrosoftAspNetCoreAppRefPackageVersion=@(_TargetingPackVersionInfo->'%(PackageVersion)');
36+
MicrosoftAspNetCoreAppRefPackageVersion=$(MicrosoftAspNetCoreAppRefPackageVersion);
2937
MicrosoftAspNetCoreAppRuntimePackageVersion=@(_RuntimePackageVersionInfo->'%(PackageVersion)');
3038
SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers);
3139
</PropsProperties>

0 commit comments

Comments
 (0)