Skip to content

Commit f8b16d4

Browse files
authored
Use IsPackable for ZipPublish.targets (#10636)
1 parent 05fe9de commit f8b16d4

File tree

8 files changed

+12
-9
lines changed

8 files changed

+12
-9
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<ArtifactsPath>$(MSBuildThisFileDirectory)out</ArtifactsPath>
66
<ArtifactsPublishOutputName>pub</ArtifactsPublishOutputName>
77
<ArtifactsPackageOutputName>pkg</ArtifactsPackageOutputName>
8+
<IsPackable>false</IsPackable> <!-- default false -->
89
</PropertyGroup>
910

1011
<!-- paths -->

eng/build/ZipPublish.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<Target Name="ZipPublishArtifacts"
3333
AfterTargets="Publish"
3434
DependsOnTargets="PrepareZipArtifacts"
35-
Condition="'$(ZipArtifactsPath)' != '' AND '@(ZipArtifact)' != '' AND '$(IsCrossTargetingBuild)' != 'true' AND '$(IsZippable)' == 'true'">
35+
Condition="'$(ZipArtifactsPath)' != '' AND '@(ZipArtifact)' != '' AND '$(IsCrossTargetingBuild)' != 'true' AND '$(IsPackable)' == 'true'">
3636
<ItemGroup Condition="'$(ZipArtifactsPath)' != ''">
3737
<ZipArtifact Condition="'%(TargetPath)' == '' AND '%(TargetName)' != ''">
3838
<TargetPath>$([MSBuild]::EnsureTrailingSlash('$(ZipArtifactsPath)'))%(TargetName)</TargetPath>

src/Directory.Build.props

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"
3+
Condition="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../')) != ''" />
4+
5+
<!-- artifacts -->
6+
<PropertyGroup>
7+
<IsPackable>true</IsPackable>
8+
</PropertyGroup>
9+
10+
</Project>

src/WebJobs.Script.SiteExtension/WebJobs.Script.SiteExtension.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<TargetFramework>net8.0</TargetFramework>
88
<RuntimeIdentifier>win</RuntimeIdentifier>
99
<SiteExtensionName>Functions</SiteExtensionName>
10-
<IsZippable>true</IsZippable>
1110
<CustomAfterNoTargets Condition="'$(TargetFramework)' != ''">$(MSBuildThisFileDirectory)Publish.SingleTFM.targets</CustomAfterNoTargets>
1211
<CustomAfterNoTargets Condition="'$(TargetFramework)' == ''">$(MSBuildThisFileDirectory)Publish.MultiTFM.targets</CustomAfterNoTargets>
1312
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
55
<IsTestProject>true</IsTestProject>
6-
<IsPackable>false</IsPackable>
76
<AssemblyName>Microsoft.Azure.WebJobs.Script.Tests.Abstractions</AssemblyName>
87
<RootNamespace>Microsoft.Azure.WebJobs.Script.Tests.Abstractions</RootNamespace>
98
</PropertyGroup>

test/WebJobs.Script.Tests.Analyzers/WebJobs.Script.Tests.Analyzers.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net6.0</TargetFramework>
5-
6-
<IsPackable>false</IsPackable>
7-
85
<SignAssembly>true</SignAssembly>
9-
106
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
117
</PropertyGroup>
128

test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
<IsPackable>false</IsPackable>
65
<AssemblyName>Microsoft.Azure.WebJobs.Script.Tests.Integration</AssemblyName>
76
<RootNamespace>Microsoft.Azure.WebJobs.Script.Tests.Integration</RootNamespace>
87
<!-- Allow BinaryFormatter for tests -->

test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
55
<IsTestProject>true</IsTestProject>
6-
<IsPackable>false</IsPackable>
76
<AssemblyName>Microsoft.Azure.WebJobs.Script.Tests</AssemblyName>
87
<RootNamespace>Microsoft.Azure.WebJobs.Script.Tests</RootNamespace>
98
<LangVersion>preview</LangVersion>

0 commit comments

Comments
 (0)