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: bundle Node.js per rid via runtime.json #2910

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: bundle Node.js per rid via runtime.json #2910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Common/Version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<AssemblyVersion>1.43.0</AssemblyVersion>
<AssemblyVersion>1.44.17</AssemblyVersion>
<PackageVersion>$(AssemblyVersion)</PackageVersion>
<DriverVersion>1.43.0-beta-1712646596000</DriverVersion>
<ReleaseVersion>$(AssemblyVersion)</ReleaseVersion>
Expand Down
16 changes: 16 additions & 0 deletions src/Playwright.runtime.linux-arm64/Playwright.runtime.linux-arm64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Microsoft.Playwright.runtime.linux-arm64</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
</PropertyGroup>

<Import Project="../Common/Version.props" />
<Import Project="../Common/SignAssembly.props" />
<Import Project="../Common/SignFiles.props" />

<ItemGroup>
<None Include="..\Playwright\.drivers\linux\node" Link=".playwright\node\linux-x64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\linux-x64" />
</ItemGroup>
</Project>
16 changes: 16 additions & 0 deletions src/Playwright.runtime.linux-x64/Playwright.runtime.linux-x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Microsoft.Playwright.runtime.linux-x64</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
</PropertyGroup>

<Import Project="../Common/Version.props" />
<Import Project="../Common/SignAssembly.props" />
<Import Project="../Common/SignFiles.props" />

<ItemGroup>
<None Include="..\Playwright\.drivers\linux-arm64\node" Link=".playwright\node\linux-arm64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\linux-arm64" />
</ItemGroup>
</Project>
16 changes: 16 additions & 0 deletions src/Playwright.runtime.osx-arm64/Playwright.runtime.osx-arm64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Microsoft.Playwright.runtime.osx-arm64</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
</PropertyGroup>

<Import Project="../Common/Version.props" />
<Import Project="../Common/SignAssembly.props" />
<Import Project="../Common/SignFiles.props" />

<ItemGroup>
<None Include="..\Playwright\.drivers\mac-arm64\node" Link=".playwright\node\darwin-arm64\node" CopyToOutputDirectory="Always" Pack="true" PackagePath=".playwright\node\darwin-arm64" />
</ItemGroup>
</Project>
16 changes: 16 additions & 0 deletions src/Playwright.runtime.osx-x64/Playwright.runtime.osx-x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Microsoft.Playwright.runtime.osx-x64</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
</PropertyGroup>

<Import Project="../Common/Version.props" />
<Import Project="../Common/SignAssembly.props" />
<Import Project="../Common/SignFiles.props" />

<ItemGroup>
<None Include="..\Playwright\.drivers\mac\node" Link=".playwright\node\darwin-x64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\darwin-x64" />
</ItemGroup>
</Project>
16 changes: 16 additions & 0 deletions src/Playwright.runtime.win-x64/Playwright.runtime.win-x64.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Microsoft.Playwright.runtime.win-64</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
</PropertyGroup>

<Import Project="../Common/Version.props" />
<Import Project="../Common/SignAssembly.props" />
<Import Project="../Common/SignFiles.props" />

<ItemGroup>
<None Include="..\Playwright\.drivers\win32_x64\node.exe" Link=".playwright\node\win32_x64\node.exe" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\win32_x64" />
</ItemGroup>
</Project>
41 changes: 39 additions & 2 deletions src/Playwright.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31516.353
MinimumVisualStudioVersion = 10.0.40219.1
Expand Down Expand Up @@ -36,6 +36,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.TestAdapter", "P
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.Examples", "Playwright.Examples\Playwright.Examples.csproj", "{A7BFC553-1AFF-490B-86E2-09DBF24BDA69}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runtimes", "runtimes", "{76B7A219-5307-4162-8C12-FAFABCD4F41E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.runtime.win-x64", "Playwright.runtime.win-x64\Playwright.runtime.win-x64.csproj", "{E03A4718-ABBB-41FD-8987-A0932D1A132F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.runtime.osx-x64", "Playwright.runtime.osx-x64\Playwright.runtime.osx-x64.csproj", "{3D4F5DC4-CC43-4508-9A91-19717DED25A4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.runtime.linux-x64", "Playwright.runtime.linux-x64\Playwright.runtime.linux-x64.csproj", "{327D40DF-48AE-4216-AAE2-DB7B7A00A716}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.runtime.linux-arm", "Playwright.runtime.linux-arm64\Playwright.runtime.linux-arm64.csproj", "{D6BAEAFD-3408-4919-BAC4-945F9C14A96B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playwright.runtime.osx-arm64", "Playwright.runtime.osx-arm64\Playwright.runtime.osx-arm64.csproj", "{8CB23361-CE40-4386-B2E4-4D09FF36D078}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -82,6 +94,26 @@ Global
{A7BFC553-1AFF-490B-86E2-09DBF24BDA69}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7BFC553-1AFF-490B-86E2-09DBF24BDA69}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7BFC553-1AFF-490B-86E2-09DBF24BDA69}.Release|Any CPU.Build.0 = Release|Any CPU
{E03A4718-ABBB-41FD-8987-A0932D1A132F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E03A4718-ABBB-41FD-8987-A0932D1A132F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E03A4718-ABBB-41FD-8987-A0932D1A132F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E03A4718-ABBB-41FD-8987-A0932D1A132F}.Release|Any CPU.Build.0 = Release|Any CPU
{3D4F5DC4-CC43-4508-9A91-19717DED25A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3D4F5DC4-CC43-4508-9A91-19717DED25A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D4F5DC4-CC43-4508-9A91-19717DED25A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D4F5DC4-CC43-4508-9A91-19717DED25A4}.Release|Any CPU.Build.0 = Release|Any CPU
{327D40DF-48AE-4216-AAE2-DB7B7A00A716}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{327D40DF-48AE-4216-AAE2-DB7B7A00A716}.Debug|Any CPU.Build.0 = Debug|Any CPU
{327D40DF-48AE-4216-AAE2-DB7B7A00A716}.Release|Any CPU.ActiveCfg = Release|Any CPU
{327D40DF-48AE-4216-AAE2-DB7B7A00A716}.Release|Any CPU.Build.0 = Release|Any CPU
{D6BAEAFD-3408-4919-BAC4-945F9C14A96B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6BAEAFD-3408-4919-BAC4-945F9C14A96B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6BAEAFD-3408-4919-BAC4-945F9C14A96B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6BAEAFD-3408-4919-BAC4-945F9C14A96B}.Release|Any CPU.Build.0 = Release|Any CPU
{8CB23361-CE40-4386-B2E4-4D09FF36D078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CB23361-CE40-4386-B2E4-4D09FF36D078}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CB23361-CE40-4386-B2E4-4D09FF36D078}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CB23361-CE40-4386-B2E4-4D09FF36D078}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -90,8 +122,13 @@ Global
{61C89FA2-645D-4D0E-9A20-06ABE32054CF} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476}
{735E5F83-813C-4F5C-BB69-D3F87B15CF39} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476}
{55165383-EBE7-462B-B154-738818787740} = {D250D790-5A30-4C38-8F60-50FA96DB4E67}
{A7BFC553-1AFF-490B-86E2-09DBF24BDA69} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476}
{AE6072B5-4235-499F-8B0E-B8BCFC125CF5} = {D250D790-5A30-4C38-8F60-50FA96DB4E67}
{A7BFC553-1AFF-490B-86E2-09DBF24BDA69} = {5C6D57B1-C82A-48D6-9EBD-73B712CAE476}
{E03A4718-ABBB-41FD-8987-A0932D1A132F} = {76B7A219-5307-4162-8C12-FAFABCD4F41E}
{3D4F5DC4-CC43-4508-9A91-19717DED25A4} = {76B7A219-5307-4162-8C12-FAFABCD4F41E}
{327D40DF-48AE-4216-AAE2-DB7B7A00A716} = {76B7A219-5307-4162-8C12-FAFABCD4F41E}
{D6BAEAFD-3408-4919-BAC4-945F9C14A96B} = {76B7A219-5307-4162-8C12-FAFABCD4F41E}
{8CB23361-CE40-4386-B2E4-4D09FF36D078} = {76B7A219-5307-4162-8C12-FAFABCD4F41E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8D6EDE73-B005-4ABC-BCF8-BB3C154497EC}
Expand Down
6 changes: 1 addition & 5 deletions src/Playwright/Playwright.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,9 @@
</ItemGroup>
<ItemGroup>
<None Remove=".drivers\**" />
<Content Include="runtime.json" PackagePath="/" />
<None Include=".drivers\linux\package\**" Link=".playwright\package\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\package" />
<None Include=".drivers\linux\LICENSE" Pack="true" PackagePath=".playwright\node" />
<None Include=".drivers\linux\node" Link=".playwright\node\linux-x64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\linux-x64" />
<None Include=".drivers\linux-arm64\node" Link=".playwright\node\linux-arm64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\linux-arm64" />
<None Include=".drivers\mac\node" Link=".playwright\node\darwin-x64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\darwin-x64" />
<None Include=".drivers\mac-arm64\node" Link=".playwright\node\darwin-arm64\node" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\darwin-arm64" />
<None Include=".drivers\win32_x64\node.exe" Link=".playwright\node\win32_x64\node.exe" CopyToOutputDirectory="PreserveNewest" Pack="true" PackagePath=".playwright\node\win32_x64" />
<None Include="build\playwright.ps1" Link="playwright.ps1" CopyToOutputDirectory="PreserveNewest" />
<None Include="build\**" Pack="true" PackagePath="buildTransitive" />
<None Include="build\**" Pack="true" PackagePath="build" />
Expand Down
10 changes: 5 additions & 5 deletions src/Playwright/build/Microsoft.Playwright.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
<ItemGroup Condition="'$(PlaywrightPlatform)' != 'none'">
<_PlaywrightPlatforms Include="$(PlaywrightPlatform)" />
<!-- 'linux' to stay backwards compatible -->
<_PlaywrightCopyItems Include="$(MSBuildThisFileDirectory)..\.playwright\node\linux-x64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'linux' OR '%(_PlaywrightPlatforms.Identity)' == 'linux-x64'">
<_PlaywrightCopyItems Include="$(NuGetPackageRoot)microsoft.playwright.runtime.linux-x64\1.44.17\.playwright\node\linux-x64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'linux' OR '%(_PlaywrightPlatforms.Identity)' == 'linux-x64'">
<PlaywrightFolder>node\linux-x64\</PlaywrightFolder>
</_PlaywrightCopyItems>
<_PlaywrightCopyItems Include="$(MSBuildThisFileDirectory)..\.playwright\node\linux-arm64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'linux-arm64'">
<_PlaywrightCopyItems Include="$(NuGetPackageRoot)microsoft.playwright.runtime.linux-arm64\1.44.17\.playwright\node\linux-arm64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'linux-arm64'">
<PlaywrightFolder>node\linux-arm64\</PlaywrightFolder>
</_PlaywrightCopyItems>
<!-- 'osx' to stay backwards compatible -->
<_PlaywrightCopyItems Include="$(MSBuildThisFileDirectory)..\.playwright\node\darwin-x64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'osx' OR '%(_PlaywrightPlatforms.Identity)' == 'osx-x64'">
<_PlaywrightCopyItems Include="$(NuGetPackageRoot)microsoft.playwright.runtime.osx-x64\1.44.17\.playwright\node\darwin-x64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'osx' OR '%(_PlaywrightPlatforms.Identity)' == 'osx-x64'">
<PlaywrightFolder>node\darwin-x64\</PlaywrightFolder>
</_PlaywrightCopyItems>
<_PlaywrightCopyItems Include="$(MSBuildThisFileDirectory)..\.playwright\node\darwin-arm64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'osx-arm64'">
<_PlaywrightCopyItems Include="$(NuGetPackageRoot)microsoft.playwright.runtime.osx-arm64\1.44.17\.playwright\node\darwin-arm64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'osx-arm64'">
<PlaywrightFolder>node\darwin-arm64\</PlaywrightFolder>
</_PlaywrightCopyItems>
<_PlaywrightCopyItems Include="$(MSBuildThisFileDirectory)..\.playwright\node\win32_x64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'win' OR '%(_PlaywrightPlatforms.Identity)' == 'win-x64'">
<_PlaywrightCopyItems Include="$(NuGetPackageRoot)microsoft.playwright.runtime.win-x64\1.44.17\.playwright\node\win32_x64\**" Condition="'%(_PlaywrightPlatforms.Identity)' == 'win' OR '%(_PlaywrightPlatforms.Identity)' == 'win-x64'">
<PlaywrightFolder>node\win32_x64\</PlaywrightFolder>
</_PlaywrightCopyItems>
<_PlaywrightCopyItems Include="$(MSBuildThisFileDirectory)..\.playwright\node\**" Condition="'@(_PlaywrightCopyItems->Count())' == '0'">
Expand Down
34 changes: 34 additions & 0 deletions src/Playwright/runtime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"runtimes": {
"linux-x64": {
"#import": [],
"Microsoft.Playwright": {
"Microsoft.Playwright.runtime.linux-x64": "1.44.0"
}
},
"linux-arm64": {
"#import": [],
"Microsoft.Playwright": {
"Microsoft.Playwright.runtime.linux-arm64": "1.44.0"
}
},
"osx-arm64": {
"#import": [],
"Microsoft.Playwright": {
"Microsoft.Playwright.runtime.osx-arm64": "1.44.0"
}
},
"osx-x64": {
"#import": [],
"Microsoft.Playwright": {
"Microsoft.Playwright.runtime.osx-x64": "1.44.0"
}
},
"win-x64": {
"#import": [],
"Microsoft.Playwright": {
"Microsoft.Playwright.runtime.win-x64": "1.44.0"
}
}
}
}
Loading