Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 04:33:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8786 from ivandrofly/test-project

Browse Source 
Switch to Central Package Management and update binding redirect
This commit is contained in:
Nikolaj Olsson 2024-09-05 19:09:32 +02:00 committed by GitHub
commit 2bcdd27594
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 258 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Directory.Packages.props Normal file
View File

@ -0,0 +1,24 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="System.Drawing.Common" Version="8.0.8" />
<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.6" />
<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="NHunspell" Version="1.2.5554.16953"/>
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0"/>
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4"/>
</ItemGroup>
</Project>

1
SubtitleEdit.sln
View File

@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
LanguageBaseEnglish.xml = LanguageBaseEnglish.xml LanguageBaseEnglish.xml = LanguageBaseEnglish.xml
LICENSE.txt = LICENSE.txt LICENSE.txt = LICENSE.txt
README.md = README.md README.md = README.md
Directory.Packages.props = Directory.Packages.props
EndProjectSection EndProjectSection
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSE", "src\libse\LibSE.csproj", "{D6F64CD3-C3EA-4B36-B575-9B3B8A3CA13F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibSE", "src\libse\LibSE.csproj", "{D6F64CD3-C3EA-4B36-B575-9B3B8A3CA13F}"

20
src/Test/Test.csproj
View File

@ -12,9 +12,7 @@
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<RootNamespace>Test</RootNamespace> <RootNamespace>Test</RootNamespace>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkProfile /> <RuntimeIdentifier>win</RuntimeIdentifier>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@ -43,9 +41,6 @@
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="NHunspell, Version=1.2.5554.16953, Culture=neutral, PublicKeyToken=1ac793ea843b4366, processorArchitecture=MSIL">
<HintPath>..\..\packages\NHunspell.1.2.5554.16953\lib\net\NHunspell.dll</HintPath>
</Reference>
<Reference Include="System"/> <Reference Include="System"/>
<Reference Include="System.Configuration"/> <Reference Include="System.Configuration"/>
<Reference Include="System.Drawing"/> <Reference Include="System.Drawing"/>
@ -194,7 +189,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config"/> <None Include="app.config"/>
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\libse\LibSE.csproj"> <ProjectReference Include="..\libse\LibSE.csproj">
@ -206,14 +200,14 @@
<Name>SubtitleEdit</Name> <Name>SubtitleEdit</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="NHunspell"/>
<PackageReference Include="System.Runtime.CompilerServices.Unsafe"/>
<PackageReference Include="System.Threading.Tasks.Extensions"/>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets"/>
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')"/> <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')"/>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

2
src/Test/app.config
View File

@ -24,7 +24,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Net.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Net.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

6
src/Test/packages.config
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NHunspell" version="1.2.5554.16953" targetFramework="net40" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
</packages>

12
src/libse/LibSE.csproj
View File

@ -50,21 +50,19 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Win32.Registry"/>
<PackageReference Include="System.Drawing.Common" Version="8.0.8" /> <PackageReference Include="System.Drawing.Common"/>
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http"/>
<PackageReference Include="UTF.Unknown" Version="2.5.1" /> <PackageReference Include="UTF.Unknown"/>
<PackageReference Include="zlib.net-mutliplatform" Version="1.0.6" /> <PackageReference Include="zlib.net-mutliplatform"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\LICENSE.txt"> <None Include="..\..\LICENSE.txt">
<Pack>True</Pack> <Pack>True</Pack>
<PackagePath></PackagePath>
</None> </None>
<None Include="Icon.png"> <None Include="Icon.png">
<Pack>True</Pack> <Pack>True</Pack>
<PackagePath></PackagePath>
</None> </None>
</ItemGroup> </ItemGroup>

20
src/ui/SubtitleEdit.csproj
View File

@ -291,16 +291,16 @@
</HunspellAssemblies> </HunspellAssemblies>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Net.Http" Version="2.2.29" /> <PackageReference Include="Microsoft.Net.Http"/>
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" /> <PackageReference Include="Microsoft.Win32.Registry"/>
<PackageReference Include="NAudio.Core" Version="2.2.1" /> <PackageReference Include="NAudio.Core"/>
<PackageReference Include="NAudio.WinMM" Version="2.2.1" /> <PackageReference Include="NAudio.WinMM"/>
<PackageReference Include="ncalc" Version="1.3.8" /> <PackageReference Include="ncalc"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json"/>
<PackageReference Include="NHunspell" Version="1.2.5554.16953" /> <PackageReference Include="NHunspell"/>
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" /> <PackageReference Include="System.Security.AccessControl"/>
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> <PackageReference Include="System.Security.Principal.Windows"/>
<PackageReference Include="Vosk" Version="0.3.38" /> <PackageReference Include="Vosk"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Logic\VideoPlayers\DirectShowLib2005.cs" /> <Compile Remove="Logic\VideoPlayers\DirectShowLib2005.cs" />