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

Allow build/running on WSL/Mono #9119

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Allow build/running on WSL/Mono #9119

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
2f67441
Allow building on WSL
ivandrofly Dec 18, 2024
3da71d4
Merge branch 'main' into feature/wsl
ivandrofly Dec 21, 2024
86beedd
Add System.Resources.Extensions to installer and build scripts
ivandrofly Dec 21, 2024
139679c
Merge branch 'main' into devcontainer/develop
ivandrofly Dec 31, 2024
933406a
```text
ivandrofly Dec 31, 2024
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
51 changes: 26 additions & 25 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="SevenZipExtractor" Version="1.0.17" />
<PackageVersion Include="SharpCompress" Version="0.38.0" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="UTF.Unknown" Version="2.5.1" />
<PackageVersion Include="zlib.net-mutliplatform" Version="1.0.8" />
<PackageVersion Include="Microsoft.Net.Http" Version="2.2.29" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
<PackageVersion Include="NAudio.WinMM" Version="2.2.1" />
<PackageVersion Include="ncalc" Version="1.3.8" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NHunspell" Version="1.2.5554.16953" />
<PackageVersion Include="System.Security.AccessControl" Version="6.0.1" />
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageVersion Include="Vosk" Version="0.3.38" />
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="MSTest" Version="3.6.1" />
</ItemGroup>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="SevenZipExtractor" Version="1.0.17"/>
<PackageVersion Include="SharpCompress" Version="0.38.0"/>
<PackageVersion Include="System.Drawing.Common" Version="9.0.0"/>
<PackageVersion Include="System.Net.Http" Version="4.3.4"/>
<PackageVersion Include="System.Resources.Extensions" Version="9.0.0"/>
<PackageVersion Include="UTF.Unknown" Version="2.5.1"/>
<PackageVersion Include="zlib.net-mutliplatform" Version="1.0.8"/>
<PackageVersion Include="Microsoft.Net.Http" Version="2.2.29"/>
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0"/>
<PackageVersion Include="NAudio.Core" Version="2.2.1"/>
<PackageVersion Include="NAudio.WinMM" Version="2.2.1"/>
<PackageVersion Include="ncalc" Version="1.3.8"/>
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageVersion Include="NHunspell" Version="1.2.5554.16953"/>
<PackageVersion Include="System.Security.AccessControl" Version="6.0.1"/>
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0"/>
<PackageVersion Include="Vosk" Version="0.3.38"/>
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0"/>
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageVersion Include="MSTest" Version="3.6.1"/>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ COPY /Y /V "x86\7zxa.dll" "temp_zip\x86\"
COPY /Y /V "x64\7zxa.dll" "temp_zip\x64\"
COPY /Y /V "..\..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\"
COPY /Y /V "System.Net.Http.Extensions.dll" "temp_zip\"
COPY /Y /V "System.Resources.Extensions" "temp_zip\"
COPY /Y /V "Newtonsoft.Json.dll" "temp_zip\"
COPY /Y /V "System.Net.Http.Primitives.dll" "temp_zip\"
COPY /Y /V "NAudio.Core.dll" "temp_zip\"
Expand Down
1 change: 1 addition & 0 deletions build_beta.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ COPY /Y /V "x86\7zxa.dll" "temp_zip\x86\"
COPY /Y /V "x64\7zxa.dll" "temp_zip\x64\"
COPY /Y /V "..\..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\"
COPY /Y /V "System.Net.Http.Extensions.dll" "temp_zip\"
COPY /Y /V "System.Resources.Extensions" "temp_zip\"
COPY /Y /V "Newtonsoft.Json.dll" "temp_zip\"
COPY /Y /V "System.Net.Http.Primitives.dll" "temp_zip\"
COPY /Y /V "NAudio.Core.dll" "temp_zip\"
Expand Down
2 changes: 2 additions & 0 deletions installer/Subtitle_Edit_Installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ Source: ..\src\ui\DLLs\Interop.QuartzTypeLib.dll; DestDir: {app};
Source: {#bindir}\Newtonsoft.Json.dll; DestDir: {app}; Flags: ignoreversion; Components: main
Source: {#bindir}\System.Net.Http.Extensions.dll; DestDir: {app}; Flags: ignoreversion; Components: main
Source: {#bindir}\System.Net.Http.Primitives.dll; DestDir: {app}; Flags: ignoreversion; Components: main
Source: {#bindir}\System.Resources.Extensions; DestDir: {app}; Flags: ignoreversion; Components: main
Source: {#bindir}\NAudio.Core.dll; DestDir: {app}; Flags: ignoreversion; Components: main
Source: {#bindir}\NAudio.WinMM.dll; DestDir: {app}; Flags: ignoreversion; Components: main
Source: {#bindir}\Microsoft.Win32.Registry.dll; DestDir: {app}; Flags: ignoreversion; Components: main
Expand Down Expand Up @@ -372,6 +373,7 @@ Type: files; Name: {app}\Interop.QuartzTypeLib.dll; Check: IsU
Type: files; Name: {app}\Newtonsoft.Json.dll; Check: IsUpgrade()
Type: files; Name: {app}\System.Net.Http.Extensions.dll; Check: IsUpgrade()
Type: files; Name: {app}\System.Net.Http.Primitives.dll; Check: IsUpgrade()
Type: files; Name: {app}\System.Resources.Extensions; Check: IsUpgrade()
Type: files; Name: {app}\NAudio.Core.dll; Check: IsUpgrade()
Type: files; Name: {app}\NAudio.WinMM.dll; Check: IsUpgrade()
Type: files; Name: {app}\Microsoft.Win32.Registry.dll; Check: IsUpgrade()
Expand Down
2 changes: 2 additions & 0 deletions src/ui/SubtitleEdit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<ApplicationIcon>SE.ico</ApplicationIcon>
<BootstrapperEnabled>true</BootstrapperEnabled>
<ManifestCertificateThumbprint>DCCE7922B5E425ADB221E06DC2FB405664CF8F63</ManifestCertificateThumbprint>
Expand Down Expand Up @@ -286,6 +287,7 @@
<PackageReference Include="ncalc" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="NHunspell" />
<PackageReference Include="System.Resources.Extensions" />
<PackageReference Include="System.Security.AccessControl" />
<PackageReference Include="System.Security.Principal.Windows" />
<PackageReference Include="Vosk" />
Expand Down