chore: clean-up & unify build/pack properties (#1475)

- Move the CI/symbols properties to the Directory.Build.Props file to apply it to all projects - Generate the nupkg and snupkg and push together - Remove the old notation of *.Symbols.nupkg
microsoft · Jun 3, 2021 · dfd6e14 · dfd6e14
1 parent da603d2
commit dfd6e14
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/.build/azure-pipeline-nuget.yml b/.build/azure-pipeline-nuget.yml
@@ -89,7 +89,7 @@ stages:
         arguments: '-c $(BuildConfiguration)'
 
     - task: DotNetCoreCLI@2
-      displayName: Pack Playwright NuGet
+      displayName: Pack Playwright.NUnit NuGet
       inputs:
         command: 'pack'
         packagesToPack: '**/Playwright.NUnit.csproj'
@@ -128,7 +128,7 @@ stages:
       displayName: Push Playwright NuGet to NuGet.org
       inputs:
         command: 'push'
-        packagesToPush: '$(System.ArtifactsDirectory)/**/*.nupkg;!$(System.ArtifactsDirectory)/**/*.symbols.nupkg'
+        packagesToPush: '$(System.ArtifactsDirectory)/**/*.nupkg'
         nuGetFeedType: 'external'
         publishFeedCredentials: 'NuGet-Playwright'
 
@@ -152,7 +152,7 @@ stages:
       displayName: Push CLI NuGet to Nuget.org
       inputs:
         command: 'push'
-        packagesToPush: '$(System.ArtifactsDirectory)/**/*.nupkg;!$(System.ArtifactsDirectory)/**/*.symbols.nupkg'
+        packagesToPush: '$(System.ArtifactsDirectory)/**/*.nupkg'
         nuGetFeedType: 'external'
         publishFeedCredentials: 'NuGet-Playwright'
 
@@ -176,6 +176,6 @@ stages:
       displayName: Push NUnit NuGet to Nuget.org
       inputs:
         command: 'push'
-        packagesToPush: '$(System.ArtifactsDirectory)/**/*.nupkg;!$(System.ArtifactsDirectory)/**/*.symbols.nupkg'
+        packagesToPush: '$(System.ArtifactsDirectory)/**/*.nupkg'
         nuGetFeedType: 'external'
         publishFeedCredentials: 'NuGet-Playwright'
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,4 +3,13 @@
   <PropertyGroup>
     <LangVersion>9</LangVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
 </Project>
diff --git a/src/Playwright.CLI/Playwright.CLI.csproj b/src/Playwright.CLI/Playwright.CLI.csproj
@@ -18,8 +18,6 @@
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <IsPackable>true</IsPackable>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyVersion>1.0.0</AssemblyVersion>

diff --git a/src/Playwright.NUnit/Playwright.NUnit.csproj b/src/Playwright.NUnit/Playwright.NUnit.csproj
@@ -19,9 +19,8 @@
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageOutputPath>./nupkg</PackageOutputPath>
     <IsPackable>true</IsPackable>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
+
   <Import Project="../Common/Version.props" />
   <Import Project="../Common/SignAssembly.props" />
   <ItemGroup>

diff --git a/src/Playwright/Playwright.csproj b/src/Playwright/Playwright.csproj
@@ -21,7 +21,10 @@
     <NoWarn>1701;1702;CS0067;1734</NoWarn>
     <AssemblyName>Microsoft.Playwright</AssemblyName>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <Import Project="../Common/Version.props" />
   <Import Project="../Common/Dependencies.props" />
@@ -46,9 +49,6 @@
     <None Include="Drivers\win-x86\**" Pack="true" PackagePath="Drivers\win-x86\native" />
     <None Include="build\**" Pack="true" PackagePath="build" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
-  </ItemGroup>
   <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
     <DriverFiles Include="Drivers\win-x64\**">
       <InProject>false</InProject>