Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 5 commits into from Jun 3, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c8a12c
wip: ensuring symbol & deterministic
avodovnik Jun 2, 2021
11cb7f8
wip: nuget deterministic
avodovnik Jun 3, 2021
941f009
wip: temporarily removing readme file
avodovnik Jun 3, 2021
0d90692
wip: optimizing csproj files
avodovnik Jun 3, 2021
128ad26
chore: symbols are now pushed as snupkg
avodovnik Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .build/azure-pipeline-nuget.yml
View file
Open in desktop
Expand Up @@ -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'
Expand Down Expand Up @@ -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'

Expand All @@ -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'

Expand All @@ -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'
9 changes: 9 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Expand Up @@ -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>
2 changes: 0 additions & 2 deletions src/Playwright.CLI/Playwright.CLI.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions src/Playwright.NUnit/Playwright.NUnit.csproj
View file
Open in desktop
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/Playwright/Playwright.csproj
View file
Open in desktop
Expand Up @@ -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" />
Expand All @@ -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>
Expand Down